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

[Andres Rodriguez]

Various packaging improvements that include:
 * configure db only on configure/reconfigure
 * install maas_local_settings.py to etc/maas
 * Update references from MaaS to MAAS
 * Remove debian/po

[Francis J. Lacoste (flacoste)]

Looks good.

[Francis J. Lacoste (flacoste)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-14 23:29:38 +0000
+++ debian/changelog	2012-03-15 19:43:24 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr283+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr295+dfsg-0ubuntu1) precise; urgency=low
 
   * debian/maas.upstart: Specify pidfile and conffile.
   * debian/maas.postinst:
@@ -14,8 +14,14 @@
   * debian/maas.postinst: Touch logfile to set correct permissions (LP: #955400)
   * debian/maas.logrotate: Add.
   * debian/patches/03-txlongpoll-config.patch: Add default settings.
+  * debian/maas.config: Only run dbconfig-common on configure/reconfigure.
+  * Install maas_local_settings.py in /etc/maas and symlink to usr/share/maas
+  * Update references from MaaS to MAAS.
+  * Remove podebconf as templates no longer exist.
+    - debian/po: Remove.
+    - debian/control: Drop Build-Depends on po-debconf
 
- -- Andres Rodriguez <[e-mail]>  Wed, 14 Mar 2012 18:27:31 -0400
+ -- Andres Rodriguez <[e-mail]>  Thu, 15 Mar 2012 15:28:14 -0400
 
 maas (0.1+bzr266+dfsg-0ubuntu1) precise; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-03-14 23:29:38 +0000
+++ debian/control	2012-03-15 19:43:24 +0000
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 8), python (>= 2.7), python-distribute, po-debconf
+Build-Depends: debhelper (>= 8), python (>= 2.7), python-distribute
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.7
 Homepage: https://launchpad.net/maas

=== modified file 'debian/maas.config'
--- debian/maas.config	2012-03-13 18:16:33 +0000
+++ debian/maas.config	2012-03-15 19:43:24 +0000
@@ -5,8 +5,11 @@
 
 # source dbconfig-common shell library, and call the hook function
 if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
+	. /usr/share/dbconfig-common/dpkg/config.pgsql
+fi
+
+if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
 	maas_db_pass=`pwgen`
-	. /usr/share/dbconfig-common/dpkg/config.pgsql
 	dbc_dbname="maasdb"
 	dbc_dbuser="maas"
 	dbc_dbpass="$maas_db_pass"

=== modified file 'debian/maas.install'
--- debian/maas.install	2012-03-14 23:29:38 +0000
+++ debian/maas.install	2012-03-15 19:43:24 +0000
@@ -10,8 +10,8 @@
 # Install Apache Config
 contrib/maas-http.conf etc/maas
 
-# Install MaaS local settings
-debian/tmp/usr/share/maas/maas_local_settings.py
+# Install MAAS local settings
+debian/tmp/etc/maas/maas_local_settings.py
 
 # Install WSGI
 contrib/wsgi.py usr/share/maas

=== modified file 'debian/maas.links'
--- debian/maas.links	2012-03-07 17:38:33 +0000
+++ debian/maas.links	2012-03-15 19:43:24 +0000
@@ -1,1 +1,1 @@
-usr/share/maas/maas_local_settings.py etc/maas/maas_local_settings.py
+etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py

=== modified file 'debian/maas.maas-pserv.upstart'
--- debian/maas.maas-pserv.upstart	2012-03-14 23:29:38 +0000
+++ debian/maas.maas-pserv.upstart	2012-03-15 19:43:24 +0000
@@ -1,8 +1,8 @@
-# maas - provisioning service
+# maas-pserv - provisioning service
 #
-# MaaS Provisioning Service
+# MAAS Provisioning Service
 
-description     "MaaS"
+description     "MAAS"
 author "Andres Rodriguez <[e-mail]>"
 
 start on filesystem and net-device-up
@@ -11,4 +11,4 @@
 respawn
 
 # To add options to your daemon, edit the line below:
-exec /usr/bin/twistd -n --pidfile=/run/maas-pserv.pid --logfile=/var/log/maas/maas-pserv.log maas-pserv --config-file=/etc/maas/pserv.yaml
+exec /usr/bin/twistd -n --pidfile=/run/maas-pserv.pid --logfile=/dev/null maas-pserv --config-file=/etc/maas/pserv.yaml

=== modified file 'debian/maas.maas-txlongpoll.upstart'
--- debian/maas.maas-txlongpoll.upstart	2012-03-14 23:29:38 +0000
+++ debian/maas.maas-txlongpoll.upstart	2012-03-15 19:43:24 +0000
@@ -1,8 +1,8 @@
 # maas - txlongpoll service
 #
-# MaaS Provisioning Service txlongpoll
+# MAAS Provisioning Service txlongpoll
 
-description     "MaaS"
+description     "MAAS txlongpoll"
 author "Andres Rodriguez <[e-mail]>"
 
 start on filesystem and net-device-up

=== modified file 'debian/maas.postinst'
--- debian/maas.postinst	2012-03-14 23:29:38 +0000
+++ debian/maas.postinst	2012-03-15 19:43:24 +0000
@@ -35,16 +35,16 @@
 	# Give appropriate permissions
 	if [ ! -f /var/log/maas/maas.log ]; then
 		touch /var/log/maas/maas.log
-		chown -R root:www-data /var/log/maas
-		chmod 620 /var/log/maas/maas.log
-		chmod -R 775 /var/log/maas/oops
 	fi
+	chown -R root:www-data /var/log/maas
+	chmod 620 /var/log/maas/maas.log
+	chmod -R 775 /var/log/maas/oops
 	
 	# Configure database
 	dbc_go maas $@
-	if grep -qs "^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$" /usr/share/maas/maas_local_settings.py; then
+	if grep -qs "^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$" /etc/maas/maas_local_settings.py; then
 		sed -i "s/^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$/        'PASSWORD': '"$dbc_dbpass"',/" \
-                       /usr/share/maas/maas_local_settings.py
+                       /etc/maas/maas_local_settings.py
 	fi
 	if $syncdb; then
 		maas syncdb --noinput

=== modified file 'debian/patches/01-fix-database-settings.patch'
--- debian/patches/01-fix-database-settings.patch	2012-03-14 23:29:38 +0000
+++ debian/patches/01-fix-database-settings.patch	2012-03-15 19:43:24 +0000
@@ -1,7 +1,7 @@
-Index: maas-0.1+bzr281+dfsg.orig/contrib/maas_local_settings_sample.py
+Index: maas-0.1+bzr291+dfsg.orig/contrib/maas_local_settings_sample.py
 ===================================================================
---- maas-0.1+bzr281+dfsg.orig.orig/contrib/maas_local_settings_sample.py	2012-03-14 14:29:12.145287076 -0400
-+++ maas-0.1+bzr281+dfsg.orig/contrib/maas_local_settings_sample.py	2012-03-14 14:29:16.421288467 -0400
+--- maas-0.1+bzr291+dfsg.orig.orig/contrib/maas_local_settings_sample.py	2012-03-15 14:07:36.830510908 -0400
++++ maas-0.1+bzr291+dfsg.orig/contrib/maas_local_settings_sample.py	2012-03-15 14:07:39.286510367 -0400
 @@ -7,7 +7,7 @@
  DEFAULT_MAAS_URL = "http://maas.internal.example.com/"
  
@@ -9,7 +9,7 @@
 -STATIC_ROOT = '/var/lib/maas/static/'
 +STATIC_ROOT = '/usr/share/maas/web/static/'
  
- # Prefix to use for MaaS's urls.
+ # Prefix to use for MAAS's urls.
  # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with
 @@ -56,9 +56,9 @@
      'default': {

=== removed directory 'debian/po'
=== removed file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	2012-03-09 22:55:04 +0000
+++ debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-[type: gettext/rfc822deb] maas.templates

=== removed file 'debian/po/templates.pot'
--- debian/po/templates.pot	2012-03-09 22:55:04 +0000
+++ debian/po/templates.pot	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: maas\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-03-09 12:50-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../maas.templates:1001
-msgid "Create administrator username for MaaS:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas.templates:1001
-msgid ""
-"MaaS requires to set an administrative user in order to be able to gain "
-"access to the MaaS management WebUI."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../maas.templates:2001
-msgid "Set password for the administrator username:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../maas.templates:2001
-msgid ""
-"It is highly recommendaed that you set a password for the administrative "
-"user that has just been created."
-msgstr ""

=== modified file 'debian/rules'
--- debian/rules	2012-03-14 23:29:38 +0000
+++ debian/rules	2012-03-15 19:43:24 +0000
@@ -11,9 +11,9 @@
 	dh_auto_install
 
 	# Copy the local config file
-	install -d -m 755  $(CURDIR)/debian/tmp/usr/share/maas
+	install -d -m 755  $(CURDIR)/debian/tmp/etc/maas
 	cp $(CURDIR)/contrib/maas_local_settings_sample.py \
-                $(CURDIR)/debian/tmp/usr/share/maas/maas_local_settings.py
+                $(CURDIR)/debian/tmp/etc/maas/maas_local_settings.py
 
 	# Move static files
 	install -d -m 755  $(CURDIR)/debian/tmp/usr/share/maas/web/static