[SCM] Debian packaging for XMLTooling-C branch, master, updated. debian/1.4.1-3-7-ge1370b9

Russ Allbery rra at debian.org
Mon Jul 25 23:01:53 UTC 2011


The following commit has been merged in the master branch:
commit 0cd9772bcee0553d3cd5e68f3c3dcb7a11d7925f
Author: Russ Allbery <rra at debian.org>
Date:   Mon Jul 25 14:29:52 2011 -0700

    Make removal of jquery.js from the doc package conditional
    
    * Make removal of the Doxygen-installed jquery.js file conditional on
      its existence, since some versions of Doxygen don't install it.

diff --git a/debian/changelog b/debian/changelog
index d770967..e4bf43b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xmltooling (1.4.2-1) UNRELEASED; urgency=low
     - Fix use attribute in shorthand file CredentialResolver
     - Fix handling of SOAP 1.1 fault package
     - Make library init routines idempotent
+  * Make removal of the Doxygen-installed jquery.js file conditional on
+    its existence, since some versions of Doxygen don't install it.
   * Update debian/watch for the new upstream distribution location.
 
  -- Russ Allbery <rra at debian.org>  Mon, 25 Jul 2011 13:47:39 -0700
diff --git a/debian/rules b/debian/rules
index 89f93eb..90d6d91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,11 @@ override_dh_auto_configure:
 override_dh_installdocs:
 	dh_installdocs -A doc/NOTICE.txt
 	set -e; if [ -d "$(DOCS)" ] ; then \
-	    rm $(DOCS)/html/jquery.js ; \
-	    ln -s /usr/share/javascript/jquery/jquery.min.js \
-		$(DOCS)/html/jquery.js ; \
+	    if [ -f "$(DOCS)/html/jquery.js" ] ; then \
+		rm $(DOCS)/html/jquery.js ; \
+		ln -s /usr/share/javascript/jquery/jquery.min.js \
+		    $(DOCS)/html/jquery.js ; \
+	    fi ; \
 	fi
 
 %:

-- 
Debian packaging for XMLTooling-C



More information about the Pkg-shibboleth-devel mailing list