Removes fix-package-version-detection-when-building-doc.patch

Rewritten-From: 560a39a75e560cfb62086991f8ab5dcd6c23e246

diff --git a/trusty/debian/patches/fix-package-version-detection-when-building-doc.patch b/trusty/debian/patches/fix-package-version-detection-when-building-doc.patch
deleted file mode 100644 (file)
index 55f91ca..0000000
--- a/trusty/debian/patches/fix-package-version-detection-when-building-doc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fixes version detection when building docs
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2013-05-17
-
---- horizon-2013.1.1.orig/openstack_dashboard/openstack/common/version.py
-+++ horizon-2013.1.1/openstack_dashboard/openstack/common/version.py
-@@ -19,6 +19,7 @@ Utilities for consuming the version from
- """
- 
- import pkg_resources
-+import os
- 
- 
- class VersionInfo(object):
-@@ -54,6 +55,9 @@ class VersionInfo(object):
-         if self.release is None:
-             self.release = self._get_version_from_pkg_resources()
- 
-+        if self.release is None:
-+            self.release = os.environ.get("OSLO_PACKAGE_VERSION", None)
-+
-         return self.release
- 
-     def version_string(self):

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 877920a8c92a994b828c53011671acf13aadc781..89e6f35a4069cfbeda41ba9e693b36ab17a878d7 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,3 +1,2 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
-fix-package-version-detection-when-building-doc.patch