[SCM] Debian packaging for OpenSAML 2.0 branch, master, updated. debian/2.4.3-1-1-g223c7bb

Russ Allbery rra at debian.org
Mon Jul 25 21:31:24 UTC 2011


The following commit has been merged in the master branch:
commit 223c7bbfe8837ee3b253dc52a5a2107dd5d66b96
Author: Russ Allbery <rra at debian.org>
Date:   Mon Jul 25 14:31:03 2011 -0700

    Make removal of the Doxygen-installed jquery.js 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 c42e831..6ba2460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+opensaml2 (2.4.3-2) UNRELEASED; urgency=low
+
+  * Make removal of the Doxygen-installed jquery.js file conditional on
+    its existence, since some versions of Doxygen don't install it.
+
+ -- Russ Allbery <rra at debian.org>  Mon, 25 Jul 2011 14:30:56 -0700
+
 opensaml2 (2.4.3-1) unstable; urgency=high
 
   * Set urgency to high for security fix.
diff --git a/debian/rules b/debian/rules
index 8f6b46a..5c188bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,11 @@ override_dh_install:
 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 OpenSAML 2.0



More information about the Pkg-shibboleth-devel mailing list