Merge lp:~andreserl/maas/precise_packaging_sru into lp:~maas-maintainers/maas/packaging.precise.sru

[Andres Rodriguez]

Rebase agents latest packaging.quantal branch to reflect SRU.

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-22 16:31:35 +0000
+++ debian/changelog	2013-03-08 23:26:21 +0000
@@ -1,14 +1,41 @@
-maas (1.2+bzr1360+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (1.2+bzr1372+dfsg-0ubuntu1~12.04.1) precise-proposed; urgency=low
 
+  * MAAS Stable Release Update (LP: #1109283). See changelog entry bellow.
   * debian/maas-dhcp.maas-dhcp-server.upstart: leases file should be owned
     by user/group 'dhcpd' instead of root.
   * debian/control: Force dependency version for python-django to
-    ((>> 1.3.1-4ubuntu1.4).
+    (>= 1.3.1-4ubuntu1.7).
   * Continue to ship yui3 and raphael with MAAS.
     - debian/patches/04_precise_no_yui_root.patch: Add.
     - debian/control: Drop dependencies on yui3 and raphael.
     - debian/source/include-binaries: Add to not FTBFS
     - debian/extras/jslibs: Ship JS libraries.
+    - debian/copyright: Update copyright to reflect libraries license.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 08 Mar 2013 18:18:18 -0500
+
+maas (1.2+bzr1372+dfsg-0ubuntu1) quantal-proposed; urgency=low
+
+  * MAAS Stable Release Update (LP: #1109283):
+    This SRU brings a new upstream release of MAAS that removes
+    the usage of a cobbler code copy, 'maas-provision' as well as
+    several bug fixes. Exception has been granted by the Technical
+    Board to proceed. More information can be found in:
+    https://lists.ubuntu.com/archives/ubuntu-devel-announce/2013-February/001012.html
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 07 Mar 2013 14:22:35 -0500
+
+maas (1.2+bzr1370+dfsg-0ubuntu1) raring; urgency=low
+
+  * New upstream release:
+    - MAAS file storage mechanism is shifting from a single shared
+      namespace to a per-user namespace. Operators of the majority
+      of MAAS systems will not notice any change. However, operators
+      of the most complex installations may find that a new
+      "shared-environment" user is created, and that some resources
+      are reassigned to it, such as API credentials and SSH public
+      keys. This provides a transitional environment that mimics the
+      behaviour of a shared namespace.
 
  -- Andres Rodriguez <[e-mail]>  Wed, 30 Jan 2013 14:07:52 -0500
 

=== modified file 'debian/control'
--- debian/control	2013-02-20 19:45:36 +0000
+++ debian/control	2013-03-08 23:26:21 +0000
@@ -16,8 +16,6 @@
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}, ${misc:Depends}
 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
-Conflicts: maas-provision
-Replaces: maas-provision
 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
@@ -58,7 +56,7 @@
          maas-common (= ${binary:Version}),
          postgresql-9.1,
          pwgen,
-         python-django (>> 1.3.1-4ubuntu1.4),
+         python-django (>= 1.3.1-4ubuntu1.7),
          python-django-maas (= ${binary:Version}),
          python-django-piston,
          python-django-south,

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-20 20:58:30 +0000
+++ debian/copyright	2013-03-08 23:26:21 +0000
@@ -64,7 +64,7 @@
 License: MIT
  This program is free software; you can redistribute it and/or modify
  it under the terms of the MIT license:
-
+ .
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -72,10 +72,10 @@
  distribute, sublicense, and/or sell copies of the Software, and to
  permit persons to whom the Software is furnished to do so, subject to
  the following conditions:
-
+ .
  The above copyright notice and this permission notice shall be
  included in all copies or substantial portions of the Software.
-
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND