[Python-modules-commits] r10849 - in packages/python-kinterbasdb/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Monday, December 21, 2009 @ 22:41:22
  Author: morph
Revision: 10849

use the jquery.js provided by libjs-jquery package (not the embedded copy)

Modified:
  packages/python-kinterbasdb/trunk/debian/changelog
  packages/python-kinterbasdb/trunk/debian/control
  packages/python-kinterbasdb/trunk/debian/rules

Modified: packages/python-kinterbasdb/trunk/debian/changelog
===================================================================
--- packages/python-kinterbasdb/trunk/debian/changelog	2009-12-21 21:23:55 UTC (rev 10848)
+++ packages/python-kinterbasdb/trunk/debian/changelog	2009-12-21 22:41:22 UTC (rev 10849)
@@ -12,8 +12,9 @@
     - update docs to install
   * debian/{control, rules}
     - create text upstream changelog file (via lynx) and then install it
+    - use the jquery.js provided by libjs-jquery package (not the embedded copy)
 
- -- Sandro Tosi <morph at debian.org>  Mon, 21 Dec 2009 22:22:08 +0100
+ -- Sandro Tosi <morph at debian.org>  Mon, 21 Dec 2009 23:40:38 +0100
 
 python-kinterbasdb (3.2-4) unstable; urgency=low
 

Modified: packages/python-kinterbasdb/trunk/debian/control
===================================================================
--- packages/python-kinterbasdb/trunk/debian/control	2009-12-21 21:23:55 UTC (rev 10848)
+++ packages/python-kinterbasdb/trunk/debian/control	2009-12-21 22:41:22 UTC (rev 10849)
@@ -12,7 +12,7 @@
 
 Package: python-kinterbasdb
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-egenix-mxdatetime
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-egenix-mxdatetime, libjs-jquery
 Provides: ${python:Provides}
 Replaces: python2.3-kinterbasdb (<< 3.1.2-0.1), python2.4-kinterbasdb (<< 3.1.2-0.1)
 Conflicts: python2.3-kinterbasdb (<< 3.1.2-0.1), python2.4-kinterbasdb (<< 3.1.2-0.1)

Modified: packages/python-kinterbasdb/trunk/debian/rules
===================================================================
--- packages/python-kinterbasdb/trunk/debian/rules	2009-12-21 21:23:55 UTC (rev 10848)
+++ packages/python-kinterbasdb/trunk/debian/rules	2009-12-21 22:41:22 UTC (rev 10849)
@@ -69,14 +69,18 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs		docs/*.html docs/_static/* docs/_sources/*
+	dh_installdocs		docs
 	# generate text upstream changelog, install it and remove it
 	lynx -dump docs/changelog.html > docs/changelog.txt
 	dh_installchangelogs	docs/changelog.txt
 	rm -f docs/changelog.txt
+	# remove embedded jquery.js and use the system one
+	rm -f $(CURDIR)/debian/python-kinterbasdb/usr/share/doc/python-kinterbasdb/docs/_static/jquery.js
+	ln -sf /usr/share/javascript/jquery/jquery.js \
+		$(CURDIR)/debian/python-kinterbasdb/usr/share/doc/python-kinterbasdb/docs/_static/jquery.js
 	dh_link
 	dh_strip -ppython-kinterbasdb --dbg-package=python-kinterbasdb-dbg
-	dh_compress
+	dh_compress -X.js
 	dh_fixperms
 	dh_pysupport
 	dh_installdeb