[DebianGIS-dev] r1259 - in packages/mapserver/trunk/debian: . patches po

kobold at alioth.debian.org kobold at alioth.debian.org
Thu Nov 8 14:19:55 UTC 2007


Author: kobold
Date: 2007-11-08 14:19:54 +0000 (Thu, 08 Nov 2007)
New Revision: 1259

Removed:
   packages/mapserver/trunk/debian/patches/20_php_build.dpatch
Modified:
   packages/mapserver/trunk/debian/changelog
   packages/mapserver/trunk/debian/patches/00list
   packages/mapserver/trunk/debian/php5-mapscript.postinst
   packages/mapserver/trunk/debian/po/fr.po
   packages/mapserver/trunk/debian/po/gl.po
   packages/mapserver/trunk/debian/po/templates.pot
Log:
New release.


Modified: packages/mapserver/trunk/debian/changelog
===================================================================
--- packages/mapserver/trunk/debian/changelog	2007-11-07 10:48:52 UTC (rev 1258)
+++ packages/mapserver/trunk/debian/changelog	2007-11-08 14:19:54 UTC (rev 1259)
@@ -1,3 +1,12 @@
+mapserver (5.0.0-3) unstable; urgency=low
+
+  * debian/php5-mapscript.postinst: fixed a typo. (Closes: #446985)
+  * debian/patches/20_php_build.dpatch: removed. (Closes: #447814)
+  * debian/po/gl.po: added. (Closes: #447939)
+  * debian/po/fr.po: added. (Closes: #448821)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Thu, 08 Nov 2007 15:13:37 +0100
+
 mapserver (5.0.0-2) unstable; urgency=low
 
   * debian/rules, debian/controls: new patch for the ruby bindings, which

Modified: packages/mapserver/trunk/debian/patches/00list
===================================================================
--- packages/mapserver/trunk/debian/patches/00list	2007-11-07 10:48:52 UTC (rev 1258)
+++ packages/mapserver/trunk/debian/patches/00list	2007-11-08 14:19:54 UTC (rev 1259)
@@ -1,4 +1,3 @@
-20_php_build
 50_clean
 70_ptrreturn
 80_gdal_lib

Deleted: packages/mapserver/trunk/debian/patches/20_php_build.dpatch
===================================================================
--- packages/mapserver/trunk/debian/patches/20_php_build.dpatch	2007-11-07 10:48:52 UTC (rev 1258)
+++ packages/mapserver/trunk/debian/patches/20_php_build.dpatch	2007-11-08 14:19:54 UTC (rev 1259)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_php_build.dpatch by Thomas Sondag <thomas at microdop.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix PHP build?
-
- at DPATCH@
-diff -urNad mapserver.orig/mapscript/php3/php_mapscript.c mapserver/mapscript/php3/php_mapscript.c
---- mapserver.orig/mapscript/php3/php_mapscript.c	2005-07-29 19:28:04.757404710 +0200
-+++ mapserver/mapscript/php3/php_mapscript.c	2005-07-29 19:31:00.332457547 +0200
-@@ -1735,7 +1735,18 @@
-     char        szPath[MS_MAXPATHLEN], szFname[MS_MAXPATHLEN];
-     char        szNewPath[MS_MAXPATHLEN];
- #endif
--
-+	
-+    if (sapi_module.name && ((strcmp(sapi_module.name, "cgi") == 0) ||
-+        (strcmp(sapi_module.name, "cgi-fcgi") == 0) ||
-+      (strcmp(sapi_module.name, "cli") == 0)))
-+    {
-+         php3_error(E_ERROR,  
-+		"This build of mapscript can't be load as a '%s' module for "
-+		"stability reason, but only with php as an apache DSO.\n",
-+	  sapi_module.name);
-+	  RETURN_FALSE;
-+    }
-+    
-     nArgs = ARG_COUNT(ht);
-     if ((nArgs != 1 && nArgs != 2) ||
-         getParameters(ht, nArgs, &pFname, &pNewPath) != SUCCESS)

Modified: packages/mapserver/trunk/debian/php5-mapscript.postinst
===================================================================
--- packages/mapserver/trunk/debian/php5-mapscript.postinst	2007-11-07 10:48:52 UTC (rev 1258)
+++ packages/mapserver/trunk/debian/php5-mapscript.postinst	2007-11-08 14:19:54 UTC (rev 1259)
@@ -15,7 +15,7 @@
 
 for SAPI in apache apache2
 do
-	if [ -f /etc/$phpver/$SAPI/php.ini ] && [ -e /etc/$phpver/$SAPI/conf.d]; then
+	if [ -f /etc/$phpver/$SAPI/php.ini ] && [ -e /etc/$phpver/$SAPI/conf.d ]; then
 		db_get $phpver/extension_mapscript_$SAPI
 		if [ "$RET" = "true" ] && ! -f /etc/$phpver/$SAPI/conf.d/mapscript.ini
 		then

Modified: packages/mapserver/trunk/debian/po/fr.po
===================================================================
--- packages/mapserver/trunk/debian/po/fr.po	2007-11-07 10:48:52 UTC (rev 1258)
+++ packages/mapserver/trunk/debian/po/fr.po	2007-11-08 14:19:54 UTC (rev 1259)
@@ -1,60 +1,55 @@
-#
-#    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.
-#
+# Translation of mapserver debconf templates to French
+# Copyright (C) 2007 Steve Petruzzello <dlist at bluewin.ch>
+# This file is distributed under the same license as the mapserver package
 msgid ""
 msgstr ""
-"Project-Id-Version: mapserver_4.8.4-1\n"
+"Project-Id-Version: mapserver_5.0.0-2\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-07-23 07:41+0200\n"
-"PO-Revision-Date: 2007-07-27 17:16+0100\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
+"PO-Revision-Date: 2007-10-19 09:42+0100\n"
 "Last-Translator: Steve Petruzzello <dlist at bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: SWITZERLAND\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
-msgid "Should ${extname} support be added for ${sapiconfig}?"
-msgstr "Faut-il ajouter la gestion de ${extname} à ${sapiconfig} ?"
+#: ../php5-mapscript.templates:1001
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
+msgstr ""
+"Faut-il ajouter ${extname} au fichier /etc/php5/${sapiconfig}/php.ini ?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
+#: ../php5-mapscript.templates:1001
 msgid ""
-"You are installing ${extname} support for PHP5, but it is not yet enabled "
-"in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow PHP5 "
-"scripts to use it."
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
 msgstr ""
 "Vous êtes en train d'installer la gestion de ${extname} pour PHP5, mais elle "
-"n'est pas encore activée dans /etc/php5/${sapiconfig}/php.ini. L'activation "
-"de cette extension permettra aux scripts PHP5 de l'utiliser."
+"n'est pas encore activée dans la configuration de la SAPI ${sapiconfig}. "
+"L'activation de cette extension permettra aux scripts PHP5 de l'utiliser."
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
-msgid "Should ${extname} support be removed for ${sapiconfig}?"
-msgstr "Faut-il supprimer la gestion de ${extname} pour ${sapiconfig} ?"
+#: ../php5-mapscript.templates:2001
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
+msgstr ""
+"Faut-il supprimer ${extname} du fichier /etc/php5/${sapiconfig}/php.ini ?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
+#: ../php5-mapscript.templates:2001
 msgid ""
-"You are removing ${extname} support for PHP5, but it is still enabled in /"
-"etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
-"problems when trying to use PHP."
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
 msgstr ""
 "Vous êtes en train de supprimer la gestion de ${extname} pour PHP5, mais "
-"elle est encore activée dans /etc/php5/${sapiconfig}/php.ini, ce qui "
-"pourrait poser des problèmes lors de l'utilisation de PHP."
+"elle est encore activée dans la configuration de la SAPI ${sapiconfig}, ce "
+"qui pourrait poser des problèmes lors de l'utilisation de PHP."

Modified: packages/mapserver/trunk/debian/po/gl.po
===================================================================
--- packages/mapserver/trunk/debian/po/gl.po	2007-11-07 10:48:52 UTC (rev 1258)
+++ packages/mapserver/trunk/debian/po/gl.po	2007-11-08 14:19:54 UTC (rev 1259)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: mapserver\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-07-23 07:41+0200\n"
-"PO-Revision-Date: 2007-07-23 08:52+0100\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
+"PO-Revision-Date: 2007-10-24 22:23+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
 "MIME-Version: 1.0\n"
@@ -16,36 +16,36 @@
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
-msgid "Should ${extname} support be added for ${sapiconfig}?"
-msgstr "¿Debe engadirse o soporte de ${extname} a ${sapiconfig}?"
+#: ../php5-mapscript.templates:1001
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
+msgstr "¿Debe engadirse ${extname} a /etc/php5/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
+#: ../php5-mapscript.templates:1001
 msgid ""
-"You are installing ${extname} support for PHP5, but it is not yet enabled "
-"in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow PHP5 "
-"scripts to use it."
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
 msgstr ""
-"Está a instalar o soporte de ${extname} para PHP5, pero aínda non está "
-"activado en /etc/php5/${sapiconfig}/php.ini. Activar esta extensión ha "
-"permitir que os scripts PHP5 a empreguen."
+"Está a instalar o soporte de ${extname} para php5, pero aínda non está "
+"activado na configuración da SAPI ${sapiconfig}. Activar esta extensión ha "
+"permitir que os scripts php5 a empreguen."
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
-msgid "Should ${extname} support be removed for ${sapiconfig}?"
-msgstr "¿Debe eliminarse o soporte de ${extname} de ${sapiconfig}?"
+#: ../php5-mapscript.templates:2001
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
+msgstr "¿Debe eliminarse ${extname} de /etc/php5/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
+#: ../php5-mapscript.templates:2001
 msgid ""
-"You are removing ${extname} support for PHP5, but it is still enabled in /"
-"etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
-"problems when trying to use PHP."
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
 msgstr ""
-"Está a eliminar o soporte de ${extname} para PHP5, pero aínda está activado "
-"en /etc/php5/${sapiconfig}/php.ini. Deixalo activado seguramente vaia causar "
-"problemas se tenta empregar PHP."
+"Está a eliminar o soporte de ${extname} para php5, pero aínda está activado "
+"na configuración da SAPI ${sapiconfig}. Deixalo activado seguramente vaia "
+"causar problemas se tenta empregar PHP."

Modified: packages/mapserver/trunk/debian/po/templates.pot
===================================================================
--- packages/mapserver/trunk/debian/po/templates.pot	2007-11-07 10:48:52 UTC (rev 1258)
+++ packages/mapserver/trunk/debian/po/templates.pot	2007-11-08 14:19:54 UTC (rev 1259)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-07-23 07:41+0200\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,30 +18,30 @@
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
-msgid "Should ${extname} support be added for ${sapiconfig}?"
+#: ../php5-mapscript.templates:1001
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
+#: ../php5-mapscript.templates:1001
 msgid ""
-"You are installing ${extname} support for PHP5, but it is not yet enabled "
-"in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow PHP5 "
-"scripts to use it."
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
-msgid "Should ${extname} support be removed for ${sapiconfig}?"
+#: ../php5-mapscript.templates:2001
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
+#: ../php5-mapscript.templates:2001
 msgid ""
-"You are removing ${extname} support for PHP5, but it is still enabled in /"
-"etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
-"problems when trying to use PHP."
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
 msgstr ""




More information about the Pkg-grass-devel mailing list