Merge lp:~adri2000/horizon/rename-apache-config-file into lp:~ubuntu-server-dev/horizon/essex

[Adrien Cunin]

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-20 18:49:27 +0000
+++ debian/changelog	2012-03-27 17:42:20 +0000
@@ -1,3 +1,11 @@
+horizon (2012.1~rc1-0ubuntu2) precise; urgency=low
+
+  * Renamed Apache config file from dashboard.conf to openstack-dashboard.conf
+    (LP: #965410)
+     - Updated post{inst,rm} and added preinst to handle correctly the rename
+
+ -- Adrien Cunin <[e-mail]>  Mon, 26 Mar 2012 18:01:49 +0200
+
 horizon (2012.1~rc1-0ubuntu1) precise; urgency=low
 
   * New upstream release. 

=== modified file 'debian/openstack-dashboard.postinst'
--- debian/openstack-dashboard.postinst	2012-01-03 19:13:36 +0000
+++ debian/openstack-dashboard.postinst	2012-03-27 17:42:20 +0000
@@ -3,6 +3,11 @@
 set -e
 
 if [ "$1" = "configure" ]; then
+	# /etc/apache2/conf.d/dashboard.conf -> /etc/apache2/conf.d/openstack-dashboard.conf
+	dpkg-maintscript-helper mv_conffile \
+	  /etc/apache2/conf.d/dashboard.conf /etc/apache2/conf.d/openstack-dashboard.conf \
+	  2012.1~rc1-0ubuntu1 -- "$@"
+
 	if [ -x /etc/init.d/apache2 ]; then
 		invoke-rc.d --quiet apache2 reload
 	fi

=== modified file 'debian/openstack-dashboard.postrm'
--- debian/openstack-dashboard.postrm	2012-01-20 18:33:09 +0000
+++ debian/openstack-dashboard.postrm	2012-03-27 17:42:20 +0000
@@ -2,6 +2,11 @@
 
 set -e
 
+# /etc/apache2/conf.d/dashboard.conf -> /etc/apache2/conf.d/openstack-dashboard.conf
+dpkg-maintscript-helper mv_conffile \
+  /etc/apache2/conf.d/dashboard.conf /etc/apache2/conf.d/openstack-dashboard.conf \
+  2012.1~rc1-0ubuntu1 -- "$@"
+
 if [ -x "`which invoke-rc.d 2>/dev/null`" -a -x "/etc/init.d/apache2" ] ; then
 	invoke-rc.d --quiet apache2 reload
 fi

=== added file 'debian/openstack-dashboard.preinst'
--- debian/openstack-dashboard.preinst	1970-01-01 00:00:00 +0000
+++ debian/openstack-dashboard.preinst	2012-03-27 17:42:20 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# /etc/apache2/conf.d/dashboard.conf -> /etc/apache2/conf.d/openstack-dashboard.conf
+dpkg-maintscript-helper mv_conffile \
+  /etc/apache2/conf.d/dashboard.conf /etc/apache2/conf.d/openstack-dashboard.conf \
+  2012.1~rc1-0ubuntu1 -- "$@"
+
+#DEBHELPER#

=== modified file 'debian/rules'
--- debian/rules	2012-03-07 16:30:00 +0000
+++ debian/rules	2012-03-27 17:42:20 +0000
@@ -19,7 +19,7 @@
 	
 	touch $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/quantum/__init__.py
 	touch $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/quantum/client.py
-	cp -a $(CURDIR)/debian/dashboard.conf $(CURDIR)/debian/tmp/etc/apache2/conf.d
+	cp -a $(CURDIR)/debian/openstack-dashboard.conf $(CURDIR)/debian/tmp/etc/apache2/conf.d
 	cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example \
 		$(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
 	cp $(CURDIR)/manage.py \