[SCM] Debian packaging for XMLTooling-C branch, master, updated. debian/1.3.3-2-17-g716022d

Russ Allbery rra at debian.org
Mon Mar 14 03:58:39 UTC 2011


The following commit has been merged in the master branch:
commit ac5c907aa2c234752501612061157f8e0b0555a8
Author: Russ Allbery <rra at debian.org>
Date:   Sun Mar 13 19:46:10 2011 -0700

    Replace Doxygen-installed jQuery with a link to 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 0893c5d..6c8bcaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ xmltooling (1.4.1-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 the autotools-dev debhelper module for config.{sub,guess}.
     - Use debhelper rule minimization.
diff --git a/debian/control b/debian/control
index 4d3dc63..7d50ad7 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Description: XML schemas for XMLTooling
 Package: libxmltooling-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Description: C++ XML parsing library with encryption support (API docs)
  The XMLTooling library contains generic XML parsing and processing
  classes based on the Xerces-C DOM. It adds more powerful facilities
diff --git a/debian/rules b/debian/rules
index 1084a43..740fafb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DOCS = debian/libxmltooling-doc/usr/share/doc/libxmltooling-doc
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     DEBUG = --enable-debug
 else
@@ -11,6 +13,9 @@ override_dh_auto_configure:
 
 override_dh_installdocs:
 	dh_installdocs -A doc/NOTICE.txt
+	rm $(DOCS)/html/jquery.js
+	ln -s /usr/share/javascript/jquery/jquery.min.js \
+	    $(DOCS)/html/jquery.js
 
 %:
 	dh $@ --with autotools_dev

-- 
Debian packaging for XMLTooling-C



More information about the Pkg-shibboleth-devel mailing list