[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8.1-1-3-gb94f41c

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit 5c159b17ebca80d3adc93c14b9bf2ac1e88435a5
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Wed May 26 09:20:22 2010 +0200

    debian/rules: There is only one build target

diff --git a/debian/changelog b/debian/changelog
index e0fbc02..959686a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 wesnoth-1.8 (1:1.8.1-2) unstable; urgency=low
 
   * Call configure with --disable-strict-compilation.
+  * debian/rules: There is only one build target.
 
  -- 
 
diff --git a/debian/rules b/debian/rules
index 726b361..fcca149 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ include /usr/share/quilt/quilt.make
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp
+	rm -f build-stamp
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f aclocal.m4 config.h.in Makefile.in configure m4/Makefile.in \
@@ -70,22 +70,14 @@ clean: unpatch
 
 
 #Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: patch
+build: build-stamp
+build-stamp: patch
 	./autogen.sh
 	./configure $(CONFIGURE_SWITCHES)
 	$(MAKE)
 	touch $@
 
 
-build-indep: build-indep-stamp
-build-indep-stamp: patch
-	# Add here commands to compile the indep part of the package.
-	touch $@
-
-
 install: install-indep install-arch
 
 install-indep:
@@ -161,7 +153,7 @@ binary-common:
 
 
 # Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
+binary-indep: build install-indep
 	# workaround for dh_link (mis)behavior, see BTS#445550
 	for i in ttf-dejavu/DejaVuSans.ttf; \
 		do ln -s /usr/share/fonts/truetype/$$i \
@@ -185,7 +177,7 @@ binary-indep: build-indep install-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
+binary-arch: build install-arch
 	# manpage symlinks for old binaries
 	for i in debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/man/*/man6/wesnoth.6; do \
 		ln -s wesnoth-$(BRANCH_VERSION).6.gz \

-- 
Debian packaging of wesnoth