Merge lp:~andreserl/maas/packaging.trusty into lp:~maas-maintainers/maas/packaging.trusty

[Andres Rodriguez]

[Julian Edwards (julian-edwards)]

Do we want to concentrate the packaging branch on Ubuntu, or PPAs?

review: Approve

[Julian Edwards (julian-edwards)]

There's no lander for 1.6 packaging, you'll need to push this manually until we get one going.

[Julian Edwards (julian-edwards)]

I've merged something manually.

[Julian Edwards (julian-edwards)]

review: Disapprove

Unmerged revisions

295. By Andres Rodriguez on 2014-08-21

Open 1.6.1 ubuntu2

294. By Andres Rodriguez on 2014-08-21

Release 1.6.1 for Utopic

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-21 13:49:08 +0000
+++ debian/changelog	2014-08-21 14:00:08 +0000
@@ -1,4 +1,10 @@
-maas (1.6.1+bzr2550-0ubuntu1~ppa1) trusty; urgency=medium
+maas (1.6.1+bzr2550-0ubuntu2) UNRELEASED; urgency=medium
+
+  * UNRELEASED
+
+ -- Andres <roaksoax@unleashed>  Thu, 21 Aug 2014 09:56:31 -0400
+
+maas (1.6.1+bzr2550-0ubuntu1) utopic; urgency=medium
 
   * New upstream bugfix release:
     - Auto-link node MACs to Networks (LP: #1341619)
@@ -15,7 +21,7 @@
 
  -- Julian Edwards <[e-mail]>  Thu, 21 Aug 2014 18:38:27 +1000
 
-maas (1.6.0+bzr2545-0ubuntu1~ppa1) trusty; urgency=medium
+maas (1.6.0+bzr2545-0ubuntu1) trusty; urgency=medium
 
   * New upstream release 1.6.0