diff --git a/debian/changelog b/debian/changelog index 8ca698f..c224806 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-swiftclient (1:1.6.0-1) unstable; urgency=low * New upstream release. + * Removes now obsolete patch for OSLO version. -- Thomas Goirand Wed, 11 Sep 2013 14:03:08 +0800 diff --git a/debian/patches/adds-OSLO_PACKAGE_VERSION-override.patch b/debian/patches/adds-OSLO_PACKAGE_VERSION-override.patch deleted file mode 100644 index 849c39e..0000000 --- a/debian/patches/adds-OSLO_PACKAGE_VERSION-override.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Adds a OSLO_PACKAGE_VERSION in the setup.py - Other Openstack packages have a OSLO_PACKAGE_VERSION so that it doesn't - rely on Git or a tarball to know which version is in use. It seems that - python-swiftclient is lagging behind, so I'm adding the feature. -Author: Thomas Goirand -Forwarded: not-needed -Last-Update: 2013-04-03 - ---- python-swiftclient-1.3.0.orig/swiftclient/openstack/common/setup.py -+++ python-swiftclient-1.3.0/swiftclient/openstack/common/setup.py -@@ -302,6 +302,9 @@ def get_version(package_name): - to make a source tarball from a fork of our repo with additional tags in it - that they understand and desire the results of doing that. - """ -+ version = os.environ.get("OSLO_PACKAGE_VERSION", None) -+ if version: -+ return version - version = get_version_from_pkg_info(package_name) - if version: - return version diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index d714a6f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -adds-OSLO_PACKAGE_VERSION-override.patch