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

[Andres Rodriguez]

Update trunk packaging to reflect 1.10 changes.

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-26 23:35:32 +0000
+++ debian/changelog	2016-02-01 13:16:16 +0000
@@ -1,6 +1,8 @@
-maas (1.10.0~alpha1+bzr4570-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.10.0+bzr4570-0ubuntu1) xenial; urgency=medium
 
-  * UNRELEASED
+  * New upstram release, 1.10.0 bzr 4570:
+    - Support python3, drop support for python2.
+    - Support django 1.8+.
   * debian/control:
     - Remove all Upstart related services.
     - Remove python-django16 dependency.
@@ -9,6 +11,11 @@
     - Depends on dbconfig-pgsql instead of dbconfig-common.
   * debian/maas-region-controller.config:
     - Preseed dbconfig common to not ask for PG server to use.
+  * debian/maas-region-controller-min.maas-regiond-worker@.service: Don't
+    depend on postgresql.service anymore, as it would prevent regiond
+    to run on machines with a remote PostgreSQL.
+  * debian/rules: Refactor installation of init scripts so that they are
+    correctly handled, and maas-regiond is not started on install.
 
  -- Andres Rodriguez <[e-mail]>  Fri, 13 Nov 2015 13:13:42 +0000
 

=== modified file 'debian/control'
--- debian/control	2016-01-26 23:55:00 +0000
+++ debian/control	2016-02-01 13:16:16 +0000
@@ -91,7 +91,7 @@
 Section: python
 Architecture: all
 Depends: archdetect-deb,
-         lshw,
+         lshw
          python3-bson,
          python3-crochet,
          python3-curtin (>> 0.1.0~bzr275),
@@ -144,8 +144,8 @@
 Section: python
 Architecture: all
 Depends: python3-oauth, ${misc:Depends}, ${python3:Depends}
-Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
-Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
+Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ), python-maas-client
+Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ), python-maas-client
 Description: MAAS python API client (Python 3)
  This package contains the MAAS client API Python modules.
  .
@@ -180,10 +180,10 @@
 Conflicts: tftpd-hpa
 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
         maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
-        python-maas-provisioningserver ( <= 1.9.0 )
+        python-maas-provisioningserver
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
           maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
-          python-maas-provisioningserver ( <= 1.9.0 )
+          python-maas-provisioningserver
 Description: MAAS server cluster controller
  This package contains the MAAS cluster controller, which is responsible
  for enabling and controlling remote DHCP/TFTP instances on their own
@@ -206,6 +206,8 @@
          python3-zope.interface,
          ${misc:Depends},
          ${python3:Depends}
+Breaks: python-django-maas
+Replaces: python-django-maas
 Description: MAAS server Django web framework (Python 3)
  This package provides the Django web framework for MAAS.
  .

=== modified file 'debian/maas-region-controller-min.maas-regiond-worker@.service'
--- debian/maas-region-controller-min.maas-regiond-worker@.service	2015-12-09 02:18:13 +0000
+++ debian/maas-region-controller-min.maas-regiond-worker@.service	2016-02-01 13:16:16 +0000
@@ -3,8 +3,6 @@
 Documentation=https://maas.ubuntu.com/
 Requires=network-online.target
 After=network-online.target
-Requires=postgresql.service
-After=postgresql.service
 PartOf=maas-regiond.service
 # This will go away one we support new config files.
 ConditionPathExists=/etc/maas/regiond.conf

=== modified file 'debian/rules'
--- debian/rules	2015-12-20 21:21:02 +0000
+++ debian/rules	2016-02-01 13:16:16 +0000
@@ -13,29 +13,19 @@
 	# internet access
 
 override_dh_installinit:
-	# maas-clusterd
-	dh_systemd_enable --name maas-clusterd
-	dh_installinit --name maas-clusterd
-	dh_systemd_start --name maas-clusterd
-	# maas-regiond
-	dh_systemd_enable --name maas-regiond
-	dh_installinit --name maas-regiond
-	dh_systemd_start --name maas-regiond
-	# maas-regiond-worker
-	dh_installinit --no-start --name maas-regiond-worker  # Upstart
-	dh_installinit --no-start --name maas-regiond-worker@  # systemd
-	# maas-dhcpd
-	dh_systemd_enable --name maas-dhcpd
-	dh_installinit --name maas-dhcpd
-	dh_systemd_start --name maas-dhcpd
-	# maas-dhcpd6
-	dh_systemd_enable --name maas-dhcpd6
-	dh_installinit --name maas-dhcpd6
-	dh_systemd_start --name maas-dhcpd6
-	# maas-proxy
-	dh_systemd_enable --name maas-proxy
-	dh_installinit --name maas-proxy
-	dh_systemd_start --name maas-proxy
+	dh_installinit --name=maas-regiond --no-start
+	dh_installinit --name=maas-regiond-worker@  --no-start
+	dh_installinit --name=maas-clusterd
+	dh_installinit --name=maas-dhcpd
+	dh_installinit --name=maas-dhcpd6
+	dh_installinit --name=maas-proxy
+
+override_dh_systemd_start:
+	dh_systemd_start -p maas-region-controller-min --no-start maas-regiond.service
+	dh_systemd_start -p maas-cluster-controller maas-clusterd.service
+	dh_systemd_start -p maas-dhcpd maas-dhcpd.service
+	dh_systemd_start -p maas-dhcpd6 maas-dhcpd6.service
+	dh_systemd_start -p maas-proxy maas-proxy.service
 
 override_dh_auto_build:
 	dh_auto_build