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

Proposed by Andres Rodriguez on 2013-03-08
Status: Merged
Approved by: Andres Rodriguez on 2013-03-08
Approved revision: 167
Merged at revision: 167
Proposed branch: lp:~andreserl/maas/precise_packaging_sru
Merge into: lp:~maas-maintainers/maas/packaging.precise.sru
Diff against target: 95 lines (+33/-8)
3 files modified
debian/changelog (+29/-2)
debian/control (+1/-3)
debian/copyright (+3/-3)
To merge this branch: bzr merge lp:~andreserl/maas/precise_packaging_sru
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2013-03-08
Review via email: mp+152536@code.launchpad.net

Commit message

Rebase agents latest packaging.quantal branch to reflect SRU.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-22 16:31:35 +0000
3+++ debian/changelog 2013-03-08 23:26:21 +0000
4@@ -1,14 +1,41 @@
5-maas (1.2+bzr1360+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (1.2+bzr1372+dfsg-0ubuntu1~12.04.1) precise-proposed; urgency=low
7
8+ * MAAS Stable Release Update (LP: #1109283). See changelog entry bellow.
9 * debian/maas-dhcp.maas-dhcp-server.upstart: leases file should be owned
10 by user/group 'dhcpd' instead of root.
11 * debian/control: Force dependency version for python-django to
12- ((>> 1.3.1-4ubuntu1.4).
13+ (>= 1.3.1-4ubuntu1.7).
14 * Continue to ship yui3 and raphael with MAAS.
15 - debian/patches/04_precise_no_yui_root.patch: Add.
16 - debian/control: Drop dependencies on yui3 and raphael.
17 - debian/source/include-binaries: Add to not FTBFS
18 - debian/extras/jslibs: Ship JS libraries.
19+ - debian/copyright: Update copyright to reflect libraries license.
20+
21+ -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 08 Mar 2013 18:18:18 -0500
22+
23+maas (1.2+bzr1372+dfsg-0ubuntu1) quantal-proposed; urgency=low
24+
25+ * MAAS Stable Release Update (LP: #1109283):
26+ This SRU brings a new upstream release of MAAS that removes
27+ the usage of a cobbler code copy, 'maas-provision' as well as
28+ several bug fixes. Exception has been granted by the Technical
29+ Board to proceed. More information can be found in:
30+ https://lists.ubuntu.com/archives/ubuntu-devel-announce/2013-February/001012.html
31+
32+ -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 07 Mar 2013 14:22:35 -0500
33+
34+maas (1.2+bzr1370+dfsg-0ubuntu1) raring; urgency=low
35+
36+ * New upstream release:
37+ - MAAS file storage mechanism is shifting from a single shared
38+ namespace to a per-user namespace. Operators of the majority
39+ of MAAS systems will not notice any change. However, operators
40+ of the most complex installations may find that a new
41+ "shared-environment" user is created, and that some resources
42+ are reassigned to it, such as API credentials and SSH public
43+ keys. This provides a transitional environment that mimics the
44+ behaviour of a shared namespace.
45
46 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 30 Jan 2013 14:07:52 -0500
47
48
49=== modified file 'debian/control'
50--- debian/control 2013-02-20 19:45:36 +0000
51+++ debian/control 2013-03-08 23:26:21 +0000
52@@ -16,8 +16,6 @@
53 Architecture: all
54 Pre-Depends: ${misc:Pre-Depends}, ${misc:Depends}
55 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
56-Conflicts: maas-provision
57-Replaces: maas-provision
58 Description: Ubuntu MAAS Server
59 Ubuntu MAAS Server is the successor to Orchestra. It offers a
60 nice UI to provision your Ubuntu servers. Each physical server
61@@ -58,7 +56,7 @@
62 maas-common (= ${binary:Version}),
63 postgresql-9.1,
64 pwgen,
65- python-django (>> 1.3.1-4ubuntu1.4),
66+ python-django (>= 1.3.1-4ubuntu1.7),
67 python-django-maas (= ${binary:Version}),
68 python-django-piston,
69 python-django-south,
70
71=== modified file 'debian/copyright'
72--- debian/copyright 2013-02-20 20:58:30 +0000
73+++ debian/copyright 2013-03-08 23:26:21 +0000
74@@ -64,7 +64,7 @@
75 License: MIT
76 This program is free software; you can redistribute it and/or modify
77 it under the terms of the MIT license:
78-
79+ .
80 Permission is hereby granted, free of charge, to any person obtaining
81 a copy of this software and associated documentation files (the
82 "Software"), to deal in the Software without restriction, including
83@@ -72,10 +72,10 @@
84 distribute, sublicense, and/or sell copies of the Software, and to
85 permit persons to whom the Software is furnished to do so, subject to
86 the following conditions:
87-
88+ .
89 The above copyright notice and this permission notice shall be
90 included in all copies or substantial portions of the Software.
91-
92+ .
93 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
94 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
95 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

Subscribers

People subscribed via source and target branches