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

[Andres Rodriguez]

debian/patches/04-fix-ipmi-enlistment.patch: Drop. Merged Upstream.
debian/control: Depends on maas-region-controller for maas-dns.

[Diogo Matsubara (matsubara)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-11 02:52:46 +0000
+++ debian/changelog	2012-10-11 15:32:21 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr1251+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1263+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release.
 
@@ -11,6 +11,8 @@
     - debian/python-maas-provisioningserver.install: Install
     - debian/control: Add Conflicts/Replaces with maas-cluster-controller
       to handle upgrades.
+  * debian/patches/04-fix-ipmi-enlistment.patch: Drop. Merged Upstream.
+  * debian/control: Depends on maas-region-controller for maas-dns.
 
  -- Andres Rodriguez <[e-mail]>  Wed, 10 Oct 2012 11:17:21 -0400
 

=== modified file 'debian/control'
--- debian/control	2012-10-10 19:06:52 +0000
+++ debian/control	2012-10-11 15:32:21 +0000
@@ -259,7 +259,10 @@
 
 Package: maas-dns
 Architecture: all
-Depends: bind9, maas-dhcp (= ${binary:Version}), ${misc:Depends}
+Depends: bind9,
+ maas-region-controller (= ${binary:Version}),
+ maas-dhcp (= ${binary:Version}),
+ ${misc:Depends}
 Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: Ubuntu MAAS Server - DNS configuration (metapackage)

=== removed file 'debian/patches/04-fix-ipmi-enlistment.patch'
--- debian/patches/04-fix-ipmi-enlistment.patch	2012-10-10 15:15:00 +0000
+++ debian/patches/04-fix-ipmi-enlistment.patch	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-Description: Retry maas-enlist without power parameters on failure
- Older versions of maas-enlist (such as in Precise) do not support the
- new power parameters switches and fail when they are provided, so on
- failure retry without them.
-Forwarded: https://code.launchpad.net/~racb/maas/fix-ipmi-enlistment/+merge/128914
-Author: Robie Basak <[e-mail]>
-Bug-Ubuntu: https://launchpad.net/bugs/1064922
-Last-Update: 20121010
-
---- a/contrib/preseeds_v2/enlist_userdata
-+++ b/contrib/preseeds_v2/enlist_userdata
-@@ -182,7 +182,10 @@
-    fi
-    power_params=$(maas-ipmi-autodetect --configdir "$IPMI_CONFIG_D" ${pargs} --commission-creds) &&
-      [ -n "${power_params}" ] && power_params=${power_params%.} && power_type=ipmi
--   maas-enlist --serverurl "$url" ${host:+--hostname "${host}"} ${power_params:+--power-params "${power_params}" --power-type "${power_type}"}>/tmp/enlist.out
-+   # Try maas-enlist without power parameters on failure for older versions of
-+   # maas-enlist without power parameter support
-+   maas-enlist --serverurl "$url" ${host:+--hostname "${host}"} ${power_params:+--power-params "${power_params}" --power-type "${power_type}"}>/tmp/enlist.out ||\
-+   maas-enlist --serverurl "$url" ${host:+--hostname "${host}"} >/tmp/enlist.out
-    if [ $? -eq 0 ]; then
-       msg="successfully enlisted to '$url'"
-       [ -n "$host" ] && msg="$msg with hostname '$host'" ||

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-10 16:30:15 +0000
+++ debian/patches/series	2012-10-11 15:32:21 +0000
@@ -1,4 +1,3 @@
 01-fix-database-settings.patch
 02-pserv-config.patch
 03-txlongpoll-config.patch
-04-fix-ipmi-enlistment.patch