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

[Andres Rodriguez]

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

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-10 22:39:33 +0000
+++ debian/changelog	2013-03-04 16:53:19 +0000
@@ -51,13 +51,15 @@
   * debian/control:
     - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
     - maas-dns: Conflicts with dnsmasq
-    - maas-cluster-controller Conflicts/Replaces maas-region-controller as import
-      scripts are no longer shipped in the region.
-  * 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.
+    - 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.
 
- -- Julian Edwards <[e-mail]>  Thu, 22 Nov 2012 17:26:15 +1000
+ -- Andres Rodriguez <[e-mail]>  Mon, 04 Mar 2013 11:49:44 -0500
 
 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2013-02-14 18:32:36 +0000
+++ debian/control	2013-03-04 16:53:19 +0000
@@ -14,7 +14,7 @@
 
 Package: maas
 Architecture: all
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends}, ${misc:Depends}
 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
 Conflicts: maas-provision
 Replaces: maas-provision
@@ -28,11 +28,12 @@
  be deployed on demand by name, or allocated to a queue for
  dynamic allocation to services being deployed on this MAAS.
  .
- This package installs a complete MAAS service on a single machine.
+ This package is a metapackage which installs a complete MAAS
+ service on a single machine.
 
 Package: maas-common
 Architecture: all
-Depends: ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Server
@@ -53,7 +54,6 @@
          avahi-daemon,
          bind9utils,
          dbconfig-common,
-         distro-info,
          libapache2-mod-wsgi,
          libjs-raphael,
          libjs-yui3-full,
@@ -89,6 +89,7 @@
  UI and the database.
 
 Package: python-maas-provisioningserver
+Section: python
 Architecture: all
 Depends: python-celery,
          python-formencode,
@@ -145,6 +146,7 @@
  This package contains the client command line tool.
 
 Package: python-maas-client
+Section: python
 Architecture: all
 Depends: python-oauth, ${misc:Depends}, ${python:Depends}
 Conflicts: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
@@ -164,6 +166,7 @@
 Package: maas-cluster-controller
 Architecture: all
 Depends: bind9utils,
+         distro-info,
          freeipmi-tools,
          maas-cli (=${binary:Version}),
          maas-common (=${binary:Version}),
 
=== added file 'debian/maas-cli.lintian-overrides'
--- debian/maas-cli.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/maas-cli.lintian-overrides	2013-03-04 16:53:19 +0000
@@ -0,0 +1,1 @@
+maas-cli: binary-without-manpage usr/bin/maas-cli
 
=== added file 'debian/maas-cluster-controller.lintian-overrides'
--- debian/maas-cluster-controller.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.lintian-overrides	2013-03-04 16:53:19 +0000
@@ -0,0 +1,2 @@
+maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals
+maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-isos
 
=== modified file 'debian/maas-region-controller.lintian-overrides'
--- debian/maas-region-controller.lintian-overrides	2012-09-25 07:54:44 +0000
+++ debian/maas-region-controller.lintian-overrides	2013-03-04 16:53:19 +0000
@@ -1,7 +1,2 @@
-maas-region-controller: embedded-javascript-library usr/share/maas/web/static/jslibs/yui/3.4.1/build/yui/yui-min.js
-maas-region-controller: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/panel/vendor/prettify/COPYING
-maas-region-controller: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/vendor/prettify/COPYING
-maas-region-controller: script-not-executable usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js
-maas-region-controller: unusual-interpreter usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js #!node
-maas-region-controller: postinst-uses-db-input
-maas-region-controller: binary-without-manpage usr/bin/maas
+maas-region-controller: binary-without-manpage usr/sbin/maas
+maas-region-controller: binary-without-manpage usr/sbin/maas-region-celeryd
 
=== added file 'debian/python-maas-provisioningserver.lintian-overrides'
--- debian/python-maas-provisioningserver.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/python-maas-provisioningserver.lintian-overrides	2013-03-04 16:53:19 +0000
@@ -0,0 +1,1 @@
+python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-provision
 
=== modified file 'debian/watch'
--- debian/watch	2012-02-16 22:03:35 +0000
+++ debian/watch	2013-03-04 16:53:19 +0000
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\.dfsg// \
 http://launchpad.net/maas/+download https://launchpad.net/maas/.*/maas-(.*).tar.*