Merge lp:~andreserl/maas/maas_packaging_fixe_bzr1030 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

* Add binary package to install client tool.
  - debian/extras/maas-cli: Add binary.
  - debian/maas-cli.install: Add. Install maascli and apiclient.
  - debian/control: Add binary package.
* debian/control: Depends on freeipmi-tools instead of ipmitool.

[Scott Moser (smoser)]

lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-14 20:00:31 +0000
+++ debian/changelog	2012-09-19 19:04:25 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr1002+dfsg-0ubuntu3) UNRELEASED; urgency=low
+maas (0.1+bzr1030+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   [ Scott Moser ]
   * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into
@@ -6,9 +6,6 @@
     /usr/sbin/dhcpd on install/remove
   * get the ip address for the dhcp server in config
 
-  [ Andres Rodriguez ]
-  * debian/maas.postinst: Always restart apache2.
-
   [ Diogo Matsubara ]
   * Add initial tests to be run by autotests:
     - debian/control: XS-Testsuite: autopkgtest
@@ -16,7 +13,15 @@
     - debian/tests/maas-package-test: Add
     - tests/maas-integration.py: Add
 
- -- Scott Moser <[e-mail]>  Wed, 12 Sep 2012 20:10:13 -0400
+  [ Andres Rodriguez ]
+  * debian/maas.postinst: Always restart apache2.
+  * Add binary package to install client tool.
+    - debian/extras/maas-cli: Add binary.
+    - debian/maas-cli.install: Add. Install maascli and apiclient.
+    - debian/control: Add binary package.
+  * debian/control: Depends on freeipmi-tools instead of ipmitool.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 19 Sep 2012 14:47:04 -0400
 
 maas (0.1+bzr971+dfsg-0ubuntu2) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-09-03 21:31:07 +0000
+++ debian/control	2012-09-19 19:04:25 +0000
@@ -16,7 +16,7 @@
          bind9utils,
          dbconfig-common,
          distro-info,
-         ipmitool,
+         freeipmi-tools,
          libapache2-mod-wsgi,
          libjs-raphael,
          libjs-yui3-full,
@@ -48,6 +48,24 @@
  be deployed on demand by name, or allocated to a queue for
  dynamic allocation to services being deployed on this MAAS.
 
+Package: maas-cli
+Architecture: all
+Depends: python-bzrlib,
+         python-httplib2,
+         python-oauth,
+         ${misc:Depends},
+         ${python:Depends}
+Description: Ubuntu MAAS Client Tool
+ Ubuntu MAAS Server is the successor to Orchestra. It offers a
+ nice UI to provision your Ubuntu servers. Each physical server
+ (“node”) will be commissioned automatically on first boot.
+ During the commissioning process administrators are able to
+ configure hardware settings manually before an automated smoke
+ test and burn-in test are done. Once commissioned, a node can
+ be deployed on demand by name, or allocated to a queue for
+ dynamic allocation to services being deployed on this MAAS.
+ .
+ This package contains the client tool.
 
 Package: python-django-maas
 Section: python

=== added file 'debian/extras/maas-cli'
--- debian/extras/maas-cli	1970-01-01 00:00:00 +0000
+++ debian/extras/maas-cli	2012-09-19 19:04:25 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec python -m maascli "$@"

=== added file 'debian/maas-cli.install'
--- debian/maas-cli.install	1970-01-01 00:00:00 +0000
+++ debian/maas-cli.install	2012-09-19 19:04:25 +0000
@@ -0,0 +1,3 @@
+debian/extras/maas-cli usr/bin
+debian/tmp/usr/lib/python*/dist-packages/maascli
+debian/tmp/usr/lib/python*/dist-packages/apiclient

=== modified file 'debian/maas.install'
--- debian/maas.install	2012-08-29 02:56:47 +0000
+++ debian/maas.install	2012-09-19 19:04:25 +0000
@@ -1,7 +1,6 @@
 # Install project
 debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas
 twisted/plugins/maasps.py usr/share/pyshared/twisted/plugins
-debian/tmp/usr/lib/python*/dist-packages/apiclient usr/share/maas
 
 # Install static files
 debian/tmp/usr/share/maas/web/static

=== modified file 'debian/maas.postinst'
--- debian/maas.postinst	2012-09-13 03:13:19 +0000
+++ debian/maas.postinst	2012-09-19 19:04:25 +0000
@@ -238,9 +238,9 @@
 	if dpkg --compare-versions "$2" lt 0.1+bzr459+dfsg-0ubuntu1; then
 		configure_maas_tgt
 	fi
-	# If upgrading from any version lower than 0.1+bzr956+dfsg-0ubuntu1
+	# If upgrading from any version lower than 0.1+bzr1030+dfsg-0ubuntu1
 	# we need to regenerate the passwords and update configs.
-	if dpkg --compare-versions "$2" lt 0.1+bzr956+dfsg-0ubuntu1; then
+	if dpkg --compare-versions "$2" lt 0.1+bzr1030+dfsg-0ubuntu1; then
 		# configure maas default url
 		db_get maas/default-maas-url
 		ipaddr="$RET"