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

[Andres Rodriguez]

Release beta7 bzr3267 as per released in Utopic

[Andres Rodriguez (andreserl)]

review: Approve

[Julian Edwards (julian-edwards)]

This was more than a simple release; you should probably get a second opinion before landing next time. As it is I would have asked you to fix the get-orig-source as it's now pointing at the wrong branch. I've fixed it in a branch that I just landed.

[Andres Rodriguez (andreserl)]

I'm aware of the change as I did it purposely. I just never got the chance
to change to come back to a computer.
On Oct 20, 2014 9:10 PM, "Julian Edwards" <email address hidden>
wrote:

> This was more than a simple release; you should probably get a second
> opinion before landing next time. As it is I would have asked you to fix
> the get-orig-source as it's now pointing at the wrong branch. I've fixed
> it in a branch that I just landed.
> --
> https://code.launchpad.net/~andreserl/maas/release_beta7/+merge/238944
> You are the owner of lp:~andreserl/maas/release_beta7.
>

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-14 07:09:02 +0000
+++ debian/changelog	2014-10-20 19:03:27 +0000
@@ -1,6 +1,12 @@
-maas (1.7.0~beta6+bzr3245-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New Upstream Snapshot, Beta 6 bzr3245
+maas (1.7.0~beta7+bzr3267-0ubuntu1) UNRELEASED; urgency=medium
+
+  * UNRELEASED
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 20 Oct 2014 15:01:20 -0400
+
+maas (1.7.0~beta7+bzr3266-0ubuntu1) utopic; urgency=medium
+
+  * New Upstream Snapshot, Beta 7 bzr3266
 
   [ Jeroen Vermeulen ]
   * debian/extras/99-maas-sudoers
@@ -25,7 +31,7 @@
   * Provide new maas-proxy package that replaces the usage of
     squid-deb-proxy:
     - debian/control: New maas-proxy package that replaces the usage
-      of squid-deb-proxy; Depends on maas-proxy | squid-deb-proxy.
+      of squid-deb-proxy; Drop depends on squid-deb-proxy.
     - Add upstrart job.
     - Ensure squid3 is stopped as maas-proxy uses a caching proxy.
   * Remove Celery references to cluster controller:

=== modified file 'debian/control'
--- debian/control	2014-09-29 23:53:50 +0000
+++ debian/control	2014-10-20 19:03:27 +0000
@@ -59,7 +59,7 @@
          python-maas-provisioningserver (= ${binary:Version}),
          python-djorm-ext-pgarray,
          rsyslog,
-         maas-proxy | squid-deb-proxy,
+         maas-proxy,
          ${misc:Depends},
          ${python:Depends}
 Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
@@ -229,7 +229,7 @@
 Depends: ${python:Depends},
          ${misc:Depends},
          squid3
-Breaks: squid-deb-proxy
+Conflicts: squid-deb-proxy
 Replaces: squid-deb-proxy
 Description: MAAS Caching Proxy
  This package installs and configures a Caching Proxy server that can be

=== modified file 'debian/rules'
--- debian/rules	2014-10-14 07:03:50 +0000
+++ debian/rules	2014-10-20 19:03:27 +0000
@@ -52,4 +52,4 @@
               | sed -rne 's,^Version: ([^-]+).*,\1,p')
 get-orig-source:
 	bzr export -r $(REV) --root=maas-$(VER).orig \
-             maas_$(VER).orig.tar.gz lp:maas
+             maas_$(VER).orig.tar.gz lp:maas/1.7