Merge lp:~clint-fewbar/ubuntu/maverick/drupal6/lp370994-add-post-install-note into lp:ubuntu/maverick/drupal6

[Clint Byrum]

- Adds a high priority debconf note to remind users of the next steps to take.

[Stefano Rivera (stefanor)]

This merge is out of date. Do we have a plan to get it into Debian? (Has anyone reported it there)

review: Needs Fixing

[Stefano Rivera (stefanor)]

Marking this WIP to get it out the sponsorship queue.

[Clint Byrum (clint-fewbar)]

Hi Stefano,

Sorry for taking so long to respond.

I just merged 6.18-1 and pushed it into the branch. Changed status back to "Needs Review".

[Artur Rona (ari-tczew)]

Clint, could you check if your patch is good for older releases? If yes, I'm +1 for SRU it.

[Stefano Rivera (stefanor)]

I've never used debconf myself, but this looks reasonable. Let's slip it into Maverick.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-24 16:17:22 +0000
+++ debian/changelog	2010-10-05 01:24:47 +0000
@@ -1,3 +1,9 @@
+drupal6 (6.18-1ubuntu1~local0) maverick; urgency=low
+
+  * adding debconf note to guide user post install (LP: #370994)
+
+ -- Clint Byrum <[e-mail]>  Thu, 26 Aug 2010 03:46:21 -0700
+
 drupal6 (6.18-1) unstable; urgency=high
 
   [ Luigi Gangitano ]  

=== modified file 'debian/control'
--- debian/control	2010-08-24 16:17:22 +0000
+++ debian/control	2010-10-05 01:24:47 +0000
@@ -3,6 +3,7 @@
 Priority: extra
 Maintainer: Luigi Gangitano <[e-mail]>
 Build-Depends: debhelper (>= 7), dpatch
+ ,po-debconf
 Homepage: http://www.drupal.org/
 Standards-Version: 3.9.1.0
 Xs-Vcs-Svn: svn://alioth.debian.org/svn/pkg-drupal/branches/drupal6

=== modified file 'debian/drupal6.config' (properties changed: -x to +x)
--- debian/drupal6.config	2009-03-01 18:26:25 +0000
+++ debian/drupal6.config	2010-10-05 01:24:47 +0000
@@ -43,6 +43,9 @@
 
 OLDVERSION="$2"
 
+db_input high drupal6/post_install_guidance || true
+db_go || true
+
 db_stop
 
 exit 0

=== added file 'debian/drupal6.templates'
--- debian/drupal6.templates	1970-01-01 00:00:00 +0000
+++ debian/drupal6.templates	2010-10-05 01:24:47 +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.

=== added directory 'debian/po'
=== added file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ debian/po/POTFILES.in	2010-10-05 01:24:47 +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-05 01:24:47 +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 ""

=== modified file 'debian/rules'
--- debian/rules	2010-01-11 19:47:13 +0000
+++ debian/rules	2010-10-05 01:24:47 +0000
@@ -18,6 +18,7 @@
 	dh_clean
 
 clean:	clean-patched unpatch
+	debconf-updatepo
 
 install:build
 	dh_testdir