[SCM] cytadela: old-school first person shooter branch, master, updated. upstream/0.9-12-gdf689a5

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit df689a5fc0354d115f785654924c69186db26ec2
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Fri Jun 18 14:17:57 2010 +0200

    Detect binary-indep build differently

diff --git a/debian/changelog b/debian/changelog
index 7421787..0b5c2af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 cytadela (1.0.0-2) unstable; urgency=low
 
   * Fix FTBFS when building only the architecture-dependent package.
-    DH7's overrides and multiple Architecture: don't mix well.
 
  -- Sylvain Beucler <beuc at debian.org>  Fri, 18 Jun 2010 13:57:15 +0200
 
diff --git a/debian/rules b/debian/rules
index a484679..748db23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,9 +34,9 @@ override_dh_install:
 override_dh_installdocs:
 	# Group all documentation in the -data arch-indep package
 	dh_installdocs --link-doc=cytadela-data
+# dh_listpackages uses DH_INTERNAL_OPTIONS that is set to '-a'/'-i'/''
+ifneq (,$(findstring cytadela-data, $(shell dh_listpackages)))
 	# lintian extra-license-file
-	# Using '-f' so that build don't fail if we're just building
-	# the architecture-dependent package and not the
-	# architecture-independent one (dpkg-buildpackage -B).
-	rm -f debian/cytadela-data/usr/share/doc/cytadela-data/COPYING
-	rm -f debian/cytadela-data/usr/share/doc/cytadela-data/GNUFDL
+	rm debian/cytadela-data/usr/share/doc/cytadela-data/COPYING
+	rm debian/cytadela-data/usr/share/doc/cytadela-data/GNUFDL
+endif

-- 
cytadela: old-school first person shooter