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

[Andres Rodriguez]

Open 1.4+bzr1817+dfsg-0ubuntu2
Release 1.4+bzr1817+dfsg-0ubuntu1
debian/control: Depends on python-amqp; Conflicts on python-librabbitmq.

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-14 05:08:51 +0000
+++ debian/changelog	2014-01-15 05:27:45 +0000
@@ -1,19 +1,27 @@
-maas (1.4+bzr1814+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (1.4+bzr1817+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   * UNRELEASED
 
+ -- Andres Rodriguez <[e-mail]>  Wed, 15 Jan 2014 00:24:58 -0500
+
+maas (1.4+bzr1817+dfsg-0ubuntu1) trusty; urgency=low
+
+  * New upstream release
+
   [ Andres Rodriguez ]
   * debian/maas-dns.postinst: Drop write_dns_config as this is run by
     celery jobs.
   * debian/maas-region-controller.templates: Rename template to
     maas-region-controller-min.templates
+  * debian/control: Depends on python-amqp; Conflicts on python-librabbitmq.
+
   [ Julian Edwards ]
   * New maas-probe-dhcp script to detect DHCP servers
     - debian/extras/maas-probe-dhcp: New script
     - debian/maas-dhcp.install: Install new maas-probe-dhcp script
     - maas-dhcp.lintian-overrides: New maas-probe-dhcp script has no manpage
 
- -- Julian Edwards <[e-mail]>  Tue, 14 Jan 2014 15:05:22 +1000
+ -- Andres Rodriguez <[e-mail]>  Wed, 15 Jan 2014 00:23:44 -0500
 
 maas (1.4+bzr1789+dfsg-0ubuntu1) trusty; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2013-12-09 20:27:48 +0000
+++ debian/control	2014-01-15 05:27:45 +0000
@@ -107,7 +107,8 @@
 Package: python-maas-provisioningserver
 Section: python
 Architecture: all
-Depends: python-celery,
+Depends: python-amqp,
+         python-celery,
          python-distro-info,
          python-formencode,
          python-lockfile,
@@ -131,6 +132,7 @@
          ${python:Depends}
 Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)
 Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)
+Conflicts: python-librabbitmq
 Description: Ubuntu MAAS Server
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
  nice UI to provision your Ubuntu servers. Each physical server
@@ -191,6 +193,7 @@
          maas-cli (=${binary:Version}),
          maas-common (=${binary:Version}),
          maas-dhcp (=${binary:Version}),
+         python-amqp,
          python-celery,
          python-httplib2,
          python-lockfile,
@@ -208,7 +211,7 @@
          wget,
          ${misc:Depends},
          ${python:Depends}
-Conflicts: tftpd-hpa
+Conflicts: tftpd-hpa, python-librabbitmq
 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Cluster Controller
@@ -229,6 +232,7 @@
 Section: python
 Architecture: all
 Depends: python-avahi,
+         python-amqp,
          python-celery,
          python-convoy,
          python-curtin,
@@ -251,6 +255,7 @@
          python-zope.interface,
          ${misc:Depends},
          ${python:Depends}
+Conflicts: python-librabbitmq
 Description: Ubuntu MAAS Server - (django files)
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
  nice UI to provision your Ubuntu servers. Each physical server