[Pkg-golang-commits] [SCM] Packaging for Google Go branch, debian-sid, updated. debian/2%1.0.1-1-29-gb32e37d

[Michael Stapelberg]

The following commit has been merged in the debian-sid branch:
commit b32e37d71adab0e2a2b7c4433e7bad169a9a4f98
Author: Michael Stapelberg <stapelberg at debian.org>
Date:   Tue Mar 5 00:49:44 2013 +0100

    Fix FTBFS of binary-arch only builds (as performed by buildds)
    
    …caused by 'rm' not finding jquery.js in golang-doc (Thanks Peter Green)

diff --git a/debian/changelog b/debian/changelog
index 9ad6c37..88e3998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+golang (2:1.1~hg20130304-2) experimental; urgency=low
+
+  * Fix FTBFS of binary-arch only builds (as performed by buildds)
+    caused by 'rm' not finding jquery.js in golang-doc
+    (Thanks Peter Green)
+
+ -- Michael Stapelberg <stapelberg at debian.org>  Tue, 05 Mar 2013 00:49:27 +0100
+
 golang (2:1.1~hg20130304-1) experimental; urgency=low
 
   * Provide a hg tip snapshot (2013-03-04) in Debian experimental.
diff --git a/debian/rules b/debian/rules
index 5c0d20f..14c2ece 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,8 @@ override_dh_compress:
 
 override_dh_install:
 	dh_install --fail-missing
-	# Replace jquery in the html documentation with a symlink to libjs-jquery
-	rm $(CURDIR)/debian/golang-doc/usr/share/doc/golang-doc/html/jquery.js
+	# Replace jquery in the html documentation with a symlink to libjs-jquery.
+	-rm $(CURDIR)/debian/golang-doc/usr/share/doc/golang-doc/html/jquery.js && \
 	ln -s /usr/share/javascript/jquery/jquery.min.js $(CURDIR)/debian/golang-doc/usr/share/doc/golang-doc/html/jquery.js
 	# Make scripts executable
 	chmod +x $(CURDIR)/debian/golang-src/usr/share/go/src/cmd/godoc/setup-godoc-app.bash

-- 
Packaging for Google Go