patch management with dpkg-source v3

Simplify debian/rules by using dpkg-source v3 (quilt) instead of the
home-grown patch system in debian/rules.

Change debian/nightly_build.sh to build a non-native package.

debian/changelog

@@ -15,6 +15,7 @@ wmaker (0.92.0-9) unstable; urgency=low
      /usr/share/doc/autotools-dev/README.Debian.gz.
   * Remove ./libtool on clean, otherwise it is not possible build twice from
     the same unpacked sourcetree.
+  * Use dpkg-source v3 instead of home-grown patch system.
 
  -- Andreas Metzler <ametzler@debian.org>  Sat, 07 Aug 2010 10:56:00 +0200
 

debian/nightly_build.sh

@@ -65,7 +65,12 @@ doEnv() {
 
 doChlog() {
   cp debian/changelog ${CHLOGBKP}
-  debchange -v ${BASEVERSION}-${REPOVERSION} "${CHANGELOG}" || return 1
+  debchange -v ${BASEVERSION}-${REPOVERSION}-1 "${CHANGELOG}" || return 1
+}
+
+doTarball() {
+	echo tar -czf ../wmaker_${BASEVERSION}-${REPOVERSION}.orig.tar.gz .
+	tar -czf ../wmaker_${BASEVERSION}-${REPOVERSION}.orig.tar.gz .
 }
 
 doBuild() {
@@ -90,6 +95,7 @@ RC=0
 if doPull ; then
   doEnv
   doChlog || errorExit "Error adding new changelog entry."
+  doTarball || errorExit "Error building source tarball."
   doBuild || errorExit "Error during build of .deb package."
 else
   RC=1

debian/patches/50_def_config_paths.diff

@@ -1,10 +1,8 @@
-Index: src/wconfig.h.in
-===================================================================
 diff --git a/src/wconfig.h.in b/src/wconfig.h.in
-index cab2bd0..e0dc434 100644
+index c8bb947..cf06113 100644
---- src/wconfig.h.in
+--- a/src/wconfig.h.in
-+++ src/wconfig.h.in
++++ b/src/wconfig.h.in
-@@ -146,7 +146,7 @@
+@@ -132,7 +132,7 @@
   */
 
  /* list of paths to look for the config files, searched in order of appearance */

debian/patches/series

@@ -0,0 +1 @@
+50_def_config_paths.diff

debian/rules

@@ -111,9 +111,6 @@ COMMON_OPTIONS    := --prefix=$(BASEDIR)              \
                      --with-gnustepdir=$(GNUSTEPDIR)  \
                      --with-xft
 
-LIST_PATCHES      := find debian/patches -mindepth 1 -maxdepth 1 -name \*.diff -type f | sort
-RLIST_PATCHES     := find debian/patches -mindepth 1 -maxdepth 1 -name \*.diff -type f | sort -r
-
 install_file      := install -p    -o root -g root -m 0644
 install_prog      := install -p    -o root -g root -m 0755
 install_dir       := install -p -d -o root -g root -m 0755
@@ -128,7 +125,7 @@ build-wmaker-stamp: config-wmaker-stamp
 	$(MAKE) -C $(WMAKER_BD)
 	touch $@
 
-config-wmaker-stamp: patch-wmaker-stamp configure
+config-wmaker-stamp: configure
 	dh_testdir
 	test -x config.guess || chmod +x config.guess
 	test -x config.sub || chmod +x config.sub
@@ -139,46 +136,6 @@ config-wmaker-stamp: patch-wmaker-stamp configure
 	 $(WMAKER_OPTIONS) CFLAGS="$(CFLAGS)"
 	touch $@
 
-patch-wmaker-stamp:
-	@$(LIST_PATCHES) | \
-	while read patch ; do \
-	    echo $$patch ; \
-	    if head -1 $$patch | grep -q ^Index: ; then \
-		patch -p0 < $$patch ; \
-	    else \
-		patch -p1 < $$patch ; \
-	    fi ; \
-	    echo ; \
-	done
-	touch $@
-
-test-patch-wmaker:
-	@$(LIST_PATCHES) | \
-	while read patch ; do \
-	    echo $$patch ; \
-	    if head -1 $$patch | grep -q ^Index: ; then \
-		patch --dry-run -p0 < $$patch ; \
-	    else \
-		patch --dry-run -p1 < $$patch ; \
-	    fi ; \
-	    echo ; \
-	done
-
-unpatch-wmaker:
-	@if [ -e patch-wmaker-stamp ] ; then \
-	    $(RLIST_PATCHES) | \
-	    while read patch ; do \
-		echo $$patch ; \
-		if head -1 $$patch | grep -q ^Index: ; then \
-		    patch -p0 -R < $$patch ; \
-		else \
-		    patch -p1 -R < $$patch ; \
-		fi ; \
-		echo ; \
-	    done ; \
-	    rm patch-wmaker-stamp ; \
-	fi
-
 clean:
 	dh_testdir
 	dh_testroot
@@ -187,7 +144,6 @@ clean:
 		debian/*.files \
 		debian/shlibs.local \
 		debian/conffiles
-	debian/rules unpatch-wmaker
 	dh_clean libtool
 
 binary-indep: build
@@ -375,4 +331,4 @@ debian/shlibs.local:
 configure:	configure.ac
 	$(TOPSRCDIR)/autogen.sh
 
-.PHONY: binary binary-arch binary-indep binary-custom clean build unpatch-wmaker
+.PHONY: binary binary-arch binary-indep binary-custom clean build

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)