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

[Andres Rodriguez]

Release 1.4+bzr1656+dfsg-0ubuntu2
Open 1.4+bzr1656+dfsg-0ubuntu3

[Andres Rodriguez (andreserl)]

self approve

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-03 14:36:34 +0000
+++ debian/changelog	2013-10-04 16:35:23 +0000
@@ -1,7 +1,14 @@
-maas (1.4+bzr1656+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (1.4+bzr1656+dfsg-0ubuntu3) UNRELEASED; urgency=low
 
   * UNRELEASED
 
+ -- Andres Rodriguez <[e-mail]>  Fri, 04 Oct 2013 12:33:05 -0400
+
+maas (1.4+bzr1656+dfsg-0ubuntu2) saucy; urgency=low
+
+  * debian/control: Recommends on maas-dns instead of Depends for region
+    because maas-dns needs the region installed first.
+
  -- Andres Rodriguez <[e-mail]>  Thu, 03 Oct 2013 10:36:20 -0400
 
 maas (1.4+bzr1656+dfsg-0ubuntu1) saucy; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-10-03 14:20:48 +0000
+++ debian/control	2013-10-04 16:35:23 +0000
@@ -57,7 +57,6 @@
          libjs-yui3-full,
          libjs-yui3-min,
          maas-common (= ${binary:Version}),
-         maas-dns (= ${binary:Version}),
          postgresql-9.1,
          pwgen,
          python-django,
@@ -71,7 +70,7 @@
          squid-deb-proxy,
          ${misc:Depends},
          ${python:Depends}
-Recommends: openssh-server
+Recommends: openssh-server, maas-dns (= ${binary:Version})
 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Server