Bringing packaging/Debian/ up to date with the current Samba package

in Debian unstable. The stuff here was ages old...
(This used to be commit 5646df8bfb327d74f9c07fc219023a5aecdbc70d)

2 files changed, 21 insertions, 1 deletions

diff --git a/packaging/Debian/debian/scripts/patch-source b/packaging/Debian/debian/scripts/patch-source
index a95a002048..4623eee00c 100755
--- a/packaging/Debian/debian/scripts/patch-source
+++ b/packaging/Debian/debian/scripts/patch-source
@@ -1,7 +1,17 @@
 #!/bin/sh -e
+#
+# $Id: patch-source,v 1.2.4.1 2003/06/01 04:30:13 peloy Exp $
+#
 
 for patch in debian/patches/*.patch; do
+	echo '->'`basename $patch`:
 	patch -p1 < $patch
 done
 
+cat debian/changelog | perl -pi -e '($version) = <STDIN> =~/\((.*)\)/; \
+		s/\".*\"/\"$version for Debian\"/' source/include/version.h
+
+# Regenerate configure only if it is older than configure.in
+[ source/configure -ot source/configure.in ] && (cd source && sh ./autogen.sh)
+
 exit 0
diff --git a/packaging/Debian/debian/scripts/unpatch-source b/packaging/Debian/debian/scripts/unpatch-source
index 81d51f7dd4..92014982fc 100755
--- a/packaging/Debian/debian/scripts/unpatch-source
+++ b/packaging/Debian/debian/scripts/unpatch-source
@@ -1,7 +1,17 @@
 #!/bin/sh -e
+#
+# $Id: unpatch-source,v 1.2.4.1 2003/06/01 04:30:13 peloy Exp $
+#
 
-for patch in debian/patches/*.patch; do
+# We want to reverse the patches in the opposite order we applied
+#	them, hence the 'ls|sort -r'.
+for patch in `ls debian/patches/*.patch | sort -r`; do
 	patch -p1 -R < $patch
 done
 
+perl -pi -e's/-.* for Debian//' source/include/version.h
+
+# Regenerate configure only if it is older than configure.in
+[ source/configure -ot source/configure.in ] && (cd source && autoheader && autoconf)
+
 exit 0