New upstream release

Rewritten-From: aeed1c559ab49856d0c9683a0a499aff03aa6fcd

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 0c5ce600fa62c3ad7f0edc2536346ea4ab76da8f..5d223a98ff29553d78e31d27353d0e9dcd2eb032 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,8 +1,8 @@
-horizon (2012.1~e3+git134-g052aa55-1) unstable; urgency=low
+horizon (2012.1~e4-1) unstable; urgency=low
 
-  * some testing
+  * New upstream release
 
- -- Ghe Rivero <ghe@debian.org>  Wed, 29 Feb 2012 10:12:59 +0100
+ -- Ghe Rivero <ghe@debian.org>  Fri, 02 Mar 2012 08:42:48 +0100
 
 horizon (2012.1~e3-3) unstable; urgency=low
 

diff --git a/xenial/debian/patches/pkg_data.patch b/xenial/debian/patches/pkg_data.patch
index ed0d65176fe937a4e77416255de053482a014b08..2c3c4990cd228530dec7df0f504ec1bb6267cf26 100644 (file)
--- a/xenial/debian/patches/pkg_data.patch
+++ b/xenial/debian/patches/pkg_data.patch
@@ -1,13 +1,13 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -76,6 +76,7 @@
+@@ -36,6 +36,7 @@
        author='Devin Carlen',
        author_email='devin.carlen@gmail.com',
        packages=find_packages(),
 +      include_package_data=True,
-       zip_safe=False,
-       install_requires=parse_requirements(PIP_REQUIRES, TEST_REQUIRES),
-       dependency_links=parse_dependency_links(PIP_REQUIRES, TEST_REQUIRES),
+       package_data={'horizon': [s[len('horizon/'):] for s in
+                                 findall('horizon/templates') \
+                                 + findall('horizon/dashboards/nova/templates') \
 --- /dev/null
 +++ b/MANIFEST.in
 @@ -0,0 +1 @@