Merge lp:~andreserl/maas/packaging.raring.lintian into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez on 2013-01-22
Status: Merged
Approved by: Andres Rodriguez on 2013-03-07
Approved revision: 165
Merged at revision: 165
Proposed branch: lp:~andreserl/maas/packaging.raring.lintian
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 126 lines (+22/-17)
7 files modified
debian/changelog (+8/-6)
debian/control (+7/-4)
debian/maas-cli.lintian-overrides (+1/-0)
debian/maas-cluster-controller.lintian-overrides (+2/-0)
debian/maas-region-controller.lintian-overrides (+2/-7)
debian/python-maas-provisioningserver.lintian-overrides (+1/-0)
debian/watch (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging.raring.lintian
Reviewer Review Type Date Requested Status
Julian Edwards (community) 2013-01-22 Approve on 2013-03-05
Review via email: mp+144413@code.launchpad.net

Commit message

Makes the packaging more lintian clean.
Depends on distro-info for maas-cluster-controller instead of maas-region-controller.

To post a comment you must log in.
162. By Raphaƫl Badin on 2013-01-25

[r=andreserl][bug=1103195][author=rvb] The region controller needs /usr/sbin/dnssec-keygen which is in bind9utils.

163. By Julian Edwards on 2013-02-10

[r=julian-edwards][bug=1052805][author=julian-edwards] Bump base version to 1.2 so it matches what was already uploaded to raring.

164. By Diogo Matsubara on 2013-02-15

[r=rvb][bug=][author=matsubara] removes the debian/tests dir and removes the XS-Testsuite header

165. By Andres Rodriguez on 2013-03-04

  - maas-cluster-controller Conflicts/Replaces maas-region-controller as
    import scripts are no longer shipped in the region.
  - debian/control: Depends on distro-info for maas-cluster-controller
    instead of maas-region-controller (LP: #1103194)
* debian/maas-cluster-controller.config: If URL has been detected,
  add /MAAS if it doesn't contain it. This helps upgrades from versions
  where DEFAULT_MAAS_URL didn't use /MAAS.

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-10 22:39:33 +0000
3+++ debian/changelog 2013-03-04 16:53:19 +0000
4@@ -51,13 +51,15 @@
5 * debian/control:
6 - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
7 - maas-dns: Conflicts with dnsmasq
8- - maas-cluster-controller Conflicts/Replaces maas-region-controller as import
9- scripts are no longer shipped in the region.
10- * debian/maas-cluster-controller.config: If URL has been detected, add /MAAS if
11- it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
12- didn't use /MAAS.
13+ - maas-cluster-controller Conflicts/Replaces maas-region-controller as
14+ import scripts are no longer shipped in the region.
15+ - debian/control: Depends on distro-info for maas-cluster-controller
16+ instead of maas-region-controller (LP: #1103194)
17+ * debian/maas-cluster-controller.config: If URL has been detected,
18+ add /MAAS if it doesn't contain it. This helps upgrades from versions
19+ where DEFAULT_MAAS_URL didn't use /MAAS.
20
21- -- Julian Edwards <julian.edwards@canonical.com> Thu, 22 Nov 2012 17:26:15 +1000
22+ -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 04 Mar 2013 11:49:44 -0500
23
24 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
25
26
27=== modified file 'debian/control'
28--- debian/control 2013-02-14 18:32:36 +0000
29+++ debian/control 2013-03-04 16:53:19 +0000
30@@ -14,7 +14,7 @@
31
32 Package: maas
33 Architecture: all
34-Pre-Depends: ${misc:Pre-Depends}
35+Pre-Depends: ${misc:Pre-Depends}, ${misc:Depends}
36 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
37 Conflicts: maas-provision
38 Replaces: maas-provision
39@@ -28,11 +28,12 @@
40 be deployed on demand by name, or allocated to a queue for
41 dynamic allocation to services being deployed on this MAAS.
42 .
43- This package installs a complete MAAS service on a single machine.
44+ This package is a metapackage which installs a complete MAAS
45+ service on a single machine.
46
47 Package: maas-common
48 Architecture: all
49-Depends: ${python:Depends}
50+Depends: ${misc:Depends}, ${python:Depends}
51 Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
52 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
53 Description: Ubuntu MAAS Server
54@@ -53,7 +54,6 @@
55 avahi-daemon,
56 bind9utils,
57 dbconfig-common,
58- distro-info,
59 libapache2-mod-wsgi,
60 libjs-raphael,
61 libjs-yui3-full,
62@@ -89,6 +89,7 @@
63 UI and the database.
64
65 Package: python-maas-provisioningserver
66+Section: python
67 Architecture: all
68 Depends: python-celery,
69 python-formencode,
70@@ -145,6 +146,7 @@
71 This package contains the client command line tool.
72
73 Package: python-maas-client
74+Section: python
75 Architecture: all
76 Depends: python-oauth, ${misc:Depends}, ${python:Depends}
77 Conflicts: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
78@@ -164,6 +166,7 @@
79 Package: maas-cluster-controller
80 Architecture: all
81 Depends: bind9utils,
82+ distro-info,
83 freeipmi-tools,
84 maas-cli (=${binary:Version}),
85 maas-common (=${binary:Version}),
86
87=== added file 'debian/maas-cli.lintian-overrides'
88--- debian/maas-cli.lintian-overrides 1970-01-01 00:00:00 +0000
89+++ debian/maas-cli.lintian-overrides 2013-03-04 16:53:19 +0000
90@@ -0,0 +1,1 @@
91+maas-cli: binary-without-manpage usr/bin/maas-cli
92
93=== added file 'debian/maas-cluster-controller.lintian-overrides'
94--- debian/maas-cluster-controller.lintian-overrides 1970-01-01 00:00:00 +0000
95+++ debian/maas-cluster-controller.lintian-overrides 2013-03-04 16:53:19 +0000
96@@ -0,0 +1,2 @@
97+maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals
98+maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-isos
99
100=== modified file 'debian/maas-region-controller.lintian-overrides'
101--- debian/maas-region-controller.lintian-overrides 2012-09-25 07:54:44 +0000
102+++ debian/maas-region-controller.lintian-overrides 2013-03-04 16:53:19 +0000
103@@ -1,7 +1,2 @@
104-maas-region-controller: embedded-javascript-library usr/share/maas/web/static/jslibs/yui/3.4.1/build/yui/yui-min.js
105-maas-region-controller: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/panel/vendor/prettify/COPYING
106-maas-region-controller: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/vendor/prettify/COPYING
107-maas-region-controller: script-not-executable usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js
108-maas-region-controller: unusual-interpreter usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js #!node
109-maas-region-controller: postinst-uses-db-input
110-maas-region-controller: binary-without-manpage usr/bin/maas
111+maas-region-controller: binary-without-manpage usr/sbin/maas
112+maas-region-controller: binary-without-manpage usr/sbin/maas-region-celeryd
113
114=== added file 'debian/python-maas-provisioningserver.lintian-overrides'
115--- debian/python-maas-provisioningserver.lintian-overrides 1970-01-01 00:00:00 +0000
116+++ debian/python-maas-provisioningserver.lintian-overrides 2013-03-04 16:53:19 +0000
117@@ -0,0 +1,1 @@
118+python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-provision
119
120=== modified file 'debian/watch'
121--- debian/watch 2012-02-16 22:03:35 +0000
122+++ debian/watch 2013-03-04 16:53:19 +0000
123@@ -1,2 +1,3 @@
124 version=3
125+opts=dversionmangle=s/\.dfsg// \
126 http://launchpad.net/maas/+download https://launchpad.net/maas/.*/maas-(.*).tar.*

Subscribers

People subscribed via source and target branches

to all changes: