[Python-modules-commits] r24742 - in packages/python-xlrd/trunk/debian (7 files)

[bernat at users.alioth.debian.org]

    Date: Tuesday, June 11, 2013 @ 14:45:22
  Author: bernat
Revision: 24742

Add Python3 support. Closes: #614503

Added:
  packages/python-xlrd/trunk/debian/python-xlrd.install
  packages/python-xlrd/trunk/debian/python-xlrd.manpages
    (from rev 24732, packages/python-xlrd/trunk/debian/manpages)
  packages/python-xlrd/trunk/debian/python3-xlrd.install
Modified:
  packages/python-xlrd/trunk/debian/changelog
  packages/python-xlrd/trunk/debian/control
  packages/python-xlrd/trunk/debian/rules
Deleted:
  packages/python-xlrd/trunk/debian/manpages

Modified: packages/python-xlrd/trunk/debian/changelog
===================================================================
--- packages/python-xlrd/trunk/debian/changelog	2013-06-11 14:44:19 UTC (rev 24741)
+++ packages/python-xlrd/trunk/debian/changelog	2013-06-11 14:45:22 UTC (rev 24742)
@@ -17,6 +17,7 @@
   * Update manual page.
   * Switch to machine-readable debian/copyright.
   * Use shipped unittests.
+  * Add Python 3 support. Closes: #614503.
 
  -- Vincent Bernat <bernat at debian.org>  Tue, 11 Jun 2013 15:22:17 +0200
 

Modified: packages/python-xlrd/trunk/debian/control
===================================================================
--- packages/python-xlrd/trunk/debian/control	2013-06-11 14:44:19 UTC (rev 24741)
+++ packages/python-xlrd/trunk/debian/control	2013-06-11 14:45:22 UTC (rev 24742)
@@ -5,7 +5,7 @@
 Uploaders: Vincent Bernat <bernat at debian.org>
 Standards-Version: 3.9.4
 Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: python (>= 2.6.6-3~)
+Build-Depends-Indep: python-all (>= 2.6.6-3~), python3-all
 Homepage: http://www.python-excel.org/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-xlrd/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-xlrd/trunk/
@@ -20,3 +20,16 @@
  .
  xlrd is a pure Python module and does not require any dependency
  outside of the standard Python distribution.
+
+Package: python3-xlrd
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Description: extract data from Microsoft Excel spreadsheet files (Python3 version)
+ xlrd is a Python library to Extract data from new and old Microsoft
+ Excel spreadsheets. It supports both .xls and .xlsx files (from Excel
+ 2007).
+ .
+ xlrd is a pure Python module and does not require any dependency
+ outside of the standard Python distribution.
+ .
+ This package contains the Python3 version of xlrd.

Deleted: packages/python-xlrd/trunk/debian/manpages
===================================================================
--- packages/python-xlrd/trunk/debian/manpages	2013-06-11 14:44:19 UTC (rev 24741)
+++ packages/python-xlrd/trunk/debian/manpages	2013-06-11 14:45:22 UTC (rev 24742)
@@ -1 +0,0 @@
-debian/runxlrd.1

Added: packages/python-xlrd/trunk/debian/python-xlrd.install
===================================================================
--- packages/python-xlrd/trunk/debian/python-xlrd.install	                        (rev 0)
+++ packages/python-xlrd/trunk/debian/python-xlrd.install	2013-06-11 14:45:22 UTC (rev 24742)
@@ -0,0 +1,2 @@
+usr/lib/python2*
+usr/bin/runxlrd.py

Copied: packages/python-xlrd/trunk/debian/python-xlrd.manpages (from rev 24732, packages/python-xlrd/trunk/debian/manpages)
===================================================================
--- packages/python-xlrd/trunk/debian/python-xlrd.manpages	                        (rev 0)
+++ packages/python-xlrd/trunk/debian/python-xlrd.manpages	2013-06-11 14:45:22 UTC (rev 24742)
@@ -0,0 +1 @@
+debian/runxlrd.1

Added: packages/python-xlrd/trunk/debian/python3-xlrd.install
===================================================================
--- packages/python-xlrd/trunk/debian/python3-xlrd.install	                        (rev 0)
+++ packages/python-xlrd/trunk/debian/python3-xlrd.install	2013-06-11 14:45:22 UTC (rev 24742)
@@ -0,0 +1 @@
+usr/lib/python3*

Modified: packages/python-xlrd/trunk/debian/rules
===================================================================
--- packages/python-xlrd/trunk/debian/rules	2013-06-11 14:44:19 UTC (rev 24741)
+++ packages/python-xlrd/trunk/debian/rules	2013-06-11 14:45:22 UTC (rev 24742)
@@ -1,13 +1,38 @@
 #!/usr/bin/make -f
 
+PY2VERSIONS = $(shell pyversions -vr)
+PY3VERSIONS = $(shell py3versions -vr)
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3
 
+override_dh_auto_build:
+	dh_auto_build
+	set -e; for version in $(PY3VERSIONS); do \
+		python$$version setup.py build; \
+	done
+
+override_dh_auto_install:
+	dh_auto_install
+	set -e; for version in $(PY3VERSIONS); do \
+		python$$version setup.py install --no-compile -O0 --install-layout=deb \
+					--root $(CURDIR)/debian/tmp; \
+	done
+
+override_dh_auto_clean:
+	dh_auto_clean
+	set -e; for version in $(PY3VERSIONS); do \
+		python$$version setup.py clean; \
+	done
+	rm -rf xlrd/__pycache__/
+
 override_dh_install:
-	dh_install
+	dh_install --fail-missing
 	mv debian/python-xlrd/usr/bin/runxlrd.py debian/python-xlrd/usr/bin/runxlrd
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-    python -m unittest discover
+	set -e; for version in $(PY2VERSIONS) $(PY3VERSIONS); do \
+		python$$version -m unittest discover ; \
+	done
 endif