← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~andreserl/maas/packaging.precise.sru.lintianclean into lp:~maas-maintainers/maas/packaging.precise.sru

 

Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging.precise.sru.lintianclean into lp:~maas-maintainers/maas/packaging.precise.sru.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging.precise.sru.lintianclean/+merge/143569
-- 
https://code.launchpad.net/~andreserl/maas/packaging.precise.sru.lintianclean/+merge/143569
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/packaging.precise.sru.lintianclean into lp:~maas-maintainers/maas/packaging.precise.sru.
=== modified file 'debian/changelog'
--- debian/changelog	2012-12-21 20:51:02 +0000
+++ debian/changelog	2013-01-16 18:23:23 +0000
@@ -1,28 +1,32 @@
-maas (0.1+bzr1343+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (1.2+bzr1349+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream bugfix release. Fixes:
     - The DNS configuration is not created if maas-dns is installed after
       the DNS config has been set up (LP: #1085865).
     - IPMI detection ends up with power_address of 0.0.0.0 (LP: #1064224)
     - Main page slow to load with many nodes (LP: #1066775)
-    - maas-cluster-controller doesn't have images for provisioning (LP: #1068843)
+    - maas-cluster-controller doesn't have images for
+      provisioning (LP: #1068843)
     - Filestorage is unique to each appserver instance (LP: #1069734)
     - import_pxe_files does not include quantal (LP: #1069850)
     - maas-cli nodes new incomplete documentation (LP: #1070522)
     - DNS forward zone ends up with nonsensical entries (LP: #1070765)
-    - The hostname of a node can still be changed once the node is in use (LP: #1070774)
-    - The zone name (attached to a cluster controller) can still be changed when it
-      contains in-use nodes and DNS is managed. (LP: #1070775)
+    - The hostname of a node can still be changed once the node is in
+      use. (LP: #1070774)
+    - The zone name (attached to a cluster controller) can still be changed
+      when it contains in-use nodes and DNS is managed. (LP: #1070775)
     - Duplicated prefix in the url used by the CLI (LP: #1075597)
     - Not importing Quantal boot images (LP: #1077180)
     - Nodes are deployed with wrong domain name. (LP: #1078744)
-    - src/maasserver/api.py calls request.data.getlist with a 'default' parameter.
-      That parameter is not supported by Django 1.3. (LP: #1080673)
+    - src/maasserver/api.py calls request.data.getlist with a 'default'
+      parameter. That parameter is not supported by Django 1.3. (LP: #1080673)
     - API calls that return a node leak private data (LP: #1034318)
     - MAAS hostnames should be 5 easily disambiguated characters (LP: #1058998)
-    - URI in API description wrong when accessing machine via alternative interface (LP: #1059645)
+    - URI in API description wrong when accessing machine via alternative
+      interface. (LP: #1059645)
     - Oops when renaming nodegroup w/o interface (LP: #1077075)
-    - Error in log when using 'Start node' button: MAASAPINotFound: No user data available for this node. (LP: #1069603)
+    - Error in log when using 'Start node' button: MAASAPINotFound: No user
+      data available for this node. (LP: #1069603)
 
   [ Raphaël Badin ]
   * debian/maas-dns.postinst: Call write_dns_config (LP: #1085865).
@@ -44,13 +48,17 @@
   * debian/control:
     - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
     - maas-dns: Conflicts with dnsmasq
-    - Drop Dependency on rabbitmq-server for maas-cluster-controller. (LP: #1072744)
-  * 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.
-  * Install maas-import-pxe-files and related files with maas-cluster-controller,
-    as well as configure tgtd, as maas-region-controller no longer stores images.
-    Thanks to Jeroen Vermuelen.
+    - Drop Dependency on rabbitmq-server for maas-cluster-controller.
+      (LP: #1072744)
+    - Add conflicts/replaces for maas-region-controller to
+      maas-cluster-controller.
+  * 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.
+  * Install maas-import-pxe-files and related files with
+    maas-cluster-controller, as well as configure tgtd, as
+    maas-region-controller no longer stores images. Thanks to Jeroen
+    Vermuelen.
 
   [ Gavin Panella ]
   * debian/extras/99-maas: squashfs image download is no longer needed.

=== modified file 'debian/control'
--- debian/control	2012-11-13 20:42:13 +0000
+++ debian/control	2013-01-16 18:23:23 +0000
@@ -15,7 +15,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
@@ -29,11 +29,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
@@ -89,6 +90,7 @@
  UI and the database.
 
 Package: python-maas-provisioningserver
+Section: python
 Architecture: all
 Depends: python-celery,
          python-formencode,
@@ -145,6 +147,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 )

=== 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-01-16 18:23:23 +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-01-16 18:23:23 +0000
@@ -0,0 +1,3 @@
+maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals
+maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-isos
+maas-cluster-controller: script-not-executable etc/maas/commissioning-user-data

=== 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-01-16 18:23:23 +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-01-16 18:23:23 +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-01-16 18:23:23 +0000
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\.dfsg// \
 http://launchpad.net/maas/+download https://launchpad.net/maas/.*/maas-(.*).tar.*


Follow ups