[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 450214a179ca4a5865a29e8173a482f6e3b94c96
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Fri Jun 18 13:58:24 2010 +0200

    Fix FTBFS when -B

diff --git a/debian/changelog b/debian/changelog
index 4d4eca9..7421787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
+
 cytadela (1.0.0-1) unstable; urgency=low
 
   * Initial release (Closes: #578703)
diff --git a/debian/rules b/debian/rules
index 3a9cf0a..a484679 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,5 +35,8 @@ override_dh_installdocs:
 	# Group all documentation in the -data arch-indep package
 	dh_installdocs --link-doc=cytadela-data
 	# lintian extra-license-file
-	rm debian/cytadela-data/usr/share/doc/cytadela-data/COPYING
-	rm debian/cytadela-data/usr/share/doc/cytadela-data/GNUFDL
+	# 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

-- 
cytadela: old-school first person shooter