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

Tue Jun 11 13:22:31 UTC 2013

Date: Tuesday, June 11, 2013 @ 13:22:23
  Author: bernat
Revision: 24730

New upstream version. Closes: #682962.

Added:
  packages/python-xlrd/trunk/debian/patches/series
  packages/python-xlrd/trunk/debian/patches/setup-dont-include-doc-and-examples.patch
Modified:
  packages/python-xlrd/trunk/debian/changelog
  packages/python-xlrd/trunk/debian/compat
  packages/python-xlrd/trunk/debian/control
  packages/python-xlrd/trunk/debian/rules
Deleted:
  packages/python-xlrd/trunk/debian/patches/runxlrd.patch
  packages/python-xlrd/trunk/debian/patches/series
  packages/python-xlrd/trunk/debian/patches/setup.py.patch
  packages/python-xlrd/trunk/debian/preinst

Modified: packages/python-xlrd/trunk/debian/changelog
===================================================================

--- packages/python-xlrd/trunk/debian/changelog	2013-06-11 13:00:03 UTC (rev 24729)
+++ packages/python-xlrd/trunk/debian/changelog	2013-06-11 13:22:23 UTC (rev 24730)
@@ -8,6 +8,10 @@
   * Switch from dpatch to 3.0 (quilt) format. Closes: #664378.
   * New upstream release. Closes: #682962.
      + Update debian/watch to look at Pypi.
+     + Update homepage.
+     + Drop shebang patch. Not needed anymore.
+  * Bump Standards-Version to 3.9.4.
+  * Switch to dh and dh_python2.
 
  -- Vincent Bernat <bernat at guybrush.luffy.cx>  Tue, 11 Jun 2013 14:53:25 +0200
 

Modified: packages/python-xlrd/trunk/debian/compat
===================================================================
--- packages/python-xlrd/trunk/debian/compat	2013-06-11 13:00:03 UTC (rev 24729)
+++ packages/python-xlrd/trunk/debian/compat	2013-06-11 13:22:23 UTC (rev 24730)
@@ -1 +1 @@
-5
+7

Modified: packages/python-xlrd/trunk/debian/control
===================================================================
--- packages/python-xlrd/trunk/debian/control	2013-06-11 13:00:03 UTC (rev 24729)
+++ packages/python-xlrd/trunk/debian/control	2013-06-11 13:22:23 UTC (rev 24730)
@@ -1,19 +1,17 @@
 Source: python-xlrd
 Section: python
-XS-Python-Version: all
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: python(>= 2.1), python-support
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends-Indep: python (>= 2.6.6-3~)
 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/
 
 Package: python-xlrd
 Architecture: all
-Depends: ${python:Depends}
-XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}
 Description: extract data from MS Excel spreadsheet files
  Extract data from new and old Microsoft Excel spreadsheets on any platform.
  Pure Python (2.1 or later). Strong support for Excel dates. Unicode-aware.

Deleted: packages/python-xlrd/trunk/debian/patches/runxlrd.patch
===================================================================
--- packages/python-xlrd/trunk/debian/patches/runxlrd.patch	2013-06-11 13:00:03 UTC (rev 24729)
+++ packages/python-xlrd/trunk/debian/patches/runxlrd.patch	2013-06-11 13:22:23 UTC (rev 24730)
@@ -1,14 +0,0 @@
-Added hashbang
-
-diff -urNad xlrd-0.6.1~/scripts/runxlrd.py xlrd-0.6.1/scripts/runxlrd.py
---- xlrd-0.6.1~/scripts/runxlrd.py	2008-05-22 21:05:02.000000000 +0000
-+++ xlrd-0.6.1/scripts/runxlrd.py	2008-05-22 21:05:25.000000000 +0000
-@@ -1,5 +1,7 @@
-+#!/usr/bin/python
-+
- # -*- coding: cp1252 -*-
--# <p>Copyright © 2005-2007 Stephen John Machin, Lingfo Pty Ltd</p>
-+# <p>Copyright (C) 2005-2007 Stephen John Machin, Lingfo Pty Ltd</p>
- # <p>This script is part of the xlrd package, which is released under a
- # BSD-style licence.</p>
- 

Deleted: packages/python-xlrd/trunk/debian/patches/series
===================================================================
--- packages/python-xlrd/trunk/debian/patches/series	2013-06-11 13:00:03 UTC (rev 24729)
+++ packages/python-xlrd/trunk/debian/patches/series	2013-06-11 13:22:23 UTC (rev 24730)
@@ -1,2 +0,0 @@
-runxlrd.patch
-setup.py.patch

Added: packages/python-xlrd/trunk/debian/patches/series
===================================================================
--- packages/python-xlrd/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-xlrd/trunk/debian/patches/series	2013-06-11 13:22:23 UTC (rev 24730)
@@ -0,0 +1 @@
+setup-dont-include-doc-and-examples.patch

Added: packages/python-xlrd/trunk/debian/patches/setup-dont-include-doc-and-examples.patch
===================================================================
--- packages/python-xlrd/trunk/debian/patches/setup-dont-include-doc-and-examples.patch	                        (rev 0)
+++ packages/python-xlrd/trunk/debian/patches/setup-dont-include-doc-and-examples.patch	2013-06-11 13:22:23 UTC (rev 24730)
@@ -0,0 +1,19 @@
+Index: xlrd-0.9.2/setup.py
+===================================================================
+--- xlrd-0.9.2.orig/setup.py	2013-04-05 16:47:21.000000000 +0200
++++ xlrd-0.9.2/setup.py	2013-06-11 15:15:57.074385248 +0200
+@@ -27,14 +27,6 @@
+     scripts = [
+         'scripts/runxlrd.py',
+         ],
+-    package_data={
+-            'xlrd': [
+-                'doc/*.htm*',
+-                # 'doc/*.txt',
+-                'examples/*.*',
+-                ],
+-
+-            },
+     description = 'Library for developers to extract data from Microsoft Excel (tm) spreadsheet files',
+     long_description = \
+         "Extract data from Excel spreadsheets (.xls and .xlsx, versions 2.0 onwards) on any platform. " \

Deleted: packages/python-xlrd/trunk/debian/patches/setup.py.patch
===================================================================
--- packages/python-xlrd/trunk/debian/patches/setup.py.patch	2013-06-11 13:00:03 UTC (rev 24729)
+++ packages/python-xlrd/trunk/debian/patches/setup.py.patch	2013-06-11 13:22:23 UTC (rev 24730)
@@ -1,19 +0,0 @@
-Remove usr/pyshared/.../{docs,examples}/*
-
-diff -urNad xlrd-0.6.1~/setup.py xlrd-0.6.1/setup.py
---- xlrd-0.6.1~/setup.py	2007-06-10 08:40:44.000000000 +0000
-+++ xlrd-0.6.1/setup.py	2008-05-19 20:01:20.000000000 +0000
-@@ -56,12 +56,7 @@
- if python_version >= (2, 4):
-     args24 = mkargs(
-         package_data={
--            'xlrd': [
--                'doc/*.htm*',
--                # 'doc/*.txt',
--                'examples/*.*',
--                ],
--
-+            'xlrd': [],
-             },
-         )
-     args.update(args24)

Deleted: packages/python-xlrd/trunk/debian/preinst
===================================================================
--- packages/python-xlrd/trunk/debian/preinst	2013-06-11 13:00:03 UTC (rev 24729)
+++ packages/python-xlrd/trunk/debian/preinst	2013-06-11 13:22:23 UTC (rev 24730)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# TODO: remove this file after releasing Squeeze
-
-if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 0.6.1-2
-then
-        pycentral pkgremove python-xlrd
-fi
-
-#DEBHELPER#
-

Modified: packages/python-xlrd/trunk/debian/rules
===================================================================
--- packages/python-xlrd/trunk/debian/rules	2013-06-11 13:00:03 UTC (rev 24729)
+++ packages/python-xlrd/trunk/debian/rules	2013-06-11 13:22:23 UTC (rev 24730)
@@ -1,40 +1,8 @@
 #!/usr/bin/make -f
 
-build:
+%:
+	dh $@ --with python2
 
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean
-	rm -rf build/
-	find . -name "*.pyc" | xargs rm -f
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	python setup.py install --no-compile --root=$(CURDIR)/debian/python-xlrd --prefix=/usr
-	rm -rf $(CURDIR)/debian/python-xlrd/usr/bin/runxlrd.py
-	install -D -m 755 scripts/runxlrd.py $(CURDIR)/debian/python-xlrd/usr/share/runxlrd/runxlrd.py
-
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_pysupport
-	dh_installchangelogs HISTORY.html
-	dh_installdocs
-	dh_installexamples
-	dh_installman debian/runxlrd.1
-	dh_link /usr/share/runxlrd/runxlrd.py /usr/bin/runxlrd
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: 
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_install:
+	dh_install
+	mv debian/python-xlrd/usr/bin/runxlrd.py debian/python-xlrd/usr/bin/runxlrd


