0.6.0-2 release

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644 (file)
index 0000000..6e084ce
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,11 @@
+suphp (0.6.0-1) unstable; urgency=low
+
+ * This new release introduce a runtime configuration file
+   (/etc/suphp/suphp.conf) and a new configuration option for apache/apache2.
+ * You must now add the following line in your apache/apache2 configuration to
+   make suphp active for php scripts:
+ 
+    suPHP_AddHandler x-httpd-php
+    
+ -- Emmanuel Lacour <elacour@home-dn.net>  Sun,  2 Oct 2005 11:09:21 +0200
+

diff --git a/debian/changelog b/debian/changelog
index 2fdbd58..4b671bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+suphp (0.6.0-2) unstable; urgency=low
+
+  * Added debian/po/fr.po (closes: #325213)
+  * Added debian/po/cs.po (closes: #325870, closes: #331221)
+  * Added debian/po/sv.po (closes: #330944, closes: #331264)
+  * debian/suphp-common.config: lower down priority from "critical" to
+    "medium"
+  * debian/suphp-common.templates: better description for upgrade0.6.0
+    (closes: #324635)
+  * Added debian/NEWS with informations on 0.6.0 configuration changes
+  * debian/control: use ${misc:Depends} instead of debconf (closes: #332107)
+
+ -- Emmanuel Lacour <elacour@home-dn.net>  Sun,  2 Oct 2005 11:09:21 +0200
+

 suphp (0.6.0-1) unstable; urgency=low
 
   * New upstream release (closes: #314471)
 suphp (0.6.0-1) unstable; urgency=low
 
   * New upstream release (closes: #314471)

diff --git a/debian/control b/debian/control
index 64c4e05..183fec4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.2
 
 Package: suphp-common
 Architecture: any
 
 Package: suphp-common
 Architecture: any

-Depends: ${shlibs:Depends}, php4-cgi | php5-cgi, libapache-mod-suphp (= ${Source-Version}) | libapache2-mod-suphp (= ${Source-Version}), debconf
+Depends: ${shlibs:Depends}, php4-cgi | php5-cgi, libapache-mod-suphp (= ${Source-Version}) | libapache2-mod-suphp (= ${Source-Version}), ${misc:Depends}

 Description: Common files for mod suphp
  Suphp consists of an Apache module (mod_suphp for either apache 1.3.x or
  apache 2.x) and a setuid root binary (suphp) that is called by the Apache
 Description: Common files for mod suphp
  Suphp consists of an Apache module (mod_suphp for either apache 1.3.x or
  apache 2.x) and a setuid root binary (suphp) that is called by the Apache

diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644 (file)
index 0000000..f080465
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,56 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: suphp\n"
+"Report-Msgid-Bugs-To: elacour@home-dn.net\n"
+"POT-Creation-Date: 2005-10-02 11:26+0200\n"
+"PO-Revision-Date: 2005-10-02 13:48+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid "A new directive (suPHP_AddHandler) is now required"
+msgstr "Vyžadována nová direktiva (suPHP_AddHandler)"
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid ""
+"This new release introduce a runtime configuration file (/etc/suphp/suphp."
+"conf) and a new configuration option for apache/apache2."
+msgstr ""
+"Tato verze nově obsahuje konfigurační soubor /etc/suphp/suphp.conf a nové "
+"nastavení pro apache/apache2."
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid ""
+"You must now add the following line in your apache/apache2 configuration to "
+"make suphp active for php scripts:"
+msgstr ""
+"Aby bylo suphp v php skriptech aktivní, musíte do svého nastavení apache/"
+"apache2 přidat následující řádek:"
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid "   suPHP_AddHandler x-httpd-php"
+msgstr "   suPHP_AddHandler x-httpd-php"

diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644 (file)
index 0000000..3ba674d
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,62 @@
+# translation of fr.po to French
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Sylvain Archenault <sylvain.archenault@laposte.net>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: suphp_0.6.0-1\n"
+"Report-Msgid-Bugs-To: elacour@home-dn.net\n"
+"POT-Creation-Date: 2005-10-02 11:26+0200\n"
+"PO-Revision-Date: 2005-10-03 15:39+0200\n"
+"Last-Translator: Sylvain Archenault <sylvain.archenault@laposte.net>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid "A new directive (suPHP_AddHandler) is now required"
+msgstr "Nouvelle directive (suPHP_AddHandler) requise"
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid ""
+"This new release introduce a runtime configuration file (/etc/suphp/suphp."
+"conf) and a new configuration option for apache/apache2."
+msgstr ""
+"Cette nouvelle version introduit un nouveau fichier de configuration (/etc/"
+"suphp/suphp.conf) et une nouvelle option de configuration pour Apache ou "
+"Apache2."
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid ""
+"You must now add the following line in your apache/apache2 configuration to "
+"make suphp active for php scripts:"
+msgstr ""
+"Vous devez maintenant ajouter la ligne suivante dans votre fichier de "
+"configuration d'Apache ou d'Apache2 afin que suphp soit actif pour les "
+"scripts php :"
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid "   suPHP_AddHandler x-httpd-php"
+msgstr "   suPHP_AddHandler x-httpd-php"
+
+#~ msgid "suPHP_AddHandler"
+#~ msgstr "Gestion de suPHP_AddHandler"

diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644 (file)
index 0000000..c70e618
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,51 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: suphp 0.6.0-1\n"
+"Report-Msgid-Bugs-To: elacour@home-dn.net\n"
+"POT-Creation-Date: 2005-10-02 11:26+0200\n"
+"PO-Revision-Date: 2005-10-02 20:06+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid "A new directive (suPHP_AddHandler) is now required"
+msgstr "Ett nytt direktiv (suPHP_AddHandler) är numera nödvändig"
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid "This new release introduce a runtime configuration file (/etc/suphp/suphp.conf) and a new configuration option for apache/apache2."
+msgstr "Denna nya utgåva introducerar en konfigurationsfil (/etc/suphp/suphp.conf) och en ny konfigurationsinställning för apache/apache2."
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid "You must now add the following line in your apache/apache2 configuration to make suphp active for php scripts:"
+msgstr "Du måste nu lägga till följande rad i din apache/apache2-konfiguration för att göra suphp aktiv för php-skript."
+
+#. Type: note
+#. Description
+#: ../suphp-common.templates:3
+msgid "   suPHP_AddHandler x-httpd-php"
+msgstr "   suPHP_AddHandler x-httpd-php"
+
+#~ msgid "suPHP_AddHandler"
+#~ msgstr "suPHP_AddHandler"
+

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index f82f5d7..46bad73 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,22 +1,14 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
+# 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"
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-23 13:13+0200\n"
+"Report-Msgid-Bugs-To: elacour@home-dn.net\n"
+"POT-Creation-Date: 2005-10-02 11:26+0200\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -27,7 +19,7 @@ msgstr ""
 #. Type: note
 #. Description
 #: ../suphp-common.templates:3
 #. Type: note
 #. Description
 #: ../suphp-common.templates:3

-msgid "suPHP_AddHandler"
+msgid "A new directive (suPHP_AddHandler) is now required"

 msgstr ""
 
 #. Type: note
 msgstr ""
 
 #. Type: note

diff --git a/debian/suphp-common.config b/debian/suphp-common.config
index 0207939..813f331 100644 (file)
--- a/debian/suphp-common.config
+++ b/debian/suphp-common.config
@@ -10,6 +10,6 @@ set -e
 if [ -n "$2" ] &&
        dpkg --compare-versions "$2" lt 0.6.0-1
 then
 if [ -n "$2" ] &&
        dpkg --compare-versions "$2" lt 0.6.0-1
 then

-       db_input critical suphp-common/upgrade0.6.0 || true
+       db_input medium suphp-common/upgrade0.6.0 || true

        db_go || true
 fi
        db_go || true
 fi

diff --git a/debian/suphp-common.copyright b/debian/suphp-common.copyright
index 2ffac7c..31da302 100644 (file)
--- a/debian/suphp-common.copyright
+++ b/debian/suphp-common.copyright
@@ -19,8 +19,8 @@ License:
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 

-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc., 51
+    Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.

 
 see /usr/share/common-licenses/GPL for all details.
 
 see /usr/share/common-licenses/GPL for all details.

diff --git a/debian/suphp-common.templates b/debian/suphp-common.templates
index 36f8655..e0e0c69 100644 (file)
--- a/debian/suphp-common.templates
+++ b/debian/suphp-common.templates
@@ -1,6 +1,6 @@
 Template: suphp-common/upgrade0.6.0
 Type: note
 Template: suphp-common/upgrade0.6.0
 Type: note

-_Description: suPHP_AddHandler
+_Description: A new directive (suPHP_AddHandler) is now required

  This new release introduce a runtime configuration file (/etc/suphp/suphp.conf) and
  a new configuration option for apache/apache2.
  .
  This new release introduce a runtime configuration file (/etc/suphp/suphp.conf) and
  a new configuration option for apache/apache2.
  .