Merge lp:~ubuntu-branches/ubuntu/maverick/drupal6/maverick-201010070022 into lp:ubuntu/maverick/drupal6

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/drupal6 now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/drupal6/maverick-201010070022. A merge should be performed if necessary.

Unmerged revisions

18. By Stefano Rivera on 2010-10-06

adding debconf note to guide user post install (LP: #370994)

=== modified file 'debian/drupal6.config' (properties changed: -x to +x)
=== added file 'debian/drupal6.templates'
--- debian/drupal6.templates	1970-01-01 00:00:00 +0000
+++ debian/drupal6.templates	2010-10-08 17:54:44 +0000
@@ -0,0 +1,9 @@
+Template: drupal6/post_install_guidance
+Type: note
+_Description: Post-Install Instructions
+ Once Drupal is finished installing, you will still need to perform a few steps.
+ .
+   - Restart the webserver (i.e. restart apache2)
+   - Run installation script via URL http://host/drupal6/install.php
+ .
+ Be sure to read /usr/share/doc/drupal6/README.Debian for detailed instructions.

=== renamed file 'debian/drupal6.templates' => 'debian/drupal6.templates.moved'
=== added directory 'debian/po'
=== renamed directory 'debian/po' => 'debian/po.moved'
=== added file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ debian/po/POTFILES.in	2010-10-08 17:54:44 +0000
@@ -0,0 +1,1 @@
+[type: gettext/rfc822deb] drupal6.templates

=== added file 'debian/po/templates.pot'
--- debian/po/templates.pot	1970-01-01 00:00:00 +0000
+++ debian/po/templates.pot	2010-10-08 17:54:44 +0000
@@ -0,0 +1,48 @@
+# 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: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2010-08-26 05:36-0700\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: note
+#. Description
+#: ../drupal6.templates:1001
+msgid "Post-Install Instructions"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../drupal6.templates:1001
+msgid ""
+"Once Drupal is finished installing, you will still need to perform a few "
+"steps."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../drupal6.templates:1001
+msgid ""
+"  - Restart the webserver (i.e. restart apache2)\n"
+"  - Run installation script via URL http://host/drupal6/install.php"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../drupal6.templates:1001
+msgid ""
+"Be sure to read /usr/share/doc/drupal6/README.Debian for detailed "
+"instructions."
+msgstr ""