rev 19783 - kde-extras/exiv2/trunk/debian

[Pino Toscano]

Author: pino
Date: 2013-12-15 18:47:41 +0000 (Sun, 15 Dec 2013)
New Revision: 19783

Removed:
   kde-extras/exiv2/trunk/debian/libexiv2-doc.linktrees
Modified:
   kde-extras/exiv2/trunk/debian/changelog
   kde-extras/exiv2/trunk/debian/control
   kde-extras/exiv2/trunk/debian/rules
Log:
fix jquery.js replacement

- properly replace any version with a symlink
- remove usage of dh-linktree: drop libexiv2-doc.linktrees and the
  dh-linktree build dependency
- make libexiv2-doc depend on libjs-jquery


Modified: kde-extras/exiv2/trunk/debian/changelog
===================================================================
--- kde-extras/exiv2/trunk/debian/changelog	2013-12-15 18:24:36 UTC (rev 19782)
+++ kde-extras/exiv2/trunk/debian/changelog	2013-12-15 18:47:41 UTC (rev 19783)
@@ -2,6 +2,12 @@
 
   [ Pino Toscano ]
   * Update Vcs-* headers.
+  * Fix the replacement of the doxygen-generated jquery.js with a symlink to
+    the system copy:
+    - properly replace any version with a symlink
+    - remove usage of dh-linktree: drop libexiv2-doc.linktrees and the
+      dh-linktree build dependency
+    - make libexiv2-doc depend on libjs-jquery
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 15 Dec 2013 19:22:59 +0100
 

Modified: kde-extras/exiv2/trunk/debian/control
===================================================================
--- kde-extras/exiv2/trunk/debian/control	2013-12-15 18:24:36 UTC (rev 19782)
+++ kde-extras/exiv2/trunk/debian/control	2013-12-15 18:47:41 UTC (rev 19783)
@@ -5,7 +5,7 @@
 Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), chrpath,
  autotools-dev, libexpat1-dev, zlib1g-dev,
- libjs-jquery, dh-linktree,
+ libjs-jquery,
  doxygen, graphviz, python, xsltproc
 Standards-Version: 3.9.3
 Homepage: http://www.exiv2.org
@@ -70,7 +70,7 @@
  This package provides the development files for using exiv2.
 
 Package: libexiv2-doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Section: doc
 Architecture: all
 Description: EXIF/IPTC metadata manipulation library - HTML documentation

Modified: kde-extras/exiv2/trunk/debian/rules
===================================================================
--- kde-extras/exiv2/trunk/debian/rules	2013-12-15 18:24:36 UTC (rev 19782)
+++ kde-extras/exiv2/trunk/debian/rules	2013-12-15 18:47:41 UTC (rev 19783)
@@ -28,6 +28,7 @@
 
 override_dh_installdocs:
 	dh_installdocs -A -Xcmd.txt -XMakefile -Xtemplates -XChangeLog
+	find debian -name jquery.js -exec ln -sfv /usr/share/javascript/jquery/jquery.js {} \;
 
 override_dh_installchangelogs:
 	dh_installchangelogs -A doc/ChangeLog