[Python-modules-commits] r21515 - in packages/python-launchpadlib/trunk/debian (11 files)

stefanor at users.alioth.debian.org stefanor at users.alioth.debian.org
Thu May 3 15:09:35 UTC 2012


    Date: Thursday, May 3, 2012 @ 15:09:34
  Author: stefanor
Revision: 21515

* New maintainer.
* Clean properly (Closes: #671328).
  - Remove egg-info.
* Bump Standards-Version to 3.9.3, no changes needed.
* Build-Depend on python-all rather than python.
* Make all versioned dependencies more backport-friendly, by stripping
  debian-revisions or appending ~.
* Make watch file a little more robust.
* Wrap long lines in debian/control.
* Use machine readable copyright format.
* begone-ez_setup.patch: Friends don't let friends use ez_setup.
* Run unit tests during build.
  - python-unittest2.patch: Use unittest backport package on Python <2.7.
  - B-D on python-keyring, python-lazr.restfulclient, python-oauth,
    python-simplejson, python-testresources, python-unittest2, and
    python-wadllib.

Added:
  packages/python-launchpadlib/trunk/debian/clean
  packages/python-launchpadlib/trunk/debian/patches/begone-ez_setup.patch
  packages/python-launchpadlib/trunk/debian/patches/python-unittest2.patch
Modified:
  packages/python-launchpadlib/trunk/debian/changelog
  packages/python-launchpadlib/trunk/debian/control
  packages/python-launchpadlib/trunk/debian/copyright
  packages/python-launchpadlib/trunk/debian/patches/auth_message.patch
  packages/python-launchpadlib/trunk/debian/patches/no_package_data.patch
  packages/python-launchpadlib/trunk/debian/patches/series
  packages/python-launchpadlib/trunk/debian/rules
  packages/python-launchpadlib/trunk/debian/watch

Modified: packages/python-launchpadlib/trunk/debian/changelog
===================================================================
--- packages/python-launchpadlib/trunk/debian/changelog	2012-05-03 14:06:15 UTC (rev 21514)
+++ packages/python-launchpadlib/trunk/debian/changelog	2012-05-03 15:09:34 UTC (rev 21515)
@@ -1,3 +1,24 @@
+python-launchpadlib (1.9.12-2) unstable; urgency=low
+
+  * New maintainer.
+  * Clean properly (Closes: #671328).
+    - Remove egg-info.
+  * Bump Standards-Version to 3.9.3, no changes needed.
+  * Build-Depend on python-all rather than python.
+  * Make all versioned dependencies more backport-friendly, by stripping
+    debian-revisions or appending ~.
+  * Make watch file a little more robust.
+  * Wrap long lines in debian/control.
+  * Use machine readable copyright format.
+  * begone-ez_setup.patch: Friends don't let friends use ez_setup.
+  * Run unit tests during build.
+    - python-unittest2.patch: Use unittest backport package on Python <2.7.
+    - B-D on python-keyring, python-lazr.restfulclient, python-oauth,
+      python-simplejson, python-testresources, python-unittest2, and
+      python-wadllib.
+
+ -- Stefano Rivera <stefanor at debian.org>  Thu, 03 May 2012 17:07:26 +0200
+
 python-launchpadlib (1.9.12-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/python-launchpadlib/trunk/debian/clean
===================================================================
--- packages/python-launchpadlib/trunk/debian/clean	                        (rev 0)
+++ packages/python-launchpadlib/trunk/debian/clean	2012-05-03 15:09:34 UTC (rev 21515)
@@ -0,0 +1 @@
+src/*.egg-info/*

Modified: packages/python-launchpadlib/trunk/debian/control
===================================================================
--- packages/python-launchpadlib/trunk/debian/control	2012-05-03 14:06:15 UTC (rev 21514)
+++ packages/python-launchpadlib/trunk/debian/control	2012-05-03 15:09:34 UTC (rev 21515)
@@ -1,10 +1,21 @@
 Source: python-launchpadlib
 Section: python
 Priority: optional
-Maintainer: Luca Falavigna <dktrkranz at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, James Westby <james.westby at ubuntu.com>
-Build-Depends: debhelper (>= 7.3.0), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+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-all (>= 2.6.6-3~),
+ python-keyring (>= 0.5),
+ python-lazr.restfulclient (>= 0.11.2),
+ python-oauth,
+ python-setuptools,
+ python-simplejson,
+ python-testresources,
+ python-unittest2,
+ python-wadllib
+Standards-Version: 3.9.3
 Homepage: https://launchpad.net/launchpadlib
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-launchpadlib/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-launchpadlib/trunk/
@@ -12,7 +23,16 @@
 
 Package: python-launchpadlib
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-simplejson, python-httplib2 (>= 0.4.0), python-wadllib, python-lazr.restfulclient (>= 0.11.2-1), python-lazr.uri (>= 1.0.2-4), python-oauth, python-keyring (>= 0.5)
+Depends:
+ python-httplib2 (>= 0.4.0),
+ python-keyring (>= 0.5),
+ python-lazr.restfulclient (>= 0.11.2),
+ python-lazr.uri (>= 1.0.2-4~),
+ python-oauth,
+ python-simplejson,
+ python-wadllib,
+ ${misc:Depends},
+ ${python:Depends}
 Suggests: python-pkg-resources, python-testresources
 Description: Launchpad web services client library
  A free Python library for scripting Launchpad through its web services

Modified: packages/python-launchpadlib/trunk/debian/copyright
===================================================================
--- packages/python-launchpadlib/trunk/debian/copyright	2012-05-03 14:06:15 UTC (rev 21514)
+++ packages/python-launchpadlib/trunk/debian/copyright	2012-05-03 15:09:34 UTC (rev 21515)
@@ -1,44 +1,47 @@
-This package was debianized by James Westby <james.westby at ubuntu.com> on
-Mon, 04 Aug 2008 13:50:55 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: launchpadlib
+Source: https://launchpad.net/launchpadlib
 
-It was downloaded from https://launchpad.net/launchpadlib/
+Files: *
+Copyright: 2008-2011, Canonical Ltd.
+License: LGPL-3.0
 
-Upstream Authors:
+Files: src/launchpadlib/testing/helpers.py
+       src/launchpadlib/testing/launchpad.py
+       src/launchpadlib/testing/resources.py
+       src/launchpadlib/testing/tests/test_launchpad.py
+Copyright: 2008-2011, Canonical Ltd.
+License: LGPL-3.0+
 
-    Launchpad developers <launchpadlib at lists.launchpad.net>
+Files: debian/*
+Copyright: 2008,2009, James Westby <james.westby at ubuntu.com>
+           2009-2011, Luca Falavigna <dktrkranz at debian.org>
+           2012,      Stefano Rivera <stefanor at debian.org>
+License: LGPL-3.0
 
-Copyright:
+License: LGPL-3.0
+ lazr.uri is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+ .
+ lazr.uri is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ License for more details.
+ .
+ On Debian-based systems the full text of the LGPL, version 3, can be found at
+ /usr/share/common-licenses/LGPL-3.
 
-    Copyright 2008-2010 Canonical Ltd.
-
-License:
-
-    launchpadlib is free software: you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as published by the
-    Free Software Foundation, version 3 of the License.
-
-    launchpadlib is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-    for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
-
-src/launchpadlib/testing/helpers.py is licensed under the following terms:
-
-    launchpadlib is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    launchpadlib is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with launchpadlib.  If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems the complete text of the LGPL, version 3, can be found at
-/usr/share/common-licenses/LGPL-3.
+License: LGPL-3.0+
+ lazr.uri is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+ .
+ lazr.uri is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ License for more details.
+ .
+ On Debian-based systems the full text of the LGPL, version 3, can be found at
+ /usr/share/common-licenses/LGPL-3.

Modified: packages/python-launchpadlib/trunk/debian/patches/auth_message.patch
===================================================================
--- packages/python-launchpadlib/trunk/debian/patches/auth_message.patch	2012-05-03 14:06:15 UTC (rev 21514)
+++ packages/python-launchpadlib/trunk/debian/patches/auth_message.patch	2012-05-03 15:09:34 UTC (rev 21515)
@@ -3,10 +3,8 @@
 Bug-Debian: http://bugs.debian.org/584556
 Forwarded: https://launchpad.net/launchpadlib/+bug/643699
 
-Index: python-launchpadlib-1.9.9/src/launchpadlib/credentials.py
-===================================================================
---- python-launchpadlib-1.9.9.orig/src/launchpadlib/credentials.py	2011-08-12 16:03:32.135963413 +0200
-+++ python-launchpadlib-1.9.9/src/launchpadlib/credentials.py	2011-08-12 16:25:06.104003055 +0200
+--- a/src/launchpadlib/credentials.py
++++ b/src/launchpadlib/credentials.py
 @@ -31,7 +31,9 @@
  from cStringIO import StringIO
  import httplib2

Added: packages/python-launchpadlib/trunk/debian/patches/begone-ez_setup.patch
===================================================================
--- packages/python-launchpadlib/trunk/debian/patches/begone-ez_setup.patch	                        (rev 0)
+++ packages/python-launchpadlib/trunk/debian/patches/begone-ez_setup.patch	2012-05-03 15:09:34 UTC (rev 21515)
@@ -0,0 +1,18 @@
+Description: Ick! ez_setup
+ It can download things from the Internet during build. We don't want that.
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: no
+Last-Update: 2012-05-03
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,9 +18,6 @@
+ 
+ """Setup for the launchpadlib library."""
+ 
+-import ez_setup
+-ez_setup.use_setuptools()
+-
+ import sys
+ from setuptools import setup, find_packages
+ 

Modified: packages/python-launchpadlib/trunk/debian/patches/no_package_data.patch
===================================================================
--- packages/python-launchpadlib/trunk/debian/patches/no_package_data.patch	2012-05-03 14:06:15 UTC (rev 21514)
+++ packages/python-launchpadlib/trunk/debian/patches/no_package_data.patch	2012-05-03 15:09:34 UTC (rev 21515)
@@ -3,11 +3,9 @@
 Bug-Debian: http://bugs.debian.org/580324
 Forwarded: not-needed
 
-Index: python-launchpadlib-1.6.1/setup.py
-===================================================================
---- python-launchpadlib-1.6.1.orig/setup.py	2010-06-20 03:58:04.938571068 +0200
-+++ python-launchpadlib-1.6.1/setup.py	2010-06-20 03:58:13.234569497 +0200
-@@ -46,7 +46,7 @@
+--- a/setup.py
++++ b/setup.py
+@@ -43,7 +43,7 @@
      version=__version__,
      packages=find_packages('src'),
      package_dir={'':'src'},

Added: packages/python-launchpadlib/trunk/debian/patches/python-unittest2.patch
===================================================================
--- packages/python-launchpadlib/trunk/debian/patches/python-unittest2.patch	                        (rev 0)
+++ packages/python-launchpadlib/trunk/debian/patches/python-unittest2.patch	2012-05-03 15:09:34 UTC (rev 21515)
@@ -0,0 +1,50 @@
+Description: Use unittest2 if available.
+ The launchpadlib test suite takes advantages of new features in unittest in
+ Python 2.7.
+ Use the unittest2 backport-module on <2.7.
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: no
+Last-Update: 2012-05-03
+
+--- a/src/launchpadlib/tests/test_credential_store.py
++++ b/src/launchpadlib/tests/test_credential_store.py
+@@ -18,7 +18,10 @@
+ 
+ import os
+ import tempfile
+-import unittest
++try:
++    import unittest2 as unittest
++except ImportError:
++    import unittest
+ 
+ from base64 import b64decode
+ 
+--- a/src/launchpadlib/tests/test_http.py
++++ b/src/launchpadlib/tests/test_http.py
+@@ -18,7 +18,10 @@
+ 
+ from collections import deque
+ import tempfile
+-import unittest
++try:
++    import unittest2 as unittest
++except ImportError:
++    import unittest
+ 
+ from simplejson import dumps, JSONDecodeError
+ 
+--- a/src/launchpadlib/tests/test_launchpad.py
++++ b/src/launchpadlib/tests/test_launchpad.py
+@@ -24,7 +24,10 @@
+ import socket
+ import stat
+ import tempfile
+-import unittest
++try:
++    import unittest2 as unittest
++except ImportError:
++    import unittest
+ import warnings
+ 
+ from lazr.restfulclient.resource import ServiceRoot

Modified: packages/python-launchpadlib/trunk/debian/patches/series
===================================================================
--- packages/python-launchpadlib/trunk/debian/patches/series	2012-05-03 14:06:15 UTC (rev 21514)
+++ packages/python-launchpadlib/trunk/debian/patches/series	2012-05-03 15:09:34 UTC (rev 21515)
@@ -1,2 +1,4 @@
+begone-ez_setup.patch
 no_package_data.patch
 auth_message.patch
+python-unittest2.patch

Modified: packages/python-launchpadlib/trunk/debian/rules
===================================================================
--- packages/python-launchpadlib/trunk/debian/rules	2012-05-03 14:06:15 UTC (rev 21514)
+++ packages/python-launchpadlib/trunk/debian/rules	2012-05-03 15:09:34 UTC (rev 21515)
@@ -1,8 +1,21 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2 --buildsystem=python_distutils
+	dh $@ --with python2
 
+override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	mkdir build/home
+	set -ex; \
+	for python in $(shell pyversions -r); do \
+		HOME=build/home $$python setup.py test; \
+	done
+endif
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build
+
 override_dh_installchangelogs:
 	dh_installchangelogs src/launchpadlib/NEWS.txt
 

Modified: packages/python-launchpadlib/trunk/debian/watch
===================================================================
--- packages/python-launchpadlib/trunk/debian/watch	2012-05-03 14:06:15 UTC (rev 21514)
+++ packages/python-launchpadlib/trunk/debian/watch	2012-05-03 15:09:34 UTC (rev 21515)
@@ -1,2 +1,2 @@
 version=3
-https://launchpad.net/launchpadlib/+download http://launchpad.net/launchpadlib/.*/launchpadlib-(.+).tar.gz
+https://launchpad.net/launchpadlib/+download .*/launchpadlib-(.+).tar.gz




More information about the Python-modules-commits mailing list