MAAS

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

  1. quantal_packaging_updates_sru
  2. Merge into packaging.quantal
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/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
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-20 17:40:14 +0000
+++ debian/changelog 2013-03-20 17:52:21 +0000
@@ -7,6 +7,12 @@
7 Board to proceed. More information can be found in:7 Board to proceed. More information can be found in:
8 https://lists.ubuntu.com/archives/ubuntu-devel-announce/2013-February/001012.html8 https://lists.ubuntu.com/archives/ubuntu-devel-announce/2013-February/001012.html
99
10 [ Andres Rodriguez ]
11 * debian/control:
12 - Change Conflicts/Replaces for Breaks/Replaces.
13 - Conflicts on tftpd-hpa and dnsmasq.
14 - Do not pre-depends, but Depends on ${misc:Depends} for 'maas'.
15
10 [ Steve Langasek ]16 [ Steve Langasek ]
11 * postinst scripts are never called with 'reconfigure' as the script17 * postinst scripts are never called with 'reconfigure' as the script
12 argument. Remove references to this (mythical) invocation.18 argument. Remove references to this (mythical) invocation.
1319
=== modified file 'debian/control'
--- debian/control 2013-03-08 22:38:44 +0000
+++ debian/control 2013-03-20 17:52:21 +0000
@@ -14,8 +14,7 @@
1414
15Package: maas15Package: maas
16Architecture: all16Architecture: all
17Pre-Depends: ${misc:Pre-Depends}, ${misc:Depends}17Depends: ${misc:Depends}, maas-cluster-controller, maas-region-controller, python-django-maas
18Depends: maas-cluster-controller, maas-region-controller, python-django-maas
19Description: Ubuntu MAAS Server18Description: Ubuntu MAAS Server
20 Ubuntu MAAS Server is the successor to Orchestra. It offers a19 Ubuntu MAAS Server is the successor to Orchestra. It offers a
21 nice UI to provision your Ubuntu servers. Each physical server20 nice UI to provision your Ubuntu servers. Each physical server
@@ -32,7 +31,7 @@
32Package: maas-common31Package: maas-common
33Architecture: all32Architecture: all
34Depends: ${misc:Depends}, ${python:Depends}33Depends: ${misc:Depends}, ${python:Depends}
35Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )34Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
36Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )35Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
37Description: Ubuntu MAAS Server36Description: Ubuntu MAAS Server
38 Ubuntu MAAS Server is the successor to Orchestra. It offers a37 Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -71,7 +70,7 @@
71 ${python:Depends}70 ${python:Depends}
72Recommends: openssh-server71Recommends: openssh-server
73Suggests: maas-dns72Suggests: maas-dns
74Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )73Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
75Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )74Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
76Description: Ubuntu MAAS Server75Description: Ubuntu MAAS Server
77 Ubuntu MAAS Server is the successor to Orchestra. It offers a76 Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -109,7 +108,7 @@
109 python-zope.interface,108 python-zope.interface,
110 ${misc:Depends},109 ${misc:Depends},
111 ${python:Depends}110 ${python:Depends}
112Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)111Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)
113Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)112Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)
114Description: Ubuntu MAAS Server113Description: Ubuntu MAAS Server
115 Ubuntu MAAS Server is the successor to Orchestra. It offers a114 Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -147,7 +146,7 @@
147Section: python146Section: python
148Architecture: all147Architecture: all
149Depends: python-oauth, ${misc:Depends}, ${python:Depends}148Depends: python-oauth, ${misc:Depends}, ${python:Depends}
150Conflicts: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )149Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
151Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )150Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
152Description: Ubuntu MAAS API Client - (python files)151Description: Ubuntu MAAS API Client - (python files)
153 Ubuntu MAAS Server is the successor to Orchestra. It offers a152 Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -185,7 +184,8 @@
185 ${misc:Depends},184 ${misc:Depends},
186 ${python:Depends}185 ${python:Depends}
187Suggests: maas-dhcp (= ${binary:Version})186Suggests: maas-dhcp (= ${binary:Version})
188Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ), tftpd-hpa187Conflicts: tftpd-hpa
188Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
189Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )189Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
190Description: Ubuntu MAAS Cluster Controller190Description: Ubuntu MAAS Cluster Controller
191 Ubuntu MAAS Server is the successor to Orchestra. It offers a191 Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -241,7 +241,7 @@
241Package: maas-dhcp241Package: maas-dhcp
242Architecture: all242Architecture: all
243Depends: isc-dhcp-server, ${misc:Depends}243Depends: isc-dhcp-server, ${misc:Depends}
244Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)244Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
245Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)245Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
246Description: Ubuntu MAAS Server - DHCP Configuration (meta-package)246Description: Ubuntu MAAS Server - DHCP Configuration (meta-package)
247 Ubuntu MAAS Server is the successor to Orchestra. It offers a247 Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -261,7 +261,8 @@
261 maas-region-controller (= ${binary:Version}),261 maas-region-controller (= ${binary:Version}),
262 maas-dhcp (= ${binary:Version}),262 maas-dhcp (= ${binary:Version}),
263 ${misc:Depends}263 ${misc:Depends}
264Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1), dnsmasq264Conflicts: dnsmasq
265Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
265Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)266Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
266Description: Ubuntu MAAS Server - DNS configuration (metapackage)267Description: Ubuntu MAAS Server - DNS configuration (metapackage)
267 Ubuntu MAAS Server is the successor to Orchestra. It offers a268 Ubuntu MAAS Server is the successor to Orchestra. It offers a

Subscribers

People subscribed via source and target branches