diff -pruN 6.22-1/debian/changelog 6.22-1ubuntu1/debian/changelog --- 6.22-1/debian/changelog 2011-06-20 18:07:24.000000000 +0100 +++ 6.22-1ubuntu1/debian/changelog 2011-06-20 17:59:52.000000000 +0100 @@ -1,3 +1,10 @@ +drupal6 (6.22-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - adding debconf note to guide user post install + + -- Angel Abad Mon, 20 Jun 2011 15:01:23 +0200 + drupal6 (6.22-1) unstable; urgency=low [ Luigi Gangitano ] @@ -12,6 +19,13 @@ drupal6 (6.22-1) unstable; urgency=low -- Luigi Gangitano Thu, 16 Jun 2011 15:55:08 +0200 +drupal6 (6.20-2ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining change: + - adding debconf note to guide user post install (LP: #370994) + + -- Bhavani Shankar Mon, 16 May 2011 18:44:28 +0530 + drupal6 (6.20-2) unstable; urgency=low * debian/patches/21-ssl-cache-control @@ -23,6 +37,13 @@ drupal6 (6.20-2) unstable; urgency=low -- Luigi Gangitano Mon, 16 May 2011 00:18:13 +0200 +drupal6 (6.20-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining change: + - adding debconf note to guide user post install (LP: #370994) + + -- Bhavani Shankar Sat, 19 Feb 2011 19:44:21 +0530 + drupal6 (6.20-1) unstable; urgency=low [ Luigi Gangitano ] @@ -37,6 +58,12 @@ drupal6 (6.20-1) unstable; urgency=low -- Luigi Gangitano Fri, 18 Feb 2011 20:00:12 +0100 +drupal6 (6.18-1ubuntu1) maverick; urgency=low + + * adding debconf note to guide user post install (LP: #370994) + + -- Clint Byrum Wed, 06 Oct 2010 13:03:22 +0200 + drupal6 (6.18-1) unstable; urgency=high [ Luigi Gangitano ] diff -pruN 6.22-1/debian/control 6.22-1ubuntu1/debian/control --- 6.22-1/debian/control 2011-06-20 18:07:24.000000000 +0100 +++ 6.22-1ubuntu1/debian/control 2011-06-20 17:59:52.000000000 +0100 @@ -1,8 +1,10 @@ Source: drupal6 Section: web Priority: extra -Maintainer: Luigi Gangitano +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Luigi Gangitano Build-Depends: debhelper (>= 7), dpatch + ,po-debconf Homepage: http://www.drupal.org/ Standards-Version: 3.9.2.0 Xs-Vcs-Svn: svn://alioth.debian.org/svn/pkg-drupal/branches/drupal6 diff -pruN 6.22-1/debian/drupal6.config 6.22-1ubuntu1/debian/drupal6.config --- 6.22-1/debian/drupal6.config 2011-06-20 18:07:24.000000000 +0100 +++ 6.22-1ubuntu1/debian/drupal6.config 2011-06-20 17:59:52.000000000 +0100 @@ -43,6 +43,9 @@ includefile="${configdir}/apache.conf" OLDVERSION="$2" +db_input high drupal6/post_install_guidance || true +db_go || true + db_stop exit 0 diff -pruN 6.22-1/debian/drupal6.templates 6.22-1ubuntu1/debian/drupal6.templates --- 6.22-1/debian/drupal6.templates 1970-01-01 01:00:00.000000000 +0100 +++ 6.22-1ubuntu1/debian/drupal6.templates 2011-06-20 17:59:52.000000000 +0100 @@ -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. diff -pruN 6.22-1/debian/po/POTFILES.in 6.22-1ubuntu1/debian/po/POTFILES.in --- 6.22-1/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100 +++ 6.22-1ubuntu1/debian/po/POTFILES.in 2011-06-20 17:59:52.000000000 +0100 @@ -0,0 +1 @@ +[type: gettext/rfc822deb] drupal6.templates diff -pruN 6.22-1/debian/po/templates.pot 6.22-1ubuntu1/debian/po/templates.pot --- 6.22-1/debian/po/templates.pot 1970-01-01 01:00:00.000000000 +0100 +++ 6.22-1ubuntu1/debian/po/templates.pot 2011-06-20 17:59:52.000000000 +0100 @@ -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 , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: drupal6@packages.debian.org\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 \n" +"Language-Team: LANGUAGE \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 "" diff -pruN 6.22-1/debian/rules 6.22-1ubuntu1/debian/rules --- 6.22-1/debian/rules 2011-06-20 18:07:24.000000000 +0100 +++ 6.22-1ubuntu1/debian/rules 2011-06-20 17:59:52.000000000 +0100 @@ -18,6 +18,7 @@ clean-patched: dh_clean clean: clean-patched unpatch + debconf-updatepo install:build dh_testdir