diff -pruN 2.6.2.1-3/debian/changelog 2.6.2.1-3ubuntu1/debian/changelog --- 2.6.2.1-3/debian/changelog 2010-03-08 12:37:53.000000000 +0000 +++ 2.6.2.1-3ubuntu1/debian/changelog 2010-03-08 12:35:41.000000000 +0000 @@ -1,3 +1,16 @@ +python-multiprocessing (2.6.2.1-3ubuntu1) lucid; urgency=low + + * Makefile, debian/rules: Build documentation using sphinx-build instead of + setup.py to fix FTBFS. Change to Makefile is inline to avoid setting up a + patchsys + * Move documentation into python-multiprocessing-doc binary package: + - debian/control: Add new binary package python-multiprocessing-doc + - Move Dependency libjs-jquery from python-multiprocessing to -doc (LP: #450706) + This lets you install the library without extraneous javascript libs. + - Add -doc to python-multiprocessing Recommends + + -- David Futcher Mon, 08 Mar 2010 09:18:13 +0000 + python-multiprocessing (2.6.2.1-3) unstable; urgency=low * debian/control diff -pruN 2.6.2.1-3/debian/control 2.6.2.1-3ubuntu1/debian/control --- 2.6.2.1-3/debian/control 2010-03-08 12:37:53.000000000 +0000 +++ 2.6.2.1-3ubuntu1/debian/control 2010-03-08 12:35:41.000000000 +0000 @@ -1,7 +1,8 @@ Source: python-multiprocessing Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Sandro Tosi Build-Depends: debhelper (>= 7), python2.5-dev, python2.5-dbg, python-support (>= 1), python-sphinx (>= 0.5), python-setuptools (>= 0.6c8) Standards-Version: 3.8.3 @@ -13,7 +14,8 @@ XS-Python-Version: 2.5 Package: python-multiprocessing Architecture: any XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, libjs-jquery +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Recommends: python-multiprocessing-doc Description: process-based "threading" interface multiprocessing is a package that supports spawning processes using an API similar to the threading module. The multiprocessing package @@ -48,3 +50,22 @@ Description: process-based "threading" i http://pyprocessing.berlios.de/ . . This package contains the debug symbols for python-multiprocessing. + +Package: python-multiprocessing-doc +Architecture: any +Depends: libjs-jquery +Description: process-based "threading" interface (documentation) + multiprocessing is a package that supports spawning processes using + an API similar to the threading module. The multiprocessing package + offers both local and remote concurrency, effectively side-stepping + the Global Interpreter Lock by using subprocesses instead of + threads. Due to this, the multiprocessing module allows the + programmer to fully leverage multiple processors on a given machine. + It runs on both Unix and Windows. + . + This is a back port to Python 2.4/2.5 of the multiprocessing package + introduced via PEP-371 and Python 2.6. This is essentially a + meta-fork of the original pyprocessing project found at: + http://pyprocessing.berlios.de/ . + . + This package contains the library documentation for python-multiprocessing. diff -pruN 2.6.2.1-3/debian/python-multiprocessing.doc-base 2.6.2.1-3ubuntu1/debian/python-multiprocessing.doc-base --- 2.6.2.1-3/debian/python-multiprocessing.doc-base 2010-03-08 12:37:53.000000000 +0000 +++ 2.6.2.1-3ubuntu1/debian/python-multiprocessing.doc-base 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -Document: python-multiprocessing -Title: multiprocessing’s documentation -Author: Python Software Foundation -Abstract: multiprocessing is a package that supports spawning - processes using an API similar to the threading module. The - multiprocessing package offers both local and remote concurrency, - effectively side-stepping the Global Interpreter Lock by using - subprocesses instead of threads. Due to this, the multiprocessing - module allows the programmer to fully leverage multiple processors on - a given machine. It runs on both Unix and Windows. -Section: Programming/Python - -Format: HTML -Index: /usr/share/doc/python-multiprocessing/html/index.html -Files: /usr/share/doc/python-multiprocessing/html/* diff -pruN 2.6.2.1-3/debian/python-multiprocessing-doc.doc-base 2.6.2.1-3ubuntu1/debian/python-multiprocessing-doc.doc-base --- 2.6.2.1-3/debian/python-multiprocessing-doc.doc-base 1970-01-01 01:00:00.000000000 +0100 +++ 2.6.2.1-3ubuntu1/debian/python-multiprocessing-doc.doc-base 2010-03-08 12:35:41.000000000 +0000 @@ -0,0 +1,15 @@ +Document: python-multiprocessing +Title: multiprocessing’s documentation +Author: Python Software Foundation +Abstract: multiprocessing is a package that supports spawning + processes using an API similar to the threading module. The + multiprocessing package offers both local and remote concurrency, + effectively side-stepping the Global Interpreter Lock by using + subprocesses instead of threads. Due to this, the multiprocessing + module allows the programmer to fully leverage multiple processors on + a given machine. It runs on both Unix and Windows. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python-multiprocessing/html/index.html +Files: /usr/share/doc/python-multiprocessing/html/* diff -pruN 2.6.2.1-3/debian/rules 2.6.2.1-3ubuntu1/debian/rules --- 2.6.2.1-3/debian/rules 2010-03-08 12:37:53.000000000 +0000 +++ 2.6.2.1-3ubuntu1/debian/rules 2010-03-08 12:35:41.000000000 +0000 @@ -71,10 +71,10 @@ binary-arch: install dh_testdir dh_testroot dh_installchangelogs CHANGES.txt - dh_installdocs README.txt build/sphinx/html/ - dh_installexamples Doc/includes/* + dh_installdocs -ppython-multiprocessing-doc README.txt Doc/* + dh_installexamples -ppython-multiprocessing-doc Doc/includes/* ln -sf /usr/share/javascript/jquery/jquery.js \ - $(CURDIR)/debian/python-multiprocessing/usr/share/doc/python-multiprocessing/html/_static/jquery.js + $(CURDIR)/debian/python-multiprocessing-doc/usr/share/doc/python-multiprocessing-doc/html/_static/jquery.js dh_link dh_pysupport dh_strip -ppython-multiprocessing --dbg-package=python-multiprocessing-dbg diff -pruN 2.6.2.1-3/Makefile 2.6.2.1-3ubuntu1/Makefile --- 2.6.2.1-3/Makefile 2009-07-30 13:18:08.000000000 +0100 +++ 2.6.2.1-3ubuntu1/Makefile 2010-03-08 12:35:41.000000000 +0000 @@ -38,6 +38,6 @@ examples: inplace doc: mkdir -p Doc/static Doc/templates - $(PYTHON) setup.py build_sphinx --builder=$(BUILDER) \ - --source-dir=Doc/ - + #$(PYTHON) setup.py build_sphinx --builder=$(BUILDER) \ + # --source-dir=Doc/ + sphinx-build -b $(BUILDER) Doc/ Doc/html