[pkg-wine-party] [SCM] Debian Wine Gecko packaging branch, master, updated. debian/1.4+dfsg-1-10-g360b3f9

[Stephen Kitt]

The following commit has been merged in the master branch:
commit e695f67321a811a34931ae88bfce6fc527499220
Author: Stephen Kitt <steve at sk2.org>
Date:   Tue Jun 12 14:22:03 2012 +0200

    Avoid ignoring errors in the debian/rules build-clean target.

diff --git a/debian/changelog b/debian/changelog
index f3ed4cf..74289d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ wine-gecko-1.4 (1.4+dfsg-2) UNRELEASED; urgency=low
   * Stop making the MSIs and debugging archives executable.
   * Disable the 64-bit debug build until we can use 64-bit buildds to
     build the package (either via multiarch or 64-bit wine-bin).
+  * Avoid ignoring errors in the debian/rules build-clean target.
 
  -- Stephen Kitt <steve at sk2.org>  Mon, 04 Jun 2012 23:40:29 +0200
 
diff --git a/debian/rules b/debian/rules
index b5f3ce1..f906a5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,13 @@ wine_gecko$(VERSION)-x86_64-dbg/dist:
 
 build-clean:
 	dh_testdir
-	-$(MAKE) -f client.mk cleansrcdir
+	# The cleansrcdir target uses build/autoconf/clean-config.sh
+	# which contains bashisms but has a #!/bin/sh line in the
+	# upstream source; we only call the target if our patch is
+	# applied
+	if head -n 1 build/autoconf/clean-config.sh | grep -q /bin/bash; then \
+		$(MAKE) -f client.mk cleansrcdir; \
+	fi
 	rm -rf wine_gecko$(VERSION)-x86*
 	rm -f a.out confdefs.h configure js/src/configure \
 	 .mozconfig.mk .mozconfig.out security/manager/.nss.checkout

-- 
Debian Wine Gecko packaging