[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 b94f41ccdb208097adc1fcd03f5b6f8ee258df0d
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Thu May 27 13:06:38 2010 +0200

    single install target, parallel build works

diff --git a/debian/changelog b/debian/changelog
index 959686a..6b2d17c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 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.
+  * debian/rules: There is only one build and install target, enabling
+    DEB_BUILD_OPTIONS="parallel=X" support.
 
  -- 
 
diff --git a/debian/rules b/debian/rules
index fcca149..c748627 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,20 +78,14 @@ build-stamp: patch
 	touch $@
 
 
-install: install-indep install-arch
-
-install-indep:
+install: install-stamp
+install-stamp:
 	dh_testdir
 	dh_testroot
-	dh_prep -i
-	dh_installdirs -i
+	dh_prep
+	dh_installdirs
 
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	DESTDIR=$(CURDIR)/debian/tmp/ \
-		$(MAKE) install-data-local \
-			datadir=/usr/share \
-			pkgdatadir=/usr/share/games/wesnoth/$(BRANCH_VERSION)
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 	cd $(CURDIR)/debian/tmp/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \
 		&& chmod +x extractbindings unit_tree/TeamColorizer \
@@ -99,29 +93,10 @@ install-indep:
 		wmlindent wmlflip wmllint wmlscope wesnoth_addon_manager \
 		wmlvalidator hexometer/hexometer wmlxgettext
 
+	dh_install
 
-	DESTDIR=$(CURDIR)/debian/tmp/ \
-		$(MAKE) -C po install \
-			localedir=/usr/share/games/wesnoth/$(BRANCH_VERSION)/locale
-
-	dh_install -i
-
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_prep -s
-	dh_installdirs -s
-
-	# Add here commands to install the arch part of the package into
-	# debian/tmp.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	DESTDIR=$(CURDIR)/debian/tmp \
-		$(MAKE) install-exec
-	DESTDIR=$(CURDIR)/debian/tmp \
-		$(MAKE) -C doc/man install
+	touch $@
 
-	dh_install -s
 
 
 # Must not depend on anything. This is to be called by
@@ -153,7 +128,7 @@ binary-common:
 
 
 # Build architecture independant packages using the common target.
-binary-indep: build install-indep
+binary-indep: build install
 	# workaround for dh_link (mis)behavior, see BTS#445550
 	for i in ttf-dejavu/DejaVuSans.ttf; \
 		do ln -s /usr/share/fonts/truetype/$$i \
@@ -177,7 +152,7 @@ binary-indep: build install-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
-binary-arch: build install-arch
+binary-arch: build install
 	# 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 \
@@ -230,4 +205,4 @@ binary-arch: build install-arch
 
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+.PHONY: build clean binary-indep binary-arch binary install

-- 
Debian packaging of wesnoth