[cpp-log4shib] 13/20: Replacing the jquery.js embedded by Doxygen risks breaking the docs

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/1.0.9-1
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=09a4536201c99cc3f0b15a5c494b07f52aef8ed5

commit 09a4536201c99cc3f0b15a5c494b07f52aef8ed5
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jan 14 15:23:31 2016 +0100

    Replacing the jquery.js embedded by Doxygen risks breaking the docs
---
 debian/control                           |  1 -
 debian/liblog4shib-doc.lintian-overrides |  4 ++++
 debian/rules                             | 12 ------------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index f432fde..c873509 100644
--- a/debian/control
+++ b/debian/control
@@ -67,7 +67,6 @@ Package: liblog4shib-doc
 Section: doc
 Architecture: all
 Depends:
- libjs-jquery,
  ${misc:Depends},
 Description: log4j-style configurable logging library for C++ (API docs)
  log4shib provides a library of C++ classes for flexible logging to
diff --git a/debian/liblog4shib-doc.lintian-overrides b/debian/liblog4shib-doc.lintian-overrides
new file mode 100644
index 0000000..be0630a
--- /dev/null
+++ b/debian/liblog4shib-doc.lintian-overrides
@@ -0,0 +1,4 @@
+# This file is installed by Doxygen and is more than just a minimized jQuery
+# copy.  The Doxygen maintainers recommend against trying to replace it with
+# a symlink to the version in libjs-jquery, see #736360.
+embedded-javascript-library usr/share/doc/liblog4shib-doc/html/api/jquery.js please use libjs-jquery
diff --git a/debian/rules b/debian/rules
index 91ad1b9..9e4c2f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,6 @@ export DEB_LDFLAGS_MAINT_APPEND = -lpthread -Wl,--as-needed
 # can't import this, we don't care.
 -include /usr/share/dpkg/buildflags.mk
 
-DOCS = debian/liblog4shib-doc/usr/share/doc/liblog4shib-doc
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     DEBUG = --enable-debug
 else
@@ -40,16 +38,6 @@ override_dh_install:
 	perl -i -pe 's/^(Cflags: .*)\Q$(CPPFLAGS)\E/$$1/' \
 	    debian/*/usr/lib/*/pkgconfig/log4shib.pc
 
-override_dh_installdocs:
-	dh_installdocs
-	set -e; if [ -d "$(DOCS)" ] ; then				\
-	    if [ -f "$(DOCS)/html/api/jquery.js" ] ; then		\
-		rm $(DOCS)/html/api/jquery.js ;				\
-		ln -s /usr/share/javascript/jquery/jquery.min.js	\
-		    $(DOCS)/html/api/jquery.js ;			\
-	    fi ;							\
-	fi
-
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.