From 624604f872dfda122a1dd84fcea42b4f2356dafa Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 1 Jan 2014 14:34:11 +0400 Subject: fix building from git, but not from Exim git --- debian/changelog | 8 ++++++++ debian/patches/dyson-version.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/dyson-version.patch diff --git a/debian/changelog b/debian/changelog index ddd0cc0..3a92245 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +exim4 (4.82-3+dyson1) UNRELEASED; urgency=low + + * Package for Dyson + * Added dyson-version.patch: + fix building from git, but not from Exim git + + -- Igor Pashev Wed, 01 Jan 2014 14:32:47 +0400 + exim4 (4.82-3) unstable; urgency=low * Upload to unstable. diff --git a/debian/patches/dyson-version.patch b/debian/patches/dyson-version.patch new file mode 100644 index 0000000..8c81f06 --- /dev/null +++ b/debian/patches/dyson-version.patch @@ -0,0 +1,20 @@ +Description: fix building from git, but not from Exim git ;-) +Index: exim4/scripts/reversion +=================================================================== +--- exim4.orig/scripts/reversion 2014-01-01 13:23:41.536845678 +0400 ++++ exim4/scripts/reversion 2014-01-01 14:24:20.561542141 +0400 +@@ -40,12 +40,14 @@ + set $(git describe --dirty=-XX --match 'exim-4*' | + sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|') + # Only update if we need to ++ if [ -n "$2$3" ]; then + if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ] + then + EXIM_RELEASE_VERSION="$2" + EXIM_VARIANT_VERSION="$3" + rm -f version.h + fi ++ fi + fi + + # If you are maintaining a patched version of Exim, you can either diff --git a/debian/patches/series b/debian/patches/series index 7cac351..c9c7291 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ 75_unbind-ldap-connection.diff 76_fix_ldap_option_setting.diff 77_close-the-server-side-of-TLS.diff +dyson-version.patch -- cgit v1.2.3