[Python-modules-commits] r25679 - in packages/sip4/trunk/debian (4 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Tuesday, August 27, 2013 @ 17:19:50
  Author: mitya57-guest
Revision: 25679

* Call dh_sphinxdoc after dh_installdocs, to fix build failure with
  new debhelper versions.
* Remove wrong debian/python-sip-doc.docs, we install docs manually.
* Don't hardcode depends on libjs-jquery and libjs-underscore,
  ${sphinxdoc:Depends} takes care of that.

Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/control
  packages/sip4/trunk/debian/rules
Deleted:
  packages/sip4/trunk/debian/python-sip-doc.docs

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2013-08-27 16:49:58 UTC (rev 25678)
+++ packages/sip4/trunk/debian/changelog	2013-08-27 17:19:50 UTC (rev 25679)
@@ -1,3 +1,13 @@
+sip4 (4.15-2) UNRELEASED; urgency=low
+
+  * Call dh_sphinxdoc after dh_installdocs, to fix build failure with
+    new debhelper versions.
+  * Remove wrong debian/python-sip-doc.docs, we install docs manually.
+  * Don't hardcode depends on libjs-jquery and libjs-underscore,
+    ${sphinxdoc:Depends} takes care of that.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 27 Aug 2013 20:19:39 +0400
+
 sip4 (4.15-1) experimental; urgency=low
 
   * New upstream feature release

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2013-08-27 16:49:58 UTC (rev 25678)
+++ packages/sip4/trunk/debian/control	2013-08-27 17:19:50 UTC (rev 25679)
@@ -126,7 +126,7 @@
 Package: python-sip-doc
 Architecture: all
 Section: doc
-Depends: libjs-jquery, libjs-underscore, ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
 Description: Python/C++ bindings generator documentation
  SIP is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its

Deleted: packages/sip4/trunk/debian/python-sip-doc.docs
===================================================================
--- packages/sip4/trunk/debian/python-sip-doc.docs	2013-08-27 16:49:58 UTC (rev 25678)
+++ packages/sip4/trunk/debian/python-sip-doc.docs	2013-08-27 17:19:50 UTC (rev 25679)
@@ -1 +0,0 @@
-doc/html

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2013-08-27 16:49:58 UTC (rev 25678)
+++ packages/sip4/trunk/debian/rules	2013-08-27 17:19:50 UTC (rev 25679)
@@ -161,6 +161,9 @@
 	dh_installman
 	dh_installchangelogs NEWS
 	dh_installdocs -A
+ifeq (,$(findstring -a, $(DH_OPTIONS)))
+	dh_sphinxdoc -p python-sip-doc
+endif
 	dh_installexamples
 	dh_link
 # don't call strip twice (or make the -dbg doc directories symlinks twice),
@@ -194,7 +197,6 @@
 # Build architecture independant packages using the common target.
 binary-indep:
 	sphinx-build sphinx debian/python-sip-doc/usr/share/doc/python-sip-doc/html
-	dh_sphinxdoc -p python-sip-doc
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.