commit local changes

svn path=/exim/branches/4.63-3-experimental/; revision=1596

6 files changed, 41 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 71ca378..f9c3e31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+exim4 (4.63.20060921-0) UNRELEASED; urgency=low
+
+  * new upstream experimental snapshot
+  * named acl variables are now supported
+  * this package is missing upstream docs as upstream snapshots do not
+    contain them
+  * adapt packaging appropriately
+
+ -- Marc Haber <mh+debian-packages@zugschlus.de>  Fri, 22 Sep 2006 14:07:35 +0000
+
 exim4 (4.63-3.0) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
diff --git a/debian/exim4-base.docs b/debian/exim4-base.docs
index 2a880ed..811c420 100644
--- a/debian/exim4-base.docs
+++ b/debian/exim4-base.docs
@@ -1,15 +1,15 @@
 NOTICE
 ACKNOWLEDGMENTS
-doc/README
+#doc/README
 doc/README.SIEVE
 README.UPDATING
-doc/dbm.discuss.txt
-doc/Exim3.upgrade
-doc/Exim4.upgrade
-doc/filter.txt
+#doc/dbm.discuss.txt
+#doc/Exim3.upgrade
+#doc/Exim4.upgrade
+#doc/filter.txt
 doc/NewStuff
 doc/OptionLists.txt
-doc/pcrepattern.txt
-doc/spec.txt
+#doc/pcrepattern.txt
+#doc/spec.txt
 debian/changelog.Debian.old
 debian/README.Debian.html
diff --git a/debian/exim4-base.manpages b/debian/exim4-base.manpages
index 324403a..aebf78a 100644
--- a/debian/exim4-base.manpages
+++ b/debian/exim4-base.manpages
@@ -1,4 +1,4 @@
-doc/exim.8
+#doc/exim.8
 debian/manpages/exicyclog.8
 debian/manpages/exigrep.8
 debian/manpages/exim_checkaccess.8
diff --git a/debian/patches/00list b/debian/patches/00list
index 7d84668..69d7d97 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,6 @@
+10_version_number
 30_dontoverridecflags
-31_eximmanpage
+#31_eximmanpage
 32_exim4
 33_eximon.binary
 34_eximstatsmanpage
@@ -9,4 +10,4 @@
 40_boolean_redefine_protect
 50_localscan_dlopen
 60_convert4r4
-70_remove_exim-users_references
+#70_remove_exim-users_references
diff --git a/debian/patches/10_version_number.dpatch b/debian/patches/10_version_number.dpatch
new file mode 100755
index 0000000..7ac97ed
--- /dev/null
+++ b/debian/patches/10_version_number.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_version_number.dpatch by Marc Haber <mh+debian-packages@zugschlus.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad trunk~/src/version.c trunk/src/version.c
+--- trunk~/src/version.c	2006-09-21 02:15:43.000000000 +0000
++++ trunk/src/version.c	2006-09-21 08:19:07.000000000 +0000
+@@ -12,7 +12,7 @@
+ #include "exim.h"
+ 
+ 
+-#define THIS_VERSION  "4.64"
++#define THIS_VERSION  "4.63.20060921"
+ 
+ 
+ /* The header file cnumber.h contains a single line containing the
diff --git a/debian/rules b/debian/rules
index e7366e0..2393280 100755
--- a/debian/rules
+++ b/debian/rules
@@ -389,7 +389,7 @@ binary-arch: build $(install)
 	dh_installpam $(dhbuildpackages)
 	dh_installmime $(dhbuildpackages)
 	#dh_installinit $(dhbuildpackages) --noscripts --name=exim4
-	# work around #347577
+	# work around #347577 (fixed in debhelper 5.0.15)
 	dh_installinit $(dhbuildpackages) -n --name=exim4
 	dh_installcron $(dhbuildpackages)
 #	dh_installinfo $(dhbuildpackages)