New upstream release

Signed-off-by: Julien Danjou <julien@danjou.info>
2011-12-16 10:16:29 +01:00 · 2011-12-16 10:16:29 +01:00 · 9fee07e1fa
parent 290e412c20
commit 9fee07e1fa
9 changed files with 14 additions and 218 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+horizon (2012.1~e2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Julien Danjou <acid@debian.org>  Fri, 16 Dec 2011 10:16:19 +0100
+
 horizon (2012.1~e1-1) unstable; urgency=low

  * Initial release (Closes: #649897, #649994)
--- a/debian/control
+++ b/debian/control
@ -20,7 +20,7 @@ Description: Django module to provide web interaction with OpenStack

 Package: openstack-dashboard
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-django-horizon, python-django, python-openstackx, python-openstack-compute, python-django-nose, python-keystoneclient, python-cloudfiles
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-django-horizon, python-django, python-openstackx, python-django-nose, python-keystoneclient, python-cloudfiles
 Description: OpenStack Dashboard
 The OpenStack Dashboard is a Web application allowing to control an
 OpenStack cloud.
--- a/debian/docs
+++ b/debian/docs
@ -1 +1 @@
-README
+README.rst
--- a/debian/patches/3e8413be302d8c75da8996a6e3b73d619b2e7b34
+++ b/debian/patches/3e8413be302d8c75da8996a6e3b73d619b2e7b34
@ -1,93 +0,0 @@
-Description: Remove crappy upstream Debian packaging stuff
- This is cherry-picked from 3e8413be302d8c75da8996a6e3b73d619b2e7b34
-Author: Julien Danjou <acid@debian.org>
-
---
-Origin: upstream
-Forwarded: not-needed
-Last-Update: 2011-11-25
-
--- horizon-2012.1~e1.orig/horizon/Makefile
-+++ horizon-2012.1~e1/horizon/Makefile
-@@ -1,6 +1,5 @@
- PYTHON=`which python`
- DESTDIR=/
-BUILDIR=$(CURDIR)/debian/horizon
- PROJECT=horizon
- 
- all:
-@@ -9,7 +8,6 @@ all:
- 	@echo "make source - Create source package"
- 	@echo "make install - Install on local system"
- 	@echo "make buildrpm - Generate a rpm package"
-	@echo "make builddeb - Generate a deb package"
- 	@echo "make clean - Get rid of scratch and byte files"
- 
- buildout: ./bin/buildout
-@@ -27,17 +25,7 @@ install:
- buildrpm:
- 	$(PYTHON) setup.py bdist_rpm --post-install=rpm/postinstall --pre-uninstall=rpm/preuninstall
- 
-builddeb:
-	# build the source package in the parent directory
-	# then rename it to project_version.orig.tar.gz
-	$(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../
-	rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
-	# build the package
-	#dpkg-buildpackage -i -I -rfakeroot
-	dpkg-buildpackage -b -rfakeroot -tc -uc -D
-
- clean:
- 	$(PYTHON) setup.py clean
-	$(MAKE) -f $(CURDIR)/debian/rules clean
- 	rm -rf build/ MANIFEST
- 	find . -name '*.pyc' -delete
--- horizon-2012.1~e1.orig/openstack-dashboard/Makefile
-+++ horizon-2012.1~e1/openstack-dashboard/Makefile
-@@ -1,6 +1,5 @@
- PYTHON=`which python`
- DESTDIR=/
-BUILDIR=$(CURDIR)/debian/openstack-dashboard
- PROJECT=openstack-dashboard
- 
- all:
-@@ -9,7 +8,6 @@ all:
- 	@echo "make source - Create source package"
- 	@echo "make install - Install on local system"
- 	@echo "make buildrpm - Generate a rpm package"
-	@echo "make builddeb - Generate a deb package"
- 	@echo "make clean - Get rid of scratch and byte files"
- 
- buildout: ./bin/buildout
-@@ -27,15 +25,6 @@ install:
- buildrpm:
- 	$(PYTHON) setup.py bdist_rpm --post-install=rpm/postinstall --pre-uninstall=rpm/preuninstall
- 
-builddeb:
-	# build the source package in the parent directory
-	# then rename it to project_version.orig.tar.gz
-	$(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../
-	rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
-	# build the package
-	#dpkg-buildpackage -i -I -rfakeroot
-	dpkg-buildpackage -b -rfakeroot -tc -uc -D
-
- clean:
- 	$(PYTHON) setup.py clean
- 	$(MAKE) -f $(CURDIR)/debian/rules clean
--- horizon-2012.1~e1.orig/openstack-dashboard/setup.py
-+++ horizon-2012.1~e1/openstack-dashboard/setup.py
-@@ -26,13 +26,6 @@ def read(fname):
-     return open(os.path.join(os.path.dirname(__file__), fname)).read()
- 
- 
-dst = 'debian/openstack-dashboard/var/lib/dash'
-os.system('rm -rf %s' % dst)
-shutil.copytree('tools', '%s/tools' % dst)
-shutil.copytree('dashboard', '%s/dashboard' % dst)
-shutil.copytree('local', '%s/local' % dst)
-
-
- setuptools.setup(
-     name = 'openstack-dashboard',
-     version = '0.4',
--- a/debian/patches/fix_django.wsgi_sys.path
+++ b/debian/patches/fix_django.wsgi_sys.path
@ -1,20 +0,0 @@
-Description: Fix django.wsgi
-Author: Julien Danjou <acid@debian.org>
-
---
-Origin: other
-Forwarded: https://review.openstack.org/#change,1966
-
--- horizon-2012.1~e1.orig/openstack-dashboard/dashboard/wsgi/django.wsgi
-+++ horizon-2012.1~e1/openstack-dashboard/dashboard/wsgi/django.wsgi
-@@ -4,7 +4,10 @@ import sys
- import django.core.handlers.wsgi
- from django.conf import settings
- 
-+# Add this file path to sys.path in order to import settings
-+sys.path.insert (0, os.path.join (os.path.dirname (os.path.realpath (__file__)), '../..')) 
- os.environ['DJANGO_SETTINGS_MODULE'] = 'dashboard.settings'
-+
- sys.stdout = sys.stderr
- 
- DEBUG = False
--- a/debian/patches/fix_templates_installation
+++ b/debian/patches/fix_templates_installation
@ -1,21 +0,0 @@
-Description: Add missing templates install in setup.py
-Author: Julien Danjou <acid@debian.org>
-
---
-Origin: other
-Forwarded: https://review.openstack.org/#change,1965
-Last-Update: 2011-11-30
-
--- horizon-2012.1~e1.orig/horizon/setup.py
-+++ horizon-2012.1~e1/horizon/setup.py
-@@ -37,7 +37,9 @@ setup(
-     packages = find_packages(),
-     package_data = {'horizon':
-                         [s[len('horizon/'):] for s in
-                         findall('horizon/templates')]},
-+                         findall('horizon/templates') \
-+                             + findall('horizon/dashboards/nova/templates') \
-+                             + findall('horizon/dashboards/settings/templates')]},
-     install_requires = ['setuptools', 'mox>=0.5.3', 'django_nose'],
-     classifiers = [
-         'Development Status :: 4 - Beta',
--- a/debian/patches/remove_django_mailer
+++ b/debian/patches/remove_django_mailer
@ -1,74 +0,0 @@
-Description: Remove dependency on django-mailer
- django-mailer is not used, so remove its dependency.
-Author: Julien Danjou <acid@debian.org>
-
---
-Origin: vendor
-Forwarded: https://review.openstack.org/#change,1963
-
--- horizon-2012.1~e1.orig/horizon/buildout.cfg
-+++ horizon-2012.1~e1/horizon/buildout.cfg
-@@ -28,7 +28,6 @@ webob = 1.0.8
- recipe = zc.recipe.egg
- eggs =
-     python-dateutil
-    django-mailer
-     httplib2
-     python-cloudfiles
-     coverage
--- horizon-2012.1~e1.orig/horizon/horizon/tests/testsettings.py
-+++ horizon-2012.1~e1/horizon/horizon/tests/testsettings.py
-@@ -37,8 +37,7 @@ INSTALLED_APPS = (
-     'horizon.tests',
-     'horizon.dashboards.nova',
-     'horizon.dashboards.syspanel',
-    'horizon.dashboards.settings',
-    'mailer')
-+    'horizon.dashboards.settings')
- 
- MIDDLEWARE_CLASSES = (
-     'django.middleware.common.CommonMiddleware',
-@@ -85,10 +84,7 @@ NOSE_ARGS = ['--nocapture',
- # For nose-selenium integration
- LIVE_SERVER_PORT = 8000
- 
-# django-mailer uses a different config attribute
-# even though it just wraps django.core.mail
-MAILER_EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
-EMAIL_BACKEND = MAILER_EMAIL_BACKEND
-+EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
- SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
- 
- HORIZON_CONFIG = {
--- horizon-2012.1~e1.orig/openstack-dashboard/tools/pip-requires
-+++ horizon-2012.1~e1/openstack-dashboard/tools/pip-requires
-@@ -1,7 +1,6 @@
- coverage
- CherryPy
- Django==1.3
-django-mailer
- django-nose==0.1.2
- django-nose-selenium
- django-registration==0.7
--- horizon-2012.1~e1.orig/openstack-dashboard/dashboard/settings.py
-+++ horizon-2012.1~e1/openstack-dashboard/dashboard/settings.py
-@@ -91,7 +91,6 @@ INSTALLED_APPS = (
-     'horizon.dashboards.nova',
-     'horizon.dashboards.syspanel',
-     'horizon.dashboards.settings',
-    'mailer',
- )
- 
- TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
--- horizon-2012.1~e1.orig/openstack-dashboard/local/local_settings.py.example
-+++ horizon-2012.1~e1/openstack-dashboard/local/local_settings.py.example
-@@ -21,9 +21,6 @@ EMAIL_BACKEND = 'django.core.mail.backen
- # Or send them to /dev/null
- #EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
- 
-# django-mailer uses a different settings attribute
-MAILER_EMAIL_BACKEND = EMAIL_BACKEND
-
- # Configure these for your outgoing email host
- # EMAIL_HOST = 'smtp.my-company.com'
- # EMAIL_PORT = 25
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,4 +0,0 @@
-3e8413be302d8c75da8996a6e3b73d619b2e7b34
-fix_django.wsgi_sys.path
-remove_django_mailer
-fix_templates_installation
--- a/debian/rules
+++ b/debian/rules
@ -4,18 +4,21 @@

 SOURCE_DIRS=horizon openstack-dashboard

+# Add -B so we do not pollute the source tree
+PYTHON=python -B
+
 override_dh_auto_build:
 	dh_auto_build
 	for d in $(SOURCE_DIRS); \
 	do \
-		cd $(CURDIR)/$$d && python setup.py build; \
+		cd $(CURDIR)/$$d && $(PYTHON) setup.py build; \
 	done

 override_dh_auto_install:
 	dh_auto_install
 	for d in $(SOURCE_DIRS); \
 	do \
-		cd $(CURDIR)/$$d && python setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp; \
+		cd $(CURDIR)/$$d && $(PYTHON) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp; \
 	done
 	# Actually the setup.py from openstack-dashboard does not install anything…
 	install -d -m 755  $(CURDIR)/debian/tmp/usr/share/openstack-dashboard
@ -30,9 +33,8 @@ override_dh_auto_clean:
 	dh_auto_clean
 	for d in $(SOURCE_DIRS); \
 	do \
-		cd $(CURDIR)/$$d && python setup.py clean; \
+		cd $(CURDIR)/$$d && $(PYTHON) setup.py clean; \
 	done
 	rm -rf $(CURDIR)/horizon/build
-	rm -rf $(CURDIR)/horizon/horizon/*.pyc
 	rm -rf $(CURDIR)/horizon/horizon.egg-info
 	rm -rf $(CURDIR)/openstack-dashboard/openstack_dashboard.egg-info