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

[Andres Rodriguez]

Release beta 3
Open beta 4

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-16 02:28:29 +0000
+++ debian/changelog	2016-04-21 02:44:47 +0000
@@ -1,7 +1,15 @@
-maas (2.0.0~beta2+bzr4920-0ubuntu3) UNRELEASED; urgency=medium
+maas (2.0.0~beta4+bzr4941-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
 
+ -- Andres Rodriguez <[e-mail]>  Wed, 20 Apr 2016 22:43:22 -0400
+
+maas (2.0.0~beta3+bzr4941-0ubuntu1) xenial; urgency=medium
+
+  * New upstream release, 2.0.0 beta 3 bzr4941 (Standing FFe LP: #1553261)
+  * Remove some leftover references to Cluster.
+  * Run debconf-updatepo.
+
  -- Andres Rodriguez <[e-mail]>  Fri, 15 Apr 2016 22:27:56 -0400
 
 maas (2.0.0~beta2+bzr4920-0ubuntu2) xenial; urgency=medium

=== modified file 'debian/maas-common.templates'
--- debian/maas-common.templates	2016-04-13 13:28:03 +0000
+++ debian/maas-common.templates	2016-04-21 02:44:47 +0000
@@ -48,6 +48,6 @@
 
 Template: maas-rack-controller/shared-secret
 Type: password
-_Description: MAAS Cluster Controller Shared Secret:
- The MAAS Cluster Controller needs to contact the MAAS server
+_Description: MAAS Rack Controller Shared Secret:
+ The MAAS Rack Controller needs to contact the MAAS server
  with a share secret. Set the shared secret here.

=== modified file 'debian/maas-rack-controller.templates'
--- debian/maas-rack-controller.templates	2016-04-13 13:28:03 +0000
+++ debian/maas-rack-controller.templates	2016-04-21 02:44:47 +0000
@@ -9,6 +9,6 @@
 
 Template: maas-rack-controller/shared-secret
 Type: password
-_Description: MAAS Cluster Controller Shared Secret:
- The MAAS Cluster Controller needs to contact the MAAS server
+_Description: MAAS Rack Controller Shared Secret:
+ The MAAS Rack Controller needs to contact the MAAS server
  with a share secret. Set the shared secret here.

=== modified file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	2012-10-04 18:52:27 +0000
+++ debian/po/POTFILES.in	2016-04-21 02:44:47 +0000
@@ -1,2 +1,1 @@
 [type: gettext/rfc822deb] maas-region-controller.templates
-[type: gettext/rfc822deb] maas-cluster-controller.templates

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2016-04-14 15:53:34 +0000
+++ debian/po/templates.pot	2016-04-21 02:44:47 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the maas package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: maas\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-10-04 13:40-0400\n"
+"POT-Creation-Date: 2016-04-20 12:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,52 +17,53 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
-#. Description
-#: ../maas-region-controller.templates:1001
-msgid "Ubuntu MAAS Server"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../maas-region-controller.templates:1001
-msgid ""
-"The Ubuntu MAAS Server has been installed in your system. You can access the "
-"MAAS Web interface here:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../maas-region-controller.templates:1001
-msgid "   http://${MAAS_URL}/MAAS"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../maas-region-controller.templates:1001
-msgid ""
-"If the automatically detected address above is not in the same network as "
-"the MAAS clients, you need to reconfigure it:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../maas-region-controller.templates:1001
-msgid "   sudo dpkg-reconfigure maas-region-controller"
-msgstr ""
-
 #. Type: string
 #. Description
-#: ../maas-region-controller.templates:2001
+#: ../maas-region-controller.templates:1001
 msgid "Ubuntu MAAS PXE/Provisioning network address:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../maas-region-controller.templates:2001
+#: ../maas-region-controller.templates:1001
 msgid ""
 "The Ubuntu MAAS Server automatically detects the IP address that is used for "
 "PXE and provisioning. However, it needs to be in the same network as the "
 "clients. If the automatically detected address is not in the same network as "
 "the clients, it must be changed."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-region-controller.templates:2001
+msgid "Ubuntu MAAS username"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../maas-region-controller.templates:2001
+#: ../maas-region-controller.templates:3001
+msgid ""
+"The Ubuntu MAAS server requires the administrator to create a username and "
+"password combination."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-region-controller.templates:2001
+msgid "Please provide the username for the MAAS account."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../maas-region-controller.templates:3001
+msgid "Ubuntu MAAS password"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../maas-region-controller.templates:3001
+msgid "Please provide the password for the MAAS account."
+msgstr ""