[Python-modules-commits] r18288 - in packages/shiboken/trunk/debian (3 files)

[odyx at users.alioth.debian.org]

    Date: Tuesday, August 23, 2011 @ 13:06:18
  Author: odyx
Revision: 18288

Use dh_sphinxdoc to handle the generated documentation.

- Replace libjs-jquery by ${sphinxdoc:Depends} in Depends.
- Drop shiboken-doc.links including explicit symlink to libjs-jquery.
- Conditionally use dh_sphinxdoc when needed.
- Drop unneeded -X.js in dh_compress.

Modified:
  packages/shiboken/trunk/debian/control
  packages/shiboken/trunk/debian/rules
Deleted:
  packages/shiboken/trunk/debian/shiboken-doc.links

Modified: packages/shiboken/trunk/debian/control
===================================================================
--- packages/shiboken/trunk/debian/control	2011-08-23 13:04:59 UTC (rev 18287)
+++ packages/shiboken/trunk/debian/control	2011-08-23 13:06:18 UTC (rev 18288)
@@ -29,7 +29,7 @@
 
 Package: shiboken-doc
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Section: doc
 Description: CPython bindings generator for C++ libraries documentation
  Shiboken is a bindings generator for C++ libraries that outputs CPython

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2011-08-23 13:04:59 UTC (rev 18287)
+++ packages/shiboken/trunk/debian/rules	2011-08-23 13:06:18 UTC (rev 18288)
@@ -43,9 +43,6 @@
 override_dh_auto_build-%:
 	dh_auto_build -a --builddirectory=build-$*
 
-override_dh_compress:
-	dh_compress -X.js
-
 #### INSTALL ####
 
 override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install_dbg-%) $(PYVERSIONS:%=override_dh_auto_install-%)
@@ -116,3 +113,9 @@
 	# g++ version is < 4.5, add related symbols
 	sed -e 's|^ _| (lt-g++4.5)_|g' debian/libshiboken1.0.symbols.g++-lt-4.5 >> debian/libshiboken1.0.symbols-py$*
 endif
+
+override_dh_installdocs:
+	dh_installdocs
+ifneq (,$(filter shiboken-doc, $(shell dh_listpackages)))
+	dh_sphinxdoc -pshiboken-doc
+endif

Deleted: packages/shiboken/trunk/debian/shiboken-doc.links
===================================================================
--- packages/shiboken/trunk/debian/shiboken-doc.links	2011-08-23 13:04:59 UTC (rev 18287)
+++ packages/shiboken/trunk/debian/shiboken-doc.links	2011-08-23 13:06:18 UTC (rev 18288)
@@ -1,2 +0,0 @@
-# Don't embed python-sphinx's jquery
-usr/share/javascript/jquery/jquery.js usr/share/doc/shiboken-doc/html/_static/jquery.js