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

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 167
Merged at revision: 167
Proposed branch: lp:~andreserl/maas/quantal_packaging_updates_sru
Merge into: lp:~maas-maintainers/maas/packaging.quantal
Diff against target: 95 lines (+16/-9)
2 files modified
debian/changelog (+6/-0)
debian/control (+10/-9)
To merge this branch: bzr merge lp:~andreserl/maas/quantal_packaging_updates_sru
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+154451@code.launchpad.net

Commit message

Backport packaging fixes (bzr 170) to use Breaks/Replaces instead of Conflicts/Replaces, as it is a better restriction for upgrades when files move around packages.

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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-20 17:40:14 +0000
3+++ debian/changelog 2013-03-20 17:52:21 +0000
4@@ -7,6 +7,12 @@
5 Board to proceed. More information can be found in:
6 https://lists.ubuntu.com/archives/ubuntu-devel-announce/2013-February/001012.html
7
8+ [ Andres Rodriguez ]
9+ * debian/control:
10+ - Change Conflicts/Replaces for Breaks/Replaces.
11+ - Conflicts on tftpd-hpa and dnsmasq.
12+ - Do not pre-depends, but Depends on ${misc:Depends} for 'maas'.
13+
14 [ Steve Langasek ]
15 * postinst scripts are never called with 'reconfigure' as the script
16 argument. Remove references to this (mythical) invocation.
17
18=== modified file 'debian/control'
19--- debian/control 2013-03-08 22:38:44 +0000
20+++ debian/control 2013-03-20 17:52:21 +0000
21@@ -14,8 +14,7 @@
22
23 Package: maas
24 Architecture: all
25-Pre-Depends: ${misc:Pre-Depends}, ${misc:Depends}
26-Depends: maas-cluster-controller, maas-region-controller, python-django-maas
27+Depends: ${misc:Depends}, maas-cluster-controller, maas-region-controller, python-django-maas
28 Description: Ubuntu MAAS Server
29 Ubuntu MAAS Server is the successor to Orchestra. It offers a
30 nice UI to provision your Ubuntu servers. Each physical server
31@@ -32,7 +31,7 @@
32 Package: maas-common
33 Architecture: all
34 Depends: ${misc:Depends}, ${python:Depends}
35-Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
36+Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
37 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
38 Description: Ubuntu MAAS Server
39 Ubuntu MAAS Server is the successor to Orchestra. It offers a
40@@ -71,7 +70,7 @@
41 ${python:Depends}
42 Recommends: openssh-server
43 Suggests: maas-dns
44-Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
45+Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
46 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
47 Description: Ubuntu MAAS Server
48 Ubuntu MAAS Server is the successor to Orchestra. It offers a
49@@ -109,7 +108,7 @@
50 python-zope.interface,
51 ${misc:Depends},
52 ${python:Depends}
53-Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)
54+Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)
55 Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)
56 Description: Ubuntu MAAS Server
57 Ubuntu MAAS Server is the successor to Orchestra. It offers a
58@@ -147,7 +146,7 @@
59 Section: python
60 Architecture: all
61 Depends: python-oauth, ${misc:Depends}, ${python:Depends}
62-Conflicts: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
63+Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
64 Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
65 Description: Ubuntu MAAS API Client - (python files)
66 Ubuntu MAAS Server is the successor to Orchestra. It offers a
67@@ -185,7 +184,8 @@
68 ${misc:Depends},
69 ${python:Depends}
70 Suggests: maas-dhcp (= ${binary:Version})
71-Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ), tftpd-hpa
72+Conflicts: tftpd-hpa
73+Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
74 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
75 Description: Ubuntu MAAS Cluster Controller
76 Ubuntu MAAS Server is the successor to Orchestra. It offers a
77@@ -241,7 +241,7 @@
78 Package: maas-dhcp
79 Architecture: all
80 Depends: isc-dhcp-server, ${misc:Depends}
81-Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
82+Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
83 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
84 Description: Ubuntu MAAS Server - DHCP Configuration (meta-package)
85 Ubuntu MAAS Server is the successor to Orchestra. It offers a
86@@ -261,7 +261,8 @@
87 maas-region-controller (= ${binary:Version}),
88 maas-dhcp (= ${binary:Version}),
89 ${misc:Depends}
90-Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1), dnsmasq
91+Conflicts: dnsmasq
92+Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
93 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
94 Description: Ubuntu MAAS Server - DNS configuration (metapackage)
95 Ubuntu MAAS Server is the successor to Orchestra. It offers a

Subscribers

People subscribed via source and target branches