[Python-modules-commits] r21453 - in packages/prettytable/trunk/debian (9 files)

Sun Apr 29 23:25:13 UTC 2012

Date: Sunday, April 29, 2012 @ 23:25:11
  Author: jandd
Revision: 21453

* Team upload.
* switched to source format 3.0 (quilt)
* add Python3 support (Closes: #638303, LP: #825110)
  - add debian/patches/use2to3.diff to enable 2to3 in setup.py
  - add new binary package python3-prettytable
  - add python3 and python3-setuptools to Build-Depends
  - use print(x) instead of print x in debian/prettytable-example.py
* drop python-support in favour of dh_python{2,3}
  - refine dependency versions
  - remove python-support dependency
* bump Standards-Version to 3.9.3 (no changes needed)
* add myself to debian/copyright for debian/*

Added:
  packages/prettytable/trunk/debian/patches/
  packages/prettytable/trunk/debian/patches/series
  packages/prettytable/trunk/debian/patches/use2to3.diff
Modified:
  packages/prettytable/trunk/debian/changelog
  packages/prettytable/trunk/debian/control
  packages/prettytable/trunk/debian/copyright
  packages/prettytable/trunk/debian/prettytable-example.py
  packages/prettytable/trunk/debian/rules
  packages/prettytable/trunk/debian/source/format

Modified: packages/prettytable/trunk/debian/changelog
===================================================================

--- packages/prettytable/trunk/debian/changelog	2012-04-29 21:28:40 UTC (rev 21452)
+++ packages/prettytable/trunk/debian/changelog	2012-04-29 23:25:11 UTC (rev 21453)
@@ -1,3 +1,20 @@
+prettytable (0.5-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * switched to source format 3.0 (quilt)
+  * add Python3 support (Closes: #638303, LP: #825110)
+    - add debian/patches/use2to3.diff to enable 2to3 in setup.py
+    - add new binary package python3-prettytable
+    - add python3 and python3-setuptools to Build-Depends
+    - use print(x) instead of print x in debian/prettytable-example.py
+  * drop python-support in favour of dh_python{2,3}
+    - refine dependency versions
+    - remove python-support dependency
+  * bump Standards-Version to 3.9.3 (no changes needed)
+  * add myself to debian/copyright for debian/*
+
+ -- Jan Dittberner <jandd at debian.org>  Mon, 30 Apr 2012 00:52:43 +0200
+
 prettytable (0.5-2) UNRELEASED; urgency=low
 
   * debian/control

Modified: packages/prettytable/trunk/debian/control
===================================================================
--- packages/prettytable/trunk/debian/control	2012-04-29 21:28:40 UTC (rev 21452)
+++ packages/prettytable/trunk/debian/control	2012-04-29 23:25:11 UTC (rev 21453)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 7), python, python-setuptools
-Build-Depends-Indep: python-support (>= 1.0.0)
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), python3
+ (>= 3.1.3-3), python-setuptools, python3-setuptools
+Standards-Version: 3.9.3
 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 +20,16 @@
  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: ${python: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.
+ .
+ This is the Python3 version of the package.

Modified: packages/prettytable/trunk/debian/copyright
===================================================================
--- packages/prettytable/trunk/debian/copyright	2012-04-29 21:28:40 UTC (rev 21452)
+++ packages/prettytable/trunk/debian/copyright	2012-04-29 23:25:11 UTC (rev 21453)
@@ -39,5 +39,6 @@
 The Debian packaging is:
 
     Copyright (C) 2009 Sandro Tosi <morph at debian.org>
+    Copyright (C) 2012 Jan Dittberner <jandd at debian.org>
 
 and is licensed under the same terms as upstream code

Added: packages/prettytable/trunk/debian/patches/series
===================================================================
--- packages/prettytable/trunk/debian/patches/series	                        (rev 0)
+++ packages/prettytable/trunk/debian/patches/series	2012-04-29 23:25:11 UTC (rev 21453)
@@ -0,0 +1 @@
+use2to3.diff

Added: packages/prettytable/trunk/debian/patches/use2to3.diff
===================================================================
--- packages/prettytable/trunk/debian/patches/use2to3.diff	                        (rev 0)
+++ packages/prettytable/trunk/debian/patches/use2to3.diff	2012-04-29 23:25:11 UTC (rev 21453)
@@ -0,0 +1,11 @@
+Subject: add use_2to3 option to setup.py to enable Python3 support
+Author: Jan Dittberner <jandd at debian.org>
+--- a/setup.py
++++ b/setup.py
+@@ -9,5 +9,6 @@
+     author_email='luke at maurits.id.au',
+     url='http://www.luke.maurits.id.au/software/prettytable',
+     license='http://www.luke.maurits.id.au/software/bsdlicense.txt',
++    use_2to3=True,
+     py_modules=['prettytable']
+ )

Modified: packages/prettytable/trunk/debian/prettytable-example.py
===================================================================
--- packages/prettytable/trunk/debian/prettytable-example.py	2012-04-29 21:28:40 UTC (rev 21452)
+++ packages/prettytable/trunk/debian/prettytable-example.py	2012-04-29 23:25:11 UTC (rev 21453)
@@ -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()

Modified: packages/prettytable/trunk/debian/rules
===================================================================
--- packages/prettytable/trunk/debian/rules	2012-04-29 21:28:40 UTC (rev 21452)
+++ packages/prettytable/trunk/debian/rules	2012-04-29 23:25:11 UTC (rev 21453)
@@ -2,6 +2,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+override_dh_auto_install:
+	python setup.py install --install-layout=deb \
+		--root=$(CURDIR)/debian/python-prettytable
+	python3 setup.py install --install-layout=deb \
+		--root=$(CURDIR)/debian/python3-prettytable
 
+override_dh_python2:
+	dh_python2 -ppython-prettytable
+
+override_dh_python3:
+	dh_python3 -ppython3-prettytable
+
 %:
-	dh $@
+	dh $@ --with=python2,python3 --buildsystem=python_distutils

Modified: packages/prettytable/trunk/debian/source/format
===================================================================
--- packages/prettytable/trunk/debian/source/format	2012-04-29 21:28:40 UTC (rev 21452)
+++ packages/prettytable/trunk/debian/source/format	2012-04-29 23:25:11 UTC (rev 21453)
@@ -1 +1 @@
-1.0
+3.0 (quilt)


