[Python-apps-commits] r9331 - in packages/cython/trunk/debian (4 files)

[yoh at users.alioth.debian.org]

    Date: Monday, December 24, 2012 @ 16:04:05
  Author: yoh
Revision: 9331

Do not swallow dh_installdocs entirely + use system-wide underscore.js

Modified:
  packages/cython/trunk/debian/changelog
  packages/cython/trunk/debian/control
  packages/cython/trunk/debian/cython-doc.links
  packages/cython/trunk/debian/rules

Modified: packages/cython/trunk/debian/changelog
===================================================================
--- packages/cython/trunk/debian/changelog	2012-12-24 16:03:54 UTC (rev 9330)
+++ packages/cython/trunk/debian/changelog	2012-12-24 16:04:05 UTC (rev 9331)
@@ -5,6 +5,7 @@
     - provides CHANGES.rst (was missing from source distribution,
       up_changes_rst patch provides a copy), so all machinery for fetching
       changelogs from wiki is removed
+  * Pruning shipped underscore.js, -doc depends on libjs-underscore now
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Thu, 20 Dec 2012 12:34:19 -0500
 

Modified: packages/cython/trunk/debian/control
===================================================================
--- packages/cython/trunk/debian/control	2012-12-24 16:03:54 UTC (rev 9330)
+++ packages/cython/trunk/debian/control	2012-12-24 16:04:05 UTC (rev 9331)
@@ -72,7 +72,7 @@
 Package: cython-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
 Suggests: cython
 Description: C-Extensions for Python - documentation
  This package contains documentation for Cython.

Modified: packages/cython/trunk/debian/cython-doc.links
===================================================================
--- packages/cython/trunk/debian/cython-doc.links	2012-12-24 16:03:54 UTC (rev 9330)
+++ packages/cython/trunk/debian/cython-doc.links	2012-12-24 16:04:05 UTC (rev 9331)
@@ -1 +1,2 @@
 usr/share/javascript/jquery/jquery.js usr/share/doc/cython-doc/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/cython-doc/html/_static/underscore.js

Modified: packages/cython/trunk/debian/rules
===================================================================
--- packages/cython/trunk/debian/rules	2012-12-24 16:03:54 UTC (rev 9330)
+++ packages/cython/trunk/debian/rules	2012-12-24 16:04:05 UTC (rev 9331)
@@ -74,13 +74,15 @@
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 ifneq (,$(findstring -a,$(DH_INTERNAL_OPTIONS)))
 	: # not building documentation in -a
+	: # just faking having documentation so that dh-installdocs doesn't fail
+	mkdir -p docs/build/html
 else
 	make -C docs html
-	: # Use jquery from Debian package, so prune shipped one
-	-rm docs/build/html/_static/jquery.js
-	dh_installdocs -pcython-doc
+	: # Use jquery/underscore from Debian package, so prune shipped one
+	-rm docs/build/html/_static/jquery.js docs/build/html/_static/underscore.js
 endif
 endif
+	dh_installdocs
 
 
 override_dh_installchangelogs: