[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.3.1+dfsg-2-32-gd5d479a

[Russ Allbery]

The following commit has been merged in the master branch:
commit ced5674d049d9aaf7111cabcce496fce8fba45cd
Author: Russ Allbery <rra at debian.org>
Date:   Wed Apr 6 21:38:18 2011 -0700

    Replace the Doxygen copy of jQuery with the packaged version
    
    * Replace the version of jQuery installed by Doxygen in the
      documentation package with a symlink to the version supplied by the
      Debian package and add a dependency.

diff --git a/debian/changelog b/debian/changelog
index 1dfab31..ffb2631 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ shibboleth-sp2 (2.4.2+dfsg-1) UNRELEASED; urgency=low
   * Add build dependency on pkg-config, which upstream now uses to find
     the SSL libraries.
   * Add build dependency on graphviz for better API documentation.
+  * Replace the version of jQuery installed by Doxygen in the
+    documentation package with a symlink to the version supplied by the
+    Debian package and add a dependency.
   * Update to debhelper compatibility level V8.
     - Use debhelper rule minimization.
   * Update debian/copyright to the current DEP-5 specification.
diff --git a/debian/control b/debian/control
index afa8d5b..207d17c 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,7 @@ Description: Federated web single sign-on system (development)
 Package: libshibsp-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Description: Federated web single sign-on system (API docs)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
diff --git a/debian/rules b/debian/rules
index 2b53392..ebdc35b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DOCS = debian/libshibsp-doc/usr/share/doc/libshibsp-doc
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     DEBUG = --enable-debug
 else
@@ -76,6 +78,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 ; \
+	fi
 
 override_dh_installinit:
 	dh_installinit --name=shibd

-- 
Debian packaging for the 2.0 Apache Shibboleth SP