new upstream version, remove !acl patch, return UPSTREAMVERSION to

previous handling

svn path=/exim/trunk/; revision=1442

3 files changed, 6 insertions, 40 deletions

diff --git a/debian/changelog b/debian/changelog
index 75b01be..501d595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-exim4 (4.61-2) UNRELEASED; urgency=low
+exim4 (4.62-0) UNRELEASED; urgency=low
 
   * NOT YET RELEASED
   * TO BE TESTED: <; code in ue4.conf
-  * TODO for next version: return to old UPSTREAMVERSION handling
+  * New upstream version
+    * remove !acl patch, bug is fixed upstream
   * Some minor changes to README.Debian
   * Downgrade priority of exim4/dc_eximconfig_configtype, exim4/no_config and
     exim4/exim3_upgrade from critical to high, as there is a sane default.
@@ -23,9 +24,7 @@ exim4 (4.61-2) UNRELEASED; urgency=low
   * Allow ";" as separator in dc_local_interfaces and dc_relay_nets.
     If a semicolon is found, "<;" is prepended to allow a semicolon as
     separator. Thanks to Adam Borowski. (mh) Closes: #360162
-  * Link against libdb4.3 instead of 4.2. Temporarily abuse hardcoded
-    UPSTREAMVERSION=4.61-2 to make sure that all exim4 packages are upgraded
-    to db4.3 using ones (am). Closes: #365467
+  * Link against libdb4.3 instead of 4.2. (am). Closes: #365467
   * Standards-Version: 3.7.0, no changes required. (am)
   * README.Debian: Add link to "how to use a completely different
     configuration scheme" to the beginning of the chapter about Debian's
@@ -39,7 +38,7 @@ exim4 (4.61-2) UNRELEASED; urgency=low
     occur, e.g. #360696. As we are deleting the whole db, deleting these files
     seems to be a good idea. (am)
 
- -- Marc Haber <mh+debian-packages@zugschlus.de>  Sun, 30 Apr 2006 18:26:15 +0200
+ -- Marc Haber <mh+debian-packages@zugschlus.de>  Tue,  2 May 2006 10:39:37 +0000
 
 exim4 (4.61-1) unstable; urgency=low
 
diff --git a/debian/patches/37_acl_negation.dpatch b/debian/patches/37_acl_negation.dpatch
deleted file mode 100755
index 3a6b715..0000000
--- a/debian/patches/37_acl_negation.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 37_acl_negation.dpatch by Marc Haber <mh+debian-packages@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow negation on ACL stanzas
-## DP: http://www.exim.org/mail-archives/exim-cvs/2006-April/msg00008.html
-
-@DPATCH@
-diff -urNad trunk~/src/acl.c trunk/src/acl.c
---- trunk~/src/acl.c	2006-04-04 14:00:04.000000000 +0000
-+++ trunk/src/acl.c	2006-04-04 19:49:08.000000000 +0000
-@@ -202,8 +202,8 @@
- checking functions. */
- 
- static uschar cond_expand_at_top[] = {
--  TRUE,    /* add_header */
-   TRUE,    /* acl */
-+  TRUE,    /* add_header */
-   FALSE,   /* authenticated */
- #ifdef EXPERIMENTAL_BRIGHTMAIL
-   TRUE,    /* bmi_optin */
-@@ -260,8 +260,8 @@
- /* Flags to identify the modifiers */
- 
- static uschar cond_modifiers[] = {
--  TRUE,    /* add_header */
-   FALSE,   /* acl */
-+  TRUE,    /* add_header */
-   FALSE,   /* authenticated */
- #ifdef EXPERIMENTAL_BRIGHTMAIL
-   TRUE,    /* bmi_optin */
diff --git a/debian/rules b/debian/rules
index 2958cd2..1c5d4e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,9 +70,7 @@ daemonbinaries=$(addprefix build-,$(addsuffix /exim,$(builddaemonpackages)))
 debiandaemonbinaries=$(addprefix $(DEBIAN)/,$(addsuffix /usr/sbin/exim4,$(builddaemonpackages)))
 
 # get upstream-version from debian/changelog, i.e. anything until the first -
-#UPSTREAMVERSION	:=	$(shell dpkg-parsechangelog | sed -n '/^Version: /{s/^Version: \(.\+\)-[^-]\+/\1/;p;}')
-# Use definition above, once 4.62 has been released!
-UPSTREAMVERSION := 4.61-2
+UPSTREAMVERSION	:=	$(shell dpkg-parsechangelog | sed -n '/^Version: /{s/^Version: \(.\+\)-[^-]\+/\1/;p;}')
 MTACONFLICTS := $(shell cat debian/mtalist)
 
 unpack-configs: unpack-configs-stamp