[Python-modules-commits] r20093 - in packages/lazr.restfulclient/trunk/debian (7 files)

[stefanor at users.alioth.debian.org]

    Date: Tuesday, January 24, 2012 @ 14:15:43
  Author: stefanor
Revision: 20093

* Get rid of .pth files, dh_python2's namespace support is sufficient.
  (LP: #796992, #583426)
* Depend on python-lazr.uri. (LP: #876445)

Added:
  packages/lazr.restfulclient/trunk/debian/patches/install-data
Modified:
  packages/lazr.restfulclient/trunk/debian/changelog
  packages/lazr.restfulclient/trunk/debian/control
  packages/lazr.restfulclient/trunk/debian/patches/remove_test_requires
  packages/lazr.restfulclient/trunk/debian/patches/series
  packages/lazr.restfulclient/trunk/debian/rules
Deleted:
  packages/lazr.restfulclient/trunk/debian/patches/no_package_data.patch

Modified: packages/lazr.restfulclient/trunk/debian/changelog
===================================================================
--- packages/lazr.restfulclient/trunk/debian/changelog	2012-01-24 14:15:39 UTC (rev 20092)
+++ packages/lazr.restfulclient/trunk/debian/changelog	2012-01-24 14:15:43 UTC (rev 20093)
@@ -1,3 +1,11 @@
+lazr.restfulclient (0.12.0-3) UNRELEASED; urgency=low
+
+  * Get rid of .pth files, dh_python2's namespace support is sufficient.
+    (LP: #796992, #583426)
+  * Depend on python-lazr.uri. (LP: #876445)
+
+ -- Stefano Rivera <stefanor at debian.org>  Tue, 24 Jan 2012 15:51:42 +0200
+
 lazr.restfulclient (0.12.0-2) unstable; urgency=low
 
   * New maintainer.

Modified: packages/lazr.restfulclient/trunk/debian/control
===================================================================
--- packages/lazr.restfulclient/trunk/debian/control	2012-01-24 14:15:39 UTC (rev 20092)
+++ packages/lazr.restfulclient/trunk/debian/control	2012-01-24 14:15:43 UTC (rev 20093)
@@ -4,7 +4,7 @@
 Maintainer: Stefano Rivera <stefanor at debian.org>
 Uploaders:
  Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.3.0), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 7.3.0), python (>= 2.6.6-14~), python-setuptools
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/lazr.restfulclient
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/lazr.restfulclient/trunk/
@@ -15,6 +15,7 @@
 Architecture: all
 Depends:
  python-httplib2,
+ python-lazr.uri,
  python-pkg-resources,
  python-simplejson,
  python-wadllib (>= 1.1.4),

Added: packages/lazr.restfulclient/trunk/debian/patches/install-data
===================================================================
--- packages/lazr.restfulclient/trunk/debian/patches/install-data	                        (rev 0)
+++ packages/lazr.restfulclient/trunk/debian/patches/install-data	2012-01-24 14:15:43 UTC (rev 20093)
@@ -0,0 +1,14 @@
+Description: Install version.txt with package_data
+Author: Stefano Rivera <stefanor at debian.org>
+Last-Update: 2012-01-24
+
+--- a/setup.py
++++ b/setup.py
+@@ -42,6 +42,7 @@
+     namespace_packages=['lazr'],
+     packages=find_packages('src'),
+     package_dir={'':'src'},
++    package_data={'lazr.restfulclient': ['version.txt']},
+     include_package_data=True,
+     zip_safe=False,
+     maintainer='LAZR Developers',

Deleted: packages/lazr.restfulclient/trunk/debian/patches/no_package_data.patch
===================================================================
--- packages/lazr.restfulclient/trunk/debian/patches/no_package_data.patch	2012-01-24 14:15:39 UTC (rev 20092)
+++ packages/lazr.restfulclient/trunk/debian/patches/no_package_data.patch	2012-01-24 14:15:43 UTC (rev 20093)
@@ -1,15 +0,0 @@
-Description: Do not install documentation files in Python module directory
-Author: Luca Falavigna <dktrkranz at debian.org>
-Forwarded: not-needed
-
---- a/setup.py
-+++ b/setup.py
-@@ -45,7 +45,7 @@
-     namespace_packages=['lazr'],
-     packages=find_packages('src'),
-     package_dir={'':'src'},
--    include_package_data=True,
-+    include_package_data=False,
-     zip_safe=False,
-     maintainer='LAZR Developers',
-     maintainer_email='lazr-developers at lists.launchpad.net',

Modified: packages/lazr.restfulclient/trunk/debian/patches/remove_test_requires
===================================================================
--- packages/lazr.restfulclient/trunk/debian/patches/remove_test_requires	2012-01-24 14:15:39 UTC (rev 20092)
+++ packages/lazr.restfulclient/trunk/debian/patches/remove_test_requires	2012-01-24 14:15:43 UTC (rev 20093)
@@ -7,7 +7,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -56,11 +56,9 @@
+@@ -53,11 +53,9 @@
      license='LGPL v3',
      install_requires=[
          'httplib2',
@@ -19,7 +19,7 @@
          ],
      url='https://launchpad.net/lazr.restfulclient',
      download_url= 'https://launchpad.net/lazr.restfulclient/+download',
-@@ -73,8 +71,12 @@
+@@ -70,8 +68,12 @@
      extras_require=dict(
          docs=['Sphinx',
                'z3c.recipe.sphinxdoc'],

Modified: packages/lazr.restfulclient/trunk/debian/patches/series
===================================================================
--- packages/lazr.restfulclient/trunk/debian/patches/series	2012-01-24 14:15:39 UTC (rev 20092)
+++ packages/lazr.restfulclient/trunk/debian/patches/series	2012-01-24 14:15:43 UTC (rev 20093)
@@ -1,2 +1,3 @@
+no-ez-setup
 remove_test_requires
-no_package_data.patch
+install-data

Modified: packages/lazr.restfulclient/trunk/debian/rules
===================================================================
--- packages/lazr.restfulclient/trunk/debian/rules	2012-01-24 14:15:39 UTC (rev 20092)
+++ packages/lazr.restfulclient/trunk/debian/rules	2012-01-24 14:15:43 UTC (rev 20093)
@@ -5,8 +5,8 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	find $(CURDIR)/debian/python-lazr.restfulclient -wholename "*python2.*/lazr/restfulclient" \
-		-exec install -m 0644 $(CURDIR)/src/lazr/restfulclient/version.txt {} \;
+	# dh_python2's namespace feature is enough:
+	find debian/python*-lazr.* -name '*.pth' -delete
 
 override_dh_installchangelogs:
 	dh_installchangelogs src/lazr/restfulclient/NEWS.txt