[shibboleth-sp2] 03/12: Stop symlinking the Doxygen-generated jQuery file

[Russ Allbery]

This is an automated email from the git hooks/post-receive script.

rra pushed a commit to branch master
in repository shibboleth-sp2.

commit d637d59023d4c7f2a38f344ae635da0e3f3c4714
Author: Russ Allbery <rra at debian.org>
Date:   Sun Mar 16 15:51:47 2014 -0700

    Stop symlinking the Doxygen-generated jQuery file
    
    * Stop symlinking the minimized jQuery installed by Doxygen and remove
      the dependency on libjs-jquery.  The Doxygen maintainers recommend
      against this approach since this file is apparently not just a
      straight copy of jQuery.
---
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 debian/rules     | 5 -----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18626db..d00cc85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ shibboleth-sp2 (2.5.3+dfsg-1) UNRELEASED; urgency=medium
     Beckmann.  (Closes: #720036)
   * Disable the forcing of --silent mode in Libtool since Debian build log
     analysis wants verbose logs.
+  * Stop symlinking the minimized jQuery installed by Doxygen and remove
+    the dependency on libjs-jquery.  The Doxygen maintainers recommend
+    against this approach since this file is apparently not just a
+    straight copy of jQuery.
   * Remove the now-unnecessary dh_builddeb override to use xz compression.
   * Update standards version to 3.9.5 (no changes required).
 
diff --git a/debian/control b/debian/control
index 4da7aa8..693ea1b 100644
--- a/debian/control
+++ b/debian/control
@@ -72,7 +72,7 @@ Package: libshibsp-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends}
 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 5e8d606..1654a54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,11 +96,6 @@ override_dh_installchangelogs:
 
 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 -- start 20 2 3 4 5 .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git