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

[kitterman at users.alioth.debian.org]

    Date: Thursday, July 4, 2013 @ 01:58:11
  Author: kitterman
Revision: 25073

  * Fix up debian/python-sip-dev.install from last commit
  * Use build Sphinx based documenation from source and use dh_sphinxdoc to
    generate dependencies for python-sip-doc
    - Add sphinxdoc:Depends to python-sip-doc depends
    - Add call to sphinx-build and dh_sphinxdoc in debian/rules
    - Add python-sphinx to build-depends

Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/control
  packages/sip4/trunk/debian/python-sip-dev.install
  packages/sip4/trunk/debian/rules

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2013-07-03 21:58:56 UTC (rev 25072)
+++ packages/sip4/trunk/debian/changelog	2013-07-04 01:58:11 UTC (rev 25073)
@@ -9,6 +9,11 @@
     - Update .install and .manpages files for package split
   * Remove redundant Recommends on python-sip/python3-sip in the -dev
     packages
+  * Use build Sphinx based documenation from source and use dh_sphinxdoc to
+    generate dependencies for python-sip-doc
+    - Add sphinxdoc:Depends to python-sip-doc depends
+    - Add call to sphinx-build and dh_sphinxdoc in debian/rules
+    - Add python-sphinx to build-depends
 
  -- Scott Kitterman <scott at kitterman.com>  Wed, 03 Jul 2013 17:33:19 -0400
 

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2013-07-03 21:58:56 UTC (rev 25072)
+++ packages/sip4/trunk/debian/control	2013-07-04 01:58:11 UTC (rev 25073)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Scott Kitterman <scott at kitterman.com>
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 7), python-all-dev (>= 2.7.2-5~), python-all-dbg, python3-all-dev (>= 3.2.2~rc1-1~), python3-all-dbg, flex
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 7), python-all-dev (>= 2.7.2-5~), python-all-dbg,
+ python3-all-dev (>= 3.2.2~rc1-1~), python3-all-dbg, python-sphinx (>= 1.0.7+dfsg), flex
 Standards-Version: 3.9.4
 Homepage: http://www.riverbankcomputing.co.uk/software/sip/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/sip4/trunk/
@@ -99,7 +100,7 @@
 Package: python-sip-doc
 Architecture: all
 Section: doc
-Depends: libjs-jquery, libjs-underscore, ${misc:Depends}
+Depends: libjs-jquery, libjs-underscore, ${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

Modified: packages/sip4/trunk/debian/python-sip-dev.install
===================================================================
--- packages/sip4/trunk/debian/python-sip-dev.install	2013-07-03 21:58:56 UTC (rev 25072)
+++ packages/sip4/trunk/debian/python-sip-dev.install	2013-07-04 01:58:11 UTC (rev 25073)
@@ -1 +1,2 @@
-usr/bin/dh_sip
+usr/lib/python2*/*-packages/sipdistutils.py
+../../debian/dh_sip usr/bin

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2013-07-03 21:58:56 UTC (rev 25072)
+++ packages/sip4/trunk/debian/rules	2013-07-04 01:58:11 UTC (rev 25073)
@@ -198,7 +198,9 @@
 	dh_builddeb
 
 # Build architecture independant packages using the common target.
-binary-indep: 
+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.