[Python-modules-commits] r17301 - in packages/python-docutils/trunk/debian (6 files)

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Mon Jun 6 00:20:57 UTC 2011 

    Date: Monday, June 6, 2011 @ 00:20:55
  Author: jwilk
Revision: 17301

Build packages for Python 3.

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/control
  packages/python-docutils/trunk/debian/docutils-doc.links
  packages/python-docutils/trunk/debian/python-docutils.install
  packages/python-docutils/trunk/debian/python-roman.install
  packages/python-docutils/trunk/debian/rules

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-06-06 00:02:03 UTC (rev 17300)
+++ packages/python-docutils/trunk/debian/changelog	2011-06-06 00:20:55 UTC (rev 17301)
@@ -18,8 +18,9 @@
   * Bump standards version to 3.9.2 (no changes needed).
   * Drop obsolete recommendation of python-elementtree.
   * Drop obsolete conflict with zope3.
+  * Build packages for Python 3 (closes: #577725).
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 06 Jun 2011 01:24:38 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 06 Jun 2011 02:15:02 +0200
 
 python-docutils (0.7-2) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2011-06-06 00:02:03 UTC (rev 17300)
+++ packages/python-docutils/trunk/debian/control	2011-06-06 00:20:55 UTC (rev 17301)
@@ -7,8 +7,8 @@
            Simon McVittie <smcv at debian.org>,
            Michael Schutte <michi at uiae.at>,
            Ben Finney <ben+debian at benfinney.id.au>
-Build-Depends: debhelper (>= 7), python-all (>= 2.3)
-Build-Depends-Indep: python-support (>= 0.6.4),
+Build-Depends: debhelper (>= 7), python-all (>= 2.3), python3-all
+Build-Depends-Indep: python-support (>= 0.6.4), python3 (>= 3.1.2-1~),
                      docbook-to-man
 Standards-Version: 3.9.2
 XS-Python-Version: >= 2.3
@@ -41,18 +41,35 @@
           docutils-writer-odt,
           rst2man
 Breaks: python-epydoc (<< 3.0.1-4~)
-Description: utilities for the documentation of Python modules
+Description: utilities for the documentation of Python modules (implemented in Python 2)
  The purpose of the Docutils project is to create a set of tools for
  processing plaintext documentation into useful formats, such as HTML,
  XML, and TeX.
  .
- The package includes the reStructuredText parser, the Python
- Docstring Processing System project. 
+ This package includes Python 2 modules and command line utilities.
 
+Package: python3-docutils
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends},
+         python3-roman,
+         docutils-common (= ${source:Version})
+Recommends: python3-imaging,
+            python3-pygments,
+            libpaper-utils,
+            python3-lxml,            
+            docutils-doc (= ${source:Version})
+Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french
+Description: utilities for the documentation of Python modules (implemented in Python 3)
+ The purpose of the Docutils project is to create a set of tools for
+ processing plaintext documentation into useful formats, such as HTML,
+ XML, and TeX.
+ .
+ This package includes Python 3 modules and command line utilities.
+
 Package: docutils-common
 Architecture: all
 Depends: ${misc:Depends}, 
-Recommends: python-docutils
+Recommends: python-docutils | python3-docutils
 Conflicts: python-docutils (<< 0.7-3~)
 Replaces: python-docutils (<< 0.7-3~)
 Description: utilities for the documentation of Python modules - data files
@@ -78,7 +95,7 @@
 Package: python-roman
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Description: module for generating/analyzing Roman numerals
+Description: module for generating/analyzing Roman numerals for Python 2
  This module converts from and to Roman numerals. It can convert numbers
  from 1 to 4999 and understands the common shortcuts (IX == 9), but not
  illegal ones (MIM == 1999).
@@ -87,5 +104,18 @@
  experienced programmers.  Visit http://diveintopython.org/ for the
  latest version.
  .
- It is maintained in Debian as part of the python-docutils package.
+ This package includes Python 2 modules.
 
+Package: python3-roman
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: module for generating/analyzing Roman numerals for Python 3
+ This module converts from and to Roman numerals. It can convert numbers
+ from 1 to 4999 and understands the common shortcuts (IX == 9), but not
+ illegal ones (MIM == 1999).
+ .
+ This module is part of "Dive Into Python", a free Python tutorial for
+ experienced programmers.  Visit http://diveintopython.org/ for the
+ latest version.
+ .
+ This package includes Python 3 modules.

Modified: packages/python-docutils/trunk/debian/docutils-doc.links
===================================================================
--- packages/python-docutils/trunk/debian/docutils-doc.links	2011-06-06 00:02:03 UTC (rev 17300)
+++ packages/python-docutils/trunk/debian/docutils-doc.links	2011-06-06 00:20:55 UTC (rev 17301)
@@ -1,2 +1,3 @@
 /usr/share/doc/docutils-doc/docs /usr/share/doc/python-docutils/docs
+/usr/share/doc/docutils-doc/docs /usr/share/doc/python3-docutils/docs
 /usr/share/doc/docutils-doc/HISTORY.txt /usr/share/doc/docutils-doc/changelog

Modified: packages/python-docutils/trunk/debian/python-docutils.install
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.install	2011-06-06 00:02:03 UTC (rev 17300)
+++ packages/python-docutils/trunk/debian/python-docutils.install	2011-06-06 00:20:55 UTC (rev 17301)
@@ -1,3 +1,3 @@
 /usr/bin/*
-/usr/lib/python*.*/*-packages/docutils*.egg-info
-/usr/lib/python*.*/*-packages/docutils
+/usr/lib/python2.*/*-packages/docutils*.egg-info
+/usr/lib/python2.*/*-packages/docutils

Modified: packages/python-docutils/trunk/debian/python-roman.install
===================================================================
--- packages/python-docutils/trunk/debian/python-roman.install	2011-06-06 00:02:03 UTC (rev 17300)
+++ packages/python-docutils/trunk/debian/python-roman.install	2011-06-06 00:20:55 UTC (rev 17301)
@@ -1 +1 @@
-/usr/lib/python*.*/*-packages/roman.py
+/usr/lib/python2.*/*-packages/roman.py

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2011-06-06 00:02:03 UTC (rev 17300)
+++ packages/python-docutils/trunk/debian/rules	2011-06-06 00:20:55 UTC (rev 17301)
@@ -18,6 +18,7 @@
 build-stamp:
 	dh_testdir
 	$(PYTHON) setup.py build
+	python3 setup.py build
 	set -e && for dir in $(BUILDHTML_DIRS); do \
 		PYTHONPATH=.:extras $(PYTHON) tools/buildhtml.py \
 			--local --config=tools/docutils.conf $$dir \
@@ -39,6 +40,7 @@
 	dh_testroot
 	rm -f build-stamp
 	$(PYTHON) setup.py clean --all
+	python3 setup.py clean --all
 	-find -name '*.py[co]' | xargs rm -f
 	rm -f *.html
 	rm -rf debian/man.tmp
@@ -55,13 +57,15 @@
 	mkdir -p debian/tmp
 	$(PYTHON) setup.py install \
 	    --root debian/tmp --no-compile $(py_setup_install_args)
+	python3 setup.py install \
+	    --root debian/tmp --no-compile $(py_setup_install_args)
 	# Move data files outside dist-packages:
 	mkdir -p debian/tmp/usr/share/
 	cp -rl debian/tmp/usr/lib/python2.*/*-packages/docutils debian/tmp/usr/share/
-	find debian/tmp/usr/lib/python2.*/*-packages/docutils/ -type f '!' -name '*.py' -delete
+	find debian/tmp/usr/lib/python[23].*/*-packages/docutils/ -type f '!' -name '*.py' -delete
 	find debian/tmp/usr/share/docutils/ -type f -name '*.py' -delete
 	find debian/tmp/ -type d -empty -delete
-	sed -i -e 's/^\(_debian_package\) = /\1 = 1/' debian/tmp/usr/lib/python2.*/*-packages/docutils/__init__.py
+	sed -i -e 's/^\(_debian_package\) = /\1 = 1/' debian/tmp/usr/lib/python[23]*/*-packages/docutils/__init__.py
 	: # give scripts canonical names in /usr/bin
 	cd debian/tmp/usr/bin && \
 	mv rst2newlatex.py rst2newlatex && \
@@ -108,7 +112,8 @@
 	cd debian/docutils-doc/usr/share/doc/python-docutils/ && ln -s ../docutils-doc/*.html .
 	dh_install -i
 	dh_lintian
-	dh_pysupport
+	dh_pysupport -p python-docutils -p python-roman
+	dh_python3 -p python3-docutils -p python3-roman
 	dh_installexamples
 	dh_installman
 	dh_installchangelogs

More information about the Python-modules-commits mailing list