[Python-modules-commits] r18942 - in packages/sphinx/branches/1.1/debian (4 files)

Sat Oct 15 17:27:00 UTC 2011

Date: Saturday, October 15, 2011 @ 17:26:59
  Author: jwilk
Revision: 18942

New binary package: python3-sphinx.

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/control
  packages/sphinx/branches/1.1/debian/rules
  packages/sphinx/branches/1.1/debian/sphinx-doc.links

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================

--- packages/sphinx/branches/1.1/debian/changelog	2011-10-15 17:08:14 UTC (rev 18941)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-10-15 17:26:59 UTC (rev 18942)
@@ -27,6 +27,8 @@
     + /usr/share/doc/python-sphinx/html used to be a directory, but is now a
       symlink. Conflict with older versions of python-docutils, so that dpkg
       can replace one with the other. Add lintian override.
+  * New binary package: python3-sphinx.
+    + Add build-dependency on python3 (needed for dh_python3).
   * Run dh_install with --fail-missing.
   * Improve debian/rules:
     + Make the build actually fail if integration tests for the JavaScript

Modified: packages/sphinx/branches/1.1/debian/control
===================================================================
--- packages/sphinx/branches/1.1/debian/control	2011-10-15 17:08:14 UTC (rev 18941)
+++ packages/sphinx/branches/1.1/debian/control	2011-10-15 17:26:59 UTC (rev 18942)
@@ -6,6 +6,7 @@
 Homepage: http://sphinx.pocoo.org/
 Build-Depends: debhelper (>= 7), python-all (>= 2.5.4-1~), python-setuptools (>= 0.6c5-1~)
 Build-Depends-Indep: python-support (>= 0.6.4),
+  python3 (>= 3.1.2-7~),
   python-docutils (>= 0.7),
   python-pygments (>= 1.2),
   python-jinja2 (>= 2.3),
@@ -14,6 +15,7 @@
   texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended,
   perl
 XS-Python-Version: >= 2.5
+X-Python3-Version: >= 3.1
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sphinx/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sphinx/trunk/
@@ -28,7 +30,7 @@
 Recommends: python (>= 2.6) | python-simplejson, python-imaging,
  sphinx-doc
 Suggests: jsmath
-Description: documentation generator for Python projects
+Description: documentation generator for Python projects (implemented in Python 2)
  Sphinx is a tool for producing documentation for Python projects, using
  reStructuredText as markup language.
  .
@@ -40,12 +42,39 @@
   * Extensibility. Existing extensions:
     - automatic testing of code snippets,
     - including docstrings from Python modules.
+ .
+ This package includes Python 2 modules and command line utilities.
 
+Package: python3-sphinx
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends},
+  python3-docutils (>= 0.7),
+  python3-pygments (>= 1.2),
+  python3-jinja2 (>= 2.3),
+  sphinx-common (= ${source:Version})
+Recommends: python3-imaging,
+ sphinx-doc
+Suggests: jsmath
+Description: documentation generator for Python projects (implemented in Python 3)
+ Sphinx is a tool for producing documentation for Python projects, using
+ reStructuredText as markup language.
+ .
+ Sphinx features:
+  * HTML, CHM, LaTeX output,
+  * Cross-referencing source code,
+  * Automatic indices,
+  * Code highlighting, using Pygments,
+  * Extensibility. Existing extensions:
+    - automatic testing of code snippets,
+    - including docstrings from Python modules.
+ .
+ This package includes Python 3 modules.
+
 Package: sphinx-common
 Architecture: all
 Depends: ${misc:Depends}, 
   libjs-sphinxdoc (= ${source:Version})
-Recommends: python-sphinx
+Recommends: python-sphinx | python3-sphinx
 Breaks: python-sphinx (<< 1.1)
 Replaces: python-sphinx (<< 1.1)
 Description: documentation generator for Python projects - common data

Modified: packages/sphinx/branches/1.1/debian/rules
===================================================================
--- packages/sphinx/branches/1.1/debian/rules	2011-10-15 17:08:14 UTC (rev 18941)
+++ packages/sphinx/branches/1.1/debian/rules	2011-10-15 17:26:59 UTC (rev 18942)
@@ -12,6 +12,7 @@
 
 debroot = debian/tmp/
 site_packages = $(call py_libdir,$(shell pyversions -d))
+py3_site_packages = $(call py_libdir,$(shell py3versions -d))
 javascript_path = /usr/share/javascript/sphinxdoc/1.0/
 
 build-arch:
@@ -33,6 +34,8 @@
 	done
 	xvfb-run ./debian/jstest/run-tests
 endif
+	python setup.py build --build-lib build/py2/
+	python3 setup.py build --build-lib build/py3/
 	touch build-stamp
 
 clean:
@@ -47,10 +50,16 @@
 	dh_testdir
 	dh_testroot
 	dh_installdirs
-	python setup.py install --no-compile --install-layout=deb --root $(debroot)
+	python setup.py \
+		build --build-lib build/py2/ \
+		install --no-compile --install-layout=deb --root $(debroot)
+	python3 setup.py \
+		build --build-lib build/py3/ \
+		install --no-compile --install-layout=deb --root $(debroot)
 	# move static files outside {site,dist}-packages
 	sed -i -e "s!^package_dir = .*!package_dir = '/usr/share/sphinx'!" \
-		$(debroot)$(site_packages)/sphinx/__init__.py
+		$(debroot)$(site_packages)/sphinx/__init__.py \
+		$(debroot)$(py3_site_packages)/sphinx/__init__.py
 	rm -rf $(debroot)/usr/share/sphinx/
 	mkdir -p $(debroot)/usr/share/sphinx/
 	cd $(debroot) && mv -t usr/share/sphinx/ \
@@ -63,6 +72,8 @@
 	mkdir -p $(debroot)/usr/share/sphinx/ext/autosummary/
 	cd $(debroot) && mv -t usr/share/sphinx/ext/autosummary/ \
 		.$(site_packages)/sphinx/ext/autosummary/templates
+	cd $(debroot)$(py3_site_packages)/sphinx/ && \
+		rm -rf texinputs/ themes/ pycode/Grammar.txt ext/autosummary/templates/
 	set -e -x; \
 	cd $(debroot) && \
 		for lang in $$(find .$(site_packages)/sphinx/locale \
@@ -74,6 +85,7 @@
 				usr/share/locale/$$lang/LC_MESSAGES/sphinx.mo; \
 		done
 	cd $(debroot)$(site_packages)/sphinx/locale && rm -rf sphinx.pot */
+	cd $(debroot)$(py3_site_packages)/sphinx/locale && rm -rf sphinx.pot */
 	# install scripts not touched by easy install
 	set -e -x; \
 	for script in sphinx-*.py; do \
@@ -106,7 +118,8 @@
 	$(warning W: version numbers in the manual pages are out of date)
 endif
 	dh_installman
-	dh_pysupport
+	dh_pysupport -p python-sphinx
+	dh_python3 -p python3-sphinx
 	dh_compress -X.py -X.js -X.rst -X.json -X.txt -Xobjects.inv
 	dh_link
 	dh_fixperms

Modified: packages/sphinx/branches/1.1/debian/sphinx-doc.links
===================================================================
--- packages/sphinx/branches/1.1/debian/sphinx-doc.links	2011-10-15 17:08:14 UTC (rev 18941)
+++ packages/sphinx/branches/1.1/debian/sphinx-doc.links	2011-10-15 17:26:59 UTC (rev 18942)
@@ -1,3 +1,5 @@
 /usr/share/doc/sphinx-doc/html/_sources/ /usr/share/doc/python-sphinx/rst
 /usr/share/doc/sphinx-doc/rst/ /usr/share/doc/python-sphinx/rst
 /usr/share/doc/sphinx-doc/html/ /usr/share/doc/python-sphinx/html
+/usr/share/doc/sphinx-doc/rst/ /usr/share/doc/python3-sphinx/rst
+/usr/share/doc/sphinx-doc/html/ /usr/share/doc/python3-sphinx/html


