Merge lp:~james-page/ubuntu/oneiric/prettytable/bug-825110 into lp:ubuntu/oneiric/prettytable

[James Page]

Updates to support MIR.
Added python3-prettytable package.

[Dave Walker (davewalker)]

Great stuff, as ever.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-05-27 09:14:57 +0000
+++ debian/changelog	2011-08-16 12:48:17 +0000
@@ -1,3 +1,18 @@
+prettytable (0.5-1ubuntu1) oneiric; urgency=low
+
+  * Updates for Ubuntu MIR (LP: #825110).
+    - debian/rules, debian/control: dh_python2 transition. 
+    - debian/control: Bumped Standards-Version: 3.9.2, no changes.
+  * Switched to source/format: 3.0 (quilt).
+  * Added python3-prettytable package:
+    - debian/rules, debian/control: dh_python3 enablement, added
+      dependencies to support python3 package.
+    - debian/control: added python3-prettytable package.
+    - debian/rules: build and clean python2.x and python3 packages.
+    - debian/prettytable-example.py: updated to be python3 compatible.
+
+ -- James Page <[e-mail]>  Tue, 16 Aug 2011 13:46:00 +0100
+
 prettytable (0.5-1) unstable; urgency=low
 
   * Initial release (Closes: #530704)

=== modified file 'debian/control'
--- debian/control	2009-05-27 09:14:57 +0000
+++ debian/control	2011-08-16 12:48:17 +0000
@@ -1,11 +1,12 @@
 Source: prettytable
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: Sandro Tosi <[e-mail]>
-Build-Depends: debhelper (>= 7), python, python-setuptools
-Build-Depends-Indep: python-support (>= 1.0.0)
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~), python3-all (>= 3.1.3-3),
+ python-setuptools, python3-setuptools
+Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/prettytable/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/prettytable/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/prettytable/trunk/
@@ -20,3 +21,15 @@
  psql. PrettyTable allows for selection of which columns are to be
  printed, independent alignment of columns (left or right justified or
  centred) and printing of "sub-tables" by specifying a row range.
+
+Package: python3-prettytable
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Description: Python3 library to represent tabular data in visually appealing ASCII tables
+ PrettyTable is a simple Python library designed to make it quick and
+ easy to represent tabular data in visually appealing ASCII tables. It
+ was inspired by the ASCII tables used in the PostgreSQL shell
+ psql. PrettyTable allows for selection of which columns are to be
+ printed, independent alignment of columns (left or right justified or
+ centred) and printing of "sub-tables" by specifying a row range.
+

=== modified file 'debian/prettytable-example.py'
--- debian/prettytable-example.py	2009-05-27 09:14:57 +0000
+++ debian/prettytable-example.py	2011-08-16 12:48:17 +0000
@@ -14,7 +14,7 @@
     x.add_row(["Sydney", 2058, 4336374, 1214.8])
     x.add_row(["Melbourne", 1566, 3806092, 646.9])
     x.add_row(["Perth", 5386, 1554769, 869.4])
-    print x
+    print(x)
 
 if __name__ == "__main__":
     main()

=== added file 'debian/python3-prettytable.examples'
--- debian/python3-prettytable.examples	1970-01-01 00:00:00 +0000
+++ debian/python3-prettytable.examples	2011-08-16 12:48:17 +0000
@@ -0,0 +1,1 @@
+debian/prettytable-example.py

=== modified file 'debian/rules'
--- debian/rules	2009-05-27 09:14:57 +0000
+++ debian/rules	2011-08-16 12:48:17 +0000
@@ -2,6 +2,30 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 %:
-	dh $@
+	dh $@ --with python2,python3
+
+override_dh_auto_install:
+	set -e && for pyvers in $(shell pyversions -vr); do \
+	   python$$pyvers setup.py install --no-compile -O0 --install-layout=deb \
+	        --root $(CURDIR)/debian/python-prettytable; \
+	    python$$pyvers $(CURDIR)/prettytable.py; \
+	done
+	2to3 -w $(CURDIR)/prettytable.py
+	set -e && for pyvers in $(shell py3versions -sv); do \
+	    python$$pyvers setup.py install --no-compile -O0 --install-layout=deb \
+	        --root $(CURDIR)/debian/python3-prettytable; \
+	    python$$pyvers $(CURDIR)/prettytable.py; \
+	done
+	mv $(CURDIR)/prettytable.py.bak $(CURDIR)/prettytable.py
+
+override_dh_auto_clean:
+	set -e && for pyvers in $(shell pyversions -vr); do \
+	    python$$pyvers setup.py clean -a; \
+	done
+	set -e && for pyvers in $(shell py3versions -sv); do \
+	    python$$pyvers setup.py clean -a; \
+	done
+	find . -name \*.pyc -exec rm {} \;
+	dh_clean
+

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2011-08-16 12:48:17 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)