Merge lp:~andreserl/maas/packaging_updateS_bzr1134 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

* debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server.
* debian/maas-region-controller.postinst: Always update passwords
   on upgrade. No longer check versioning. (LP: #1060094).
* debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}.
* debian/control: Depends on python-netifaces.
* debian/maas-region-controller: Install maas-import-squashfs

[Scott Moser (smoser)]

probably should wrap-and-sort (at least your additional dependency should be added in such that way).
I'd just remove the code you commented out in postinst.

[lp:~andreserl/maas/packaging_updateS_bzr1134]

114. By Andres Rodriguez on 2012-10-02

wrap-and-sort, comments remove

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-02 05:39:21 +0000
+++ debian/changelog	2012-10-02 19:42:36 +0000
@@ -1,10 +1,10 @@
-maas (0.1+bzr1122+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1134+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   * New upstream release.
 
   [ Julian Edwards ]
   * Ensure isc-dhcp-server is disabled when installing maas-dhcp.
-  
+
   [ Raphaël Badin ]
   * Split celery config into cluster and region configs.
   * Add region celeryd upstart config.
@@ -17,7 +17,15 @@
   * Set root:maas ownership of local cluster config only *after*
     the maas user/group have been created
 
- -- Julian Edwards <[e-mail]>  Mon, 01 Oct 2012 17:13:57 +1000
+  [ Andres Rodriguez ]
+  * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server.
+  * debian/maas-region-controller.postinst: Always update passwords
+    on upgrade. No longer check versioning. (LP: #1060094).
+  * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}.
+  * debian/control: Depends on python-netifaces.
+  * debian/maas-region-controller: Install maas-import-squashfs
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 02 Oct 2012 13:39:47 -0400
 
 maas (0.1+bzr1110+dfsg-0ubuntu1) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-09-27 04:56:21 +0000
+++ debian/control	2012-10-02 19:42:36 +0000
@@ -2,8 +2,12 @@
 Section: net
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 8), python (>= 2.7), python-distribute, dh-apport, po-debconf,
- python-django
+Build-Depends: debhelper (>= 8),
+               dh-apport,
+               po-debconf,
+               python (>= 2.7),
+               python-distribute,
+               python-django
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.7
 XS-Testsuite: autopkgtest
@@ -11,8 +15,8 @@
 
 Package: maas
 Architecture: all
-Depends: python-django-maas, maas-region-controller, maas-cluster-controller
-Conflicts: maas-provision, tftpd-hpa, dnsmasq
+Depends: maas-cluster-controller, maas-region-controller, python-django-maas
+Conflicts: dnsmasq, maas-provision, tftpd-hpa
 Replaces: maas-provision
 Description: Ubuntu MAAS Server
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -84,8 +88,7 @@
 
 Package: python-maas-provisioningserver
 Architecture: all
-Depends: ${misc:Depends},
-         ${python:Depends}
+Depends: python-netifaces, ${misc:Depends}, ${python:Depends}
 Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Server
@@ -122,9 +125,7 @@
 
 Package: python-maas-client
 Architecture: all
-Depends: python-oauth,
-         ${misc:Depends},
-         ${python:Depends}
+Depends: python-oauth, ${misc:Depends}, ${python:Depends}
 Conflicts: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
 Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
 Description: Ubuntu MAAS API Client - (python files)
@@ -218,7 +219,7 @@
 
 Package: maas-dhcp
 Architecture: all
-Depends: ${misc:Depends}, isc-dhcp-server
+Depends: isc-dhcp-server, ${misc:Depends}
 Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: Ubuntu MAAS Server - DHCP Configuration (meta-package)
@@ -235,7 +236,7 @@
 
 Package: maas-dns
 Architecture: all
-Depends: ${misc:Depends}, maas-dhcp (= ${binary:Version}), bind9
+Depends: bind9, maas-dhcp (= ${binary:Version}), ${misc:Depends}
 Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: Ubuntu MAAS Server - DNS configuration (metapackage)

=== modified file 'debian/maas-cluster-controller.maas-cluster-celery.upstart'
--- debian/maas-cluster-controller.maas-cluster-celery.upstart	2012-10-01 14:01:07 +0000
+++ debian/maas-cluster-controller.maas-cluster-celery.upstart	2012-10-02 19:42:36 +0000
@@ -7,8 +7,6 @@
 
 start on filesystem and net-device-up
 stop on runlevel [016]
-setuid maas
-setgid maas
 
 env CONFIG_FILE=/etc/maas/maas_cluster.conf
 # Use cluster config.

=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2012-10-02 04:58:38 +0000
+++ debian/maas-dhcp.postinst	2012-10-02 19:42:36 +0000
@@ -4,7 +4,7 @@
 db_version 2.0
 
 stop_isc_dhcp_server(){
-    service isc_dhcp_server stop
+    invoke-rc.d isc-dhcp-server stop
 }
 
 

=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install	2012-09-29 17:21:10 +0000
+++ debian/maas-region-controller.install	2012-10-02 19:42:36 +0000
@@ -27,8 +27,10 @@
 
 # Install maas-import-pxe-files and related files
 etc/cron.d/maas-import-pxe-files
-etc/maas/import_pxe_files
 man/maas-import-pxe-files.8 usr/share/man/man8
+debian/tmp/etc/maas/import_pxe_files
+debian/tmp/usr/sbin/maas-import-squashfs
+debian/tmp/etc/maas/import_squashfs
 debian/tmp/usr/sbin/maas-import-ephemerals
 debian/tmp/etc/maas/import_ephemerals
 debian/tmp/etc/maas/commissioning-user-data

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2012-10-02 11:00:41 +0000
+++ debian/maas-region-controller.postinst	2012-10-02 19:42:36 +0000
@@ -264,22 +264,18 @@
 	# make sure postgresql is running
 	restart_postgresql
 
-	# If upgrading from any version lower than 0.1+bzr1063+dfsg-0ubuntu1
 	# we need to regenerate the passwords and update configs.
-	if dpkg --compare-versions "$2" lt 0.1+bzr1063+dfsg-0ubuntu1; then
-		# configure maas default url
-		db_get maas/default-maas-url
-		ipaddr="$RET"
-		configure_maas_default_url "$ipaddr"
-		# make sure rabbitmq is running
-		restart_rabbitmq
-		configure_maas_txlongpoll_rabbitmq_user
-		# Handle celery/rabbitmq publishing
-		configure_maas_workers_rabbitmq_user
-		# handle database upgrade
-		dbc_go maas-region-controller $@
-		configure_maas_database "$dbc_dbpass"
-	fi
+	db_get maas/default-maas-url
+	ipaddr="$RET"
+	configure_maas_default_url "$ipaddr"
+	# make sure rabbitmq is running
+	restart_rabbitmq
+	configure_maas_txlongpoll_rabbitmq_user
+	# Handle celery/rabbitmq publishing
+	configure_maas_workers_rabbitmq_user
+	# handle database upgrade
+	dbc_go maas-region-controller $@
+	configure_maas_database "$dbc_dbpass"
 
 	maas_sync_migrate_db