[SCM] Debian packaging of wesnoth branch, alternatives, updated. debian/1.8.3-1-12-gf292f9b

[Gerfried Fuchs]

The following commit has been merged in the alternatives branch:
commit f292f9b60fc7022acef73210e6796111d7265f8b
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Fri Aug 13 10:16:25 2010 +0200

    Call patch and unpatch explicitly

diff --git a/debian/changelog b/debian/changelog
index 9a5c95d..fdaa033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,8 @@ wesnoth-1.8 (1:1.8.3-2) unstable; urgency=low
   * Use alternative handling and dpkg-divert for wesnoth binaries and
     manpages.
   * Add wesnoth and wesnoth-core meta packages depending on the corresponding
-    branch package.
     branch package (closes: #586291)
+  * Call patch and unpatch explicitly instead of having them as dependency.
 
  -- 
 
diff --git a/debian/rules b/debian/rules
index c673931..6d09779 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,8 +48,6 @@ BRANCH_VERSION = $(STRIP_MAJOR).$(MINOR_VERSION)
 CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-strict-compilation --disable-maintainer-mode --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth/$(BRANCH_VERSION) --with-localedir=\$${prefix}/share/games/wesnoth/$(BRANCH_VERSION)/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install
 
 
-include /usr/share/quilt/quilt.make
-
 clean:
 	dh_testdir
 	dh_testroot
@@ -65,12 +63,13 @@ clean:
 	find po -name "*.gmo" -exec rm -f {} \;
 	find po -name "stamp-po" -exec rm -f {} \;
 	rm -f config.sub config.guess
-	$(MAKE) -f debian/rules unpatch
+	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
 
 
-configure: configure-stamp patch
+configure: configure-stamp
 configure-stamp:
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	 CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./autogen.sh $(CONFIGURE_SWITCHES)
 	touch $@
 
@@ -208,4 +207,4 @@ binary-arch: install
 
 
 binary: binary-arch binary-indep
-.PHONY: clean configure build binary-indep binary-arch binary install
+.PHONY: clean configure build binary-indep binary-arch binary install patch unpatch

-- 
Debian packaging of wesnoth