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

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
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
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.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches