launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging_bzr1539 into lp:~maas-maintainers/maas/packaging.

Commit message:
Release 1.4+bzr1539+dfsg-0ubuntu1
  * Symlink apache2 config into /etc/apache2/conf-enabled/ instead of
    /etc/apache2/conf.d as apache2.4 no longer supports the latter.
    - debian/maas-cluster-controller.{postinst,postrm}
    - debian/maas-region-controller.{postinst,postrm}
  * debian/control: Bump Standards-Version to 3.9.4.
  * debian/maas-cluster-controller.lintian-overrides: Remove unneeded
    override and add a new one.
  * debian/maas-region-controller.lintian-overrides: Add extra overrides.
Open 1.4+bzr1539+dfsg-0ubuntu1

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging_bzr1539/+merge/175577
-- 
https://code.launchpad.net/~andreserl/maas/packaging_bzr1539/+merge/175577
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/packaging_bzr1539 into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-03 21:11:39 +0000
+++ debian/changelog	2013-07-18 14:17:25 +0000
@@ -1,7 +1,21 @@
-maas (1.4+bzr1538+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (1.4+bzr1539+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   * UNRELEASED
 
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Thu, 18 Jul 2013 10:15:10 -0400
+
+maas (1.4+bzr1539+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+  * Symlink apache2 config into /etc/apache2/conf-enabled/ instead of
+    /etc/apache2/conf.d as apache2.4 no longer supports the latter.
+    - debian/maas-cluster-controller.{postinst,postrm}
+    - debian/maas-region-controller.{postinst,postrm}
+  * debian/control: Bump Standards-Version to 3.9.4.
+  * debian/maas-cluster-controller.lintian-overrides: Remove unneeded
+    override and add a new one.
+  * debian/maas-region-controller.lintian-overrides: Add extra overrides.
+
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 03 Jul 2013 17:11:02 -0400
 
 maas (1.4+bzr1538+dfsg-0ubuntu1) saucy; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-05-22 14:01:27 +0000
+++ debian/control	2013-07-18 14:17:25 +0000
@@ -8,7 +8,7 @@
                python (>= 2.7),
                python-distribute,
                python-django
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 X-Python-Version: >= 2.7
 Homepage: https://launchpad.net/maas
 

=== modified file 'debian/maas-cluster-controller.lintian-overrides'
--- debian/maas-cluster-controller.lintian-overrides	2013-03-04 16:51:28 +0000
+++ debian/maas-cluster-controller.lintian-overrides	2013-07-18 14:17:25 +0000
@@ -1,2 +1,2 @@
 maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals
-maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-isos
+maas-cluster-controller: binary-without-manpage usr/bin/uec2roottar

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2013-05-22 14:01:27 +0000
+++ debian/maas-cluster-controller.postinst	2013-07-18 14:17:25 +0000
@@ -70,8 +70,8 @@
 configure_cluster_http(){
     # handle apache configs
     if [ -e /etc/maas/maas-cluster-http.conf -a \
-        ! -e /etc/apache2/conf.d/maas-cluster-http.conf ]; then
-        ln -sf /etc/maas/maas-cluster-http.conf /etc/apache2/conf.d/maas-cluster-http.conf
+        ! -e /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
+        ln -sf /etc/maas/maas-cluster-http.conf /etc/apache2/conf-enabled/maas-cluster-http.conf
     fi
 }
 

=== modified file 'debian/maas-cluster-controller.postrm'
--- debian/maas-cluster-controller.postrm	2013-05-22 14:01:27 +0000
+++ debian/maas-cluster-controller.postrm	2013-07-18 14:17:25 +0000
@@ -9,8 +9,8 @@
 		# remove log directory
 		rm -rf /var/log/maas
 		# remove apache2 config
-		if [ -h /etc/apache2/conf.d/maas-cluster-http.conf ]; then
-			rm -rf /etc/apache2/conf.d/maas-cluster-http.conf
+		if [ -h /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
+			rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf
 		fi
 		# remove var directory
 		rm -rf /var/lib/maas/celerybeat-cluster-schedule

=== modified file 'debian/maas-region-controller.lintian-overrides'
--- debian/maas-region-controller.lintian-overrides	2013-01-22 23:39:17 +0000
+++ debian/maas-region-controller.lintian-overrides	2013-07-18 14:17:25 +0000
@@ -1,2 +1,6 @@
 maas-region-controller: binary-without-manpage usr/sbin/maas
 maas-region-controller: binary-without-manpage usr/sbin/maas-region-celeryd
+maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py
+maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py
+maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template
+maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2013-03-20 00:24:08 +0000
+++ debian/maas-region-controller.postinst	2013-07-18 14:17:25 +0000
@@ -129,8 +129,8 @@
 	#########################################################
 	# handle apache configs
 	if [ -e /etc/maas/maas-http.conf -a \
-		! -e /etc/apache2/conf.d/maas-http.conf ]; then
-		ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf
+		! -e /etc/apache2/conf-enabled/maas-http.conf ]; then
+		ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
 	fi
 
 	# enable apache modules needed

=== modified file 'debian/maas-region-controller.postrm'
--- debian/maas-region-controller.postrm	2013-03-20 00:29:00 +0000
+++ debian/maas-region-controller.postrm	2013-07-18 14:17:25 +0000
@@ -15,8 +15,8 @@
 	purge)
 		rm -rf /var/log/maas
 		rm -rf /var/lib/maas
-		if [ -h /etc/apache2/conf.d/maas-http.conf ]; then
-			rm -rf /etc/apache2/conf.d/maas-http.conf
+		if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then
+			rm -rf /etc/apache2/conf-enabled/maas-http.conf
 		fi
 
 		# Restarting apache2