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

[frankie at alioth.debian.org]

Author: frankie
Date: 2007-06-15 14:09:47 +0000 (Fri, 15 Jun 2007)
New Revision: 876

Removed:
   packages/mapserver/trunk/debian/control.etch
   packages/mapserver/trunk/debian/patches/60_php_drop.dpatch
   packages/mapserver/trunk/debian/php4-mapscript.config
   packages/mapserver/trunk/debian/php4-mapscript.docs
   packages/mapserver/trunk/debian/php4-mapscript.examples
   packages/mapserver/trunk/debian/php4-mapscript.files
   packages/mapserver/trunk/debian/php4-mapscript.postinst
   packages/mapserver/trunk/debian/php4-mapscript.prerm
   packages/mapserver/trunk/debian/php4-mapscript.templates
Modified:
   packages/mapserver/trunk/debian/README.etch
   packages/mapserver/trunk/debian/po/POTFILES.in
   packages/mapserver/trunk/debian/po/cs.po
   packages/mapserver/trunk/debian/po/de.po
   packages/mapserver/trunk/debian/po/fr.po
   packages/mapserver/trunk/debian/po/ja.po
   packages/mapserver/trunk/debian/po/nb.po
   packages/mapserver/trunk/debian/po/nl.po
   packages/mapserver/trunk/debian/po/pt.po
   packages/mapserver/trunk/debian/po/sv.po
   packages/mapserver/trunk/debian/po/templates.pot
   packages/mapserver/trunk/debian/po/vi.po
   packages/mapserver/trunk/debian/rules
Log:
Cleaning sid tree, after etch branching. 


Modified: packages/mapserver/trunk/debian/README.etch
===================================================================
--- packages/mapserver/trunk/debian/README.etch	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/README.etch	2007-06-15 14:09:47 UTC (rev 876)
@@ -1,7 +1,8 @@
 Note for packagers
 ------------------
 
-Please, maintain compatibility with Etch to allow easy backporting until possible.
-The control.etch files should be updated for backports and used instead of the
-plain control file. All PHP4 stuff is still present for the same reason.
+Starting from >=4.10.2-1 a separate tree is maintained for Etch compatibility in order to develop
+both a clean sid tree and a backporting tree.
+In practice, the etch tree retains PHP4 compatibility, which is instead dropped in lenny, 
+due to PHP4 removal.
 

Deleted: packages/mapserver/trunk/debian/control.etch
===================================================================
--- packages/mapserver/trunk/debian/control.etch	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/control.etch	2007-06-15 14:09:47 UTC (rev 876)
@@ -1,113 +0,0 @@
-Source: mapserver
-Section: devel
-Priority: extra
-Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Thomas Sondag <thomas at microdop.org>, Schuyler Erle <schuyler at nocat.net>, Petter Reinholdtsen <pere at debian.org>, Paul Wise <pabs at debian.org>, Fabio Tranchitella <kobold at debian.org>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.37.2), dpatch, libcurl3-gnutls-dev | libcurl3-dev, libpng12-dev,
- zlib1g-dev (>= 1.1.4), libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9),
- libjpeg62-dev, libgdal1-dev (>=1.4.0), proj, libwww-dev, libpq-dev, php4-dev, php5-dev, swig,
- python-all, python-all-dev, python-central (>= 0.5), libgeos-dev (>= 2.2.3-2)
-Build-Depends-Indep: python-docutils
-Build-Conflicts: libcurl3-openssl-dev
-XS-Python-Version: all
-
-Package: php4-mapscript
-Section: web
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: mapserver-bin, mapserver-doc
-Replaces: php-mapscript
-Conflicts: php-mapscript
-Description: module for php4-cgi to use mapserver
- PHP MapScript allows you to use the mapserver functionalities with PHP web
- scripting language.
- .
- Currently work only with PHP as an Apache DSO.
-
-Package: php5-mapscript
-Section: web
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: mapserver-bin, mapserver-doc
-Description: module for php5-cgi to use mapserver
- PHP MapScript allows you to use the MapServer functionalities with php web
- scripting language.
- .
- Currently work only with php as an Apache DSO.
-
-Package: perl-mapscript
-Section: perl
-Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}
-Suggests: mapserver-bin, mapserver-doc
-Description: perl mapserver library
- perl mapscript allows you to use the MapServer functionalities
- with perl scripting language.
-
-Package: cgi-mapserver
-Section: web
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: mapserver-bin, mapserver-doc
-Description: cgi module of mapserver
- This package contains the cgi binary file. It provides the MapServer
- template language as well as WFS, WMS and WCS server and client
- capabilities.
-
-Package: python-mapscript
-Section: python
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
-Suggests: mapserver-bin, mapserver-doc
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: python mapserver lib
- Python mapscript allows you to use the MapServer functionalities
- with the Python scripting language.
-
-Package: mapserver-bin
-Section: misc
-Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}
-Suggests: libdbi-perl, perl-mapscript, python-mapscript, php4-mapscript, cgi-mapserver, mapserver-doc
-Description: mapserver binary utilities
- Binary utilities for using MapServer with the command line.
- .
- MapServer is an OpenSource development environment for building spatially
- enabled Internet applications.
- .
- The MapServer system includes MapScript that allows popular
- scripting languages such as :
- .
-   * PHP provided by php4-mapscript.
-   * Python provided by python-mapscript.
-   * Perl provided by perl-mapscript.
-   * Java is not supported by any package.
- .
- Mapserver template language, WFS, WMS, WCS are provided by cgi-mapserver.
- .
-  Homepage: http://mapserver.gis.umn.edu
-
-Package: mapserver-doc
-Section: doc
-Architecture: all
-Depends: ${shlibs:Depends}
-Suggests: perl-mapscript, python-mapscript, php4-mapscript, cgi-mapserver
-Description: documentation for mapserver
- Some short documentation and examples for MapServer.
- .
- MapServer is an OpenSource development environment for building spatially
- enabled Internet applications.
- .
- The MapServer system includes MapScript that allows using popular
- scripting languages such as :
- .
-   * PHP provided by php4-mapscript.
-   * Python provided by python-mapscript.
-   * Perl provided by perl-mapscript.
-   * Java is not supported by any package.
- .
- Mapserver template language, WFS, WMS, WCS are provided by cgi-mapserver.
- .
-  Homepage: http://mapserver.gis.umn.edu/docs

Deleted: packages/mapserver/trunk/debian/patches/60_php_drop.dpatch
===================================================================
--- packages/mapserver/trunk/debian/patches/60_php_drop.dpatch	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/patches/60_php_drop.dpatch	2007-06-15 14:09:47 UTC (rev 876)
@@ -1,84 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_php_drop.dpatch by Petter Reinholdtsen <pere at hungry.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to drop PHP support in the package.  Kept here to
-## DP: document how the package was changed to drop php mapscript
-## DP: support.
-
- at DPATCH@
-Index: mapserver/debian/control
-===================================================================
-RCS file: /cvsroot/pkg-grass/mapserver/debian/control,v
-retrieving revision 1.3
-diff -u -u -r1.3 control
---- mapserver/debian/control	18 Feb 2005 19:25:23 -0000	1.3
-+++ mapserver/debian/control	19 Mar 2005 21:06:19 -0000
-@@ -3,19 +3,7 @@
- Priority: optional
- Maintainer: Thomas Sondag <thomas at microdop.org> 
- Standards-Version: 3.6.4
--Build-Depends: debhelper, dpatch, libcurl3-dev, libpng12-dev, zlib1g-dev (>= 1.1.4), libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>=2.0.9), libjpeg62-dev, libgdal1-dev, proj, libwww-dev, postgresql-dev (>= 7.3.3-1), php4-dev, swig, python-dev
-+Build-Depends: debhelper, dpatch, libcurl3-dev, libpng12-dev, zlib1g-dev (>= 1.1.4), libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>=2.0.9), libjpeg62-dev, libgdal1-dev, proj, libwww-dev, postgresql-dev (>= 7.3.3-1), swig, python-dev
--
--Package: php4-mapscript
--Architecture: any
--Depends: ${shlibs:Depends}, libapache-mod-php4, debconf
--Suggests: mapserver-bin, mapserver-doc
--Replaces: php-mapscript
--Conflicts: php-mapscript
--Description: module for php4-cgi to use mapserver
-- php mapscript allows you to use the mapserver functionalities with php web
-- scripting language. 
-- .
-- Curently work only with php as an Apache DSO.
- 
- Package: perl-mapscript
- Architecture: any 
-@@ -45,7 +33,7 @@
- Package: mapserver-bin 
- Architecture: any
- Depends: ${shlibs:Depends}, ${perl:Depends}
--Suggests: perl-mapscript, python-mapscript, php4-mapscript, cgi-mapserver, mapserver-doc
-+Suggests: perl-mapscript, python-mapscript, cgi-mapserver, mapserver-doc
- Description: mapserver binary utilitys
-  binary utilitys for using mapserver with the command line.
-  .
-@@ -66,7 +54,7 @@
- Package: mapserver-doc 
- Architecture: any
- Depends: ${shlibs:Depends}
--Suggests: perl-mapscript, python-mapscript, php4-mapscript, cgi-mapserver, mapserver-doc
-+Suggests: perl-mapscript, python-mapscript, cgi-mapserver, mapserver-doc
- Description: documentation for mapserver  
-  some short Documentation and examples for mapserver.
-  .
-Index: mapserver/debian/dirs
-===================================================================
-RCS file: /cvsroot/pkg-grass/mapserver/debian/dirs,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 dirs
---- mapserver/debian/dirs	23 Jan 2005 18:15:39 -0000	1.1.1.1
-+++ mapserver/debian/dirs	19 Mar 2005 21:06:19 -0000
-@@ -1,5 +1,3 @@
- usr/bin
- usr/lib
--usr/lib/php4/20020429/
--usr/lib/perl/5.6.1/auto/mapscript
- usr/include
-Index: mapserver/debian/rules
-===================================================================
-RCS file: /cvsroot/pkg-grass/mapserver/debian/rules,v
-retrieving revision 1.6
-diff -u -u -r1.6 rules
---- mapserver/debian/rules	19 Mar 2005 21:04:57 -0000	1.6
-+++ mapserver/debian/rules	19 Mar 2005 21:06:19 -0000
-@@ -113,7 +113,7 @@
- 	-$(MAKE) distclean
- 
- 
--install: install-stamp install-php-stamp
-+install: install-stamp # install-php-stamp
- install-stamp: build-stamp
- 	dh_testdir
- 	dh_testroot

Deleted: packages/mapserver/trunk/debian/php4-mapscript.config
===================================================================
--- packages/mapserver/trunk/debian/php4-mapscript.config	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/php4-mapscript.config	2007-06-15 14:09:47 UTC (rev 876)
@@ -1,34 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-db_title "PHP"
-
-phpver=php4
-
-for SAPI in apache apache2
-do
-	# Skip this loop if the config file isn't there (yet).
-	if [ -f "/etc/$phpver/$SAPI/php.ini" ]; then
-		db_register $phpver-mapscript/add_extension $phpver/extension_mapscript_$SAPI
-
-		# FIXME: this is the wrong answer if the SAPI package was
-		# installed after the module was.
-		if [ -n "$2" ] && dpkg --compare-versions "$2" ge 4:4.3.2+rc3-2
-		then
-			if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*php_mapscript.so" "/etc/$phpver/$SAPI/php.ini"
-			then
-				db_set $phpver/extension_mapscript_$SAPI true
-			else
-				db_set $phpver/extension_mapscript_$SAPI false
-			fi
-		fi
-
-		db_subst $phpver/extension_mapscript_$SAPI extname Mapscript 
-		db_subst $phpver/extension_mapscript_$SAPI sapiconfig $SAPI
-		db_input low $phpver/extension_mapscript_$SAPI || true
-	fi
-done
-
-db_go

Deleted: packages/mapserver/trunk/debian/php4-mapscript.docs
===================================================================
--- packages/mapserver/trunk/debian/php4-mapscript.docs	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/php4-mapscript.docs	2007-06-15 14:09:47 UTC (rev 876)
@@ -1 +0,0 @@
-mapscript/php3/README

Deleted: packages/mapserver/trunk/debian/php4-mapscript.examples
===================================================================
--- packages/mapserver/trunk/debian/php4-mapscript.examples	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/php4-mapscript.examples	2007-06-15 14:09:47 UTC (rev 876)
@@ -1 +0,0 @@
-mapscript/php3/examples/*

Deleted: packages/mapserver/trunk/debian/php4-mapscript.files
===================================================================
--- packages/mapserver/trunk/debian/php4-mapscript.files	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/php4-mapscript.files	2007-06-15 14:09:47 UTC (rev 876)
@@ -1 +0,0 @@
-usr/lib/php4/*

Deleted: packages/mapserver/trunk/debian/php4-mapscript.postinst
===================================================================
--- packages/mapserver/trunk/debian/php4-mapscript.postinst	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/php4-mapscript.postinst	2007-06-15 14:09:47 UTC (rev 876)
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-if [ "$1" != "configure" ]; then
-	exit 0
-fi
-
-phpver=php4
-
-for SAPI in apache apache2
-do
-	if [ -f /etc/$phpver/$SAPI/php.ini ]; then
-		db_get $phpver/extension_mapscript_$SAPI
-		if [ "$RET" = "true" ] \
-		   && ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*php_mapscript.so" /etc/$phpver/$SAPI/php.ini
-		then
-			echo "extension=php_mapscript.so" >> /etc/$phpver/$SAPI/php.ini
-		fi
-	fi
-done
-
-exit 0

Deleted: packages/mapserver/trunk/debian/php4-mapscript.prerm
===================================================================
--- packages/mapserver/trunk/debian/php4-mapscript.prerm	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/php4-mapscript.prerm	2007-06-15 14:09:47 UTC (rev 876)
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" != "remove" ] && [ "$1" != "purge" ]; then
-	exit 0
-fi
-
-EXTENSIONRE="^[[:space:]]*extension[[:space:]]*=[[:space:]]*php_mapscript.so"
-
-. /usr/share/debconf/confmodule
-
-phpver=php4
-
-for SAPI in `find /etc/$phpver/ -type d -maxdepth 1 -mindepth 1 | sed -e's#.*/##'`
-do
-	# Use the same question for all extensions, because it's only
-	# used once per package: right here.
-	if [ -f "/etc/$phpver/$SAPI/php.ini" ] \
-	   && grep -q "$EXTENSIONRE" /etc/$phpver/$SAPI/php.ini
-	then
-		db_set $phpver-mapscript/remove_extension true
-		db_title "PHP"
-		db_subst $phpver-mapscript/remove_extension extname Mapscript
-		db_subst $phpver-mapscript/remove_extension sapiconfig $SAPI
-		db_input low $phpver-mapscript/remove_extension || true
-		db_go
-
-		db_get $phpver-mapscript/remove_extension
-		if [ "$RET" = "true" ]; then
-			grep -v "$EXTENSIONRE" < /etc/$phpver/$SAPI/php.ini \
-				> /etc/$phpver/$SAPI/php.ini.mapscriptremove
-			chmod --reference=/etc/$phpver/$SAPI/php.ini \
-				/etc/$phpver/$SAPI/php.ini.mapscriptremove
-			mv /etc/$phpver/$SAPI/php.ini.mapscriptremove \
-				/etc/$phpver/$SAPI/php.ini
-		fi
-		db_fset $phpver-mapscript/remove_extension seen false
-	fi
-done
-
-exit 0

Deleted: packages/mapserver/trunk/debian/php4-mapscript.templates
===================================================================
--- packages/mapserver/trunk/debian/php4-mapscript.templates	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/php4-mapscript.templates	2007-06-15 14:09:47 UTC (rev 876)
@@ -1,15 +0,0 @@
-Template: php4-mapscript/add_extension
-Type: boolean
-Default: true
-_Description: Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?
- You are installing ${extname} support for php4 and it is not yet
- enabled in the configuration for the ${sapiconfig} SAPI. Enabling
- this extension will allow php4 scripts to use it.
-
-Template: php4-mapscript/remove_extension
-Type: boolean
-Default: true
-_Description: Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?
- You are removing ${extname} support for php4, 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.

Modified: packages/mapserver/trunk/debian/po/POTFILES.in
===================================================================
--- packages/mapserver/trunk/debian/po/POTFILES.in	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/POTFILES.in	2007-06-15 14:09:47 UTC (rev 876)
@@ -1 +1 @@
-[type: gettext/rfc822deb] php4-mapscript.templates
+[type: gettext/rfc822deb] php5-mapscript.templates

Modified: packages/mapserver/trunk/debian/po/cs.po
===================================================================
--- packages/mapserver/trunk/debian/po/cs.po	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/cs.po	2007-06-15 14:09:47 UTC (rev 876)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mapserver\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-08-21 09:44+0800\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2006-09-24 18:26+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -25,33 +25,37 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Má se ${extname} přidat do /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
+#: ../php5-mapscript.templates:1001
+#, fuzzy
 msgid ""
-"You are installing ${extname} support for php4 and it is not yet enabled in "
+"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 php4 scripts to use it."
+"allow php5 scripts to use it."
 msgstr ""
 "Instalujete podporu ${extname} pro php4, která ještě není povolena v "
-"konfiguraci pro ${sapiconfig} SAPI. Pokud toto rozšíření povolíte, budete "
-"je moci využívat v php4 skriptech."
+"konfiguraci pro ${sapiconfig} SAPI. Pokud toto rozšíření povolíte, budete je "
+"moci využívat v php4 skriptech."
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Má se ${extname} odstranit z /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
+#: ../php5-mapscript.templates:2001
+#, fuzzy
 msgid ""
-"You are removing ${extname} support for php4, but it is still enabled in the "
+"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 ""

Modified: packages/mapserver/trunk/debian/po/de.po
===================================================================
--- packages/mapserver/trunk/debian/po/de.po	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/de.po	2007-06-15 14:09:47 UTC (rev 876)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mapserver 4.10.0-4\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-08-21 09:44+0800\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2007-01-05 20:37+0100\n"
 "Last-Translator: Alwin Meschede <ameschede at gmx.de>\n"
 "Language-Team: german <debian-l10n-german at lists.debian.org>\n"
@@ -19,17 +19,20 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
-msgstr "Soll ${extname} der /etc/php4/${sapiconfig}/php.ini hinzugefügt werden?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
+msgstr ""
+"Soll ${extname} der /etc/php4/${sapiconfig}/php.ini hinzugefügt werden?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
+#: ../php5-mapscript.templates:1001
+#, fuzzy
 msgid ""
-"You are installing ${extname} support for php4 and it is not yet enabled in "
+"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 php4 scripts to use it."
+"allow php5 scripts to use it."
 msgstr ""
 "Sie installieren ${extname}-Unterstützung für php4, die noch nicht in der "
 "Konfiguration für die ${sapiconfig}-SAPI aktiviert ist. Die Aktivierung "
@@ -37,19 +40,21 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
-msgstr "Soll ${extname} aus der /etc/php4/${sapiconfig}/php.ini entfernt werden?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
+msgstr ""
+"Soll ${extname} aus der /etc/php4/${sapiconfig}/php.ini entfernt werden?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
+#: ../php5-mapscript.templates:2001
+#, fuzzy
 msgid ""
-"You are removing ${extname} support for php4, but it is still enabled in the "
+"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 ""
 "Sie entfernen die ${extname}-Unterstützung in php4, die aber noch in der "
 "Konfiguration der ${sapiconfig}-SAPI aktiviert ist. Dies so zu belassen wird "
 "wahrscheinlich Probleme verursachen, wenn PHP benutzt werden soll."
-

Modified: packages/mapserver/trunk/debian/po/fr.po
===================================================================
--- packages/mapserver/trunk/debian/po/fr.po	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/fr.po	2007-06-15 14:09:47 UTC (rev 876)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mapserver_4.8.4-1\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-08-21 09:44+0800\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2006-10-31 19:18+0100\n"
 "Last-Translator: Steve Petruzzello <dlist at bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -25,17 +25,19 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Faut-il ajouter ${extname} à /etc/php4/${sapiconfig}/php.ini ?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
+#: ../php5-mapscript.templates:1001
+#, fuzzy
 msgid ""
-"You are installing ${extname} support for php4 and it is not yet enabled in "
+"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 php4 scripts to use it."
+"allow php5 scripts to use it."
 msgstr ""
 "Vous êtes en train d'installer la gestion de ${extname} pour PHP4, mais elle "
 "n'est pas encore activée dans la configuration de la SAPI ${sapiconfig}. "
@@ -44,15 +46,17 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Faut-il supprimer ${extname} de /etc/php4/${sapiconfig}/php.ini ?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
+#: ../php5-mapscript.templates:2001
+#, fuzzy
 msgid ""
-"You are removing ${extname} support for php4, but it is still enabled in the "
+"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 ""

Modified: packages/mapserver/trunk/debian/po/ja.po
===================================================================
--- packages/mapserver/trunk/debian/po/ja.po	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/ja.po	2007-06-15 14:09:47 UTC (rev 876)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: mapserver (debconf) 4.10.0-5\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-08-21 09:44+0800\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2007-03-02 23:19+0900\n"
 "Last-Translator: Noritada Kobayashi <nori1 at dolphin.c.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -16,17 +16,19 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr "${extname} ã‚’ /etc/php4/${sapiconfig}/php.ini ã«è¿½åŠ ã—ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
+#: ../php5-mapscript.templates:1001
+#, fuzzy
 msgid ""
-"You are installing ${extname} support for php4 and it is not yet enabled in "
+"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 php4 scripts to use it."
+"allow php5 scripts to use it."
 msgstr ""
 "${extname} サポートを php4 にインストールしていますが、この拡張機能は "
 "${sapiconfig} SAPI の設定ではまだ有効になっていません。有効にすると php4 スク"
@@ -34,15 +36,17 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr "${extname} を /etc/php4/${sapiconfig}/php.ini から削除しますか?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
+#: ../php5-mapscript.templates:2001
+#, fuzzy
 msgid ""
-"You are removing ${extname} support for php4, but it is still enabled in the "
+"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 ""

Modified: packages/mapserver/trunk/debian/po/nb.po
===================================================================
--- packages/mapserver/trunk/debian/po/nb.po	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/nb.po	2007-06-15 14:09:47 UTC (rev 876)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-08-21 09:44+0800\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2005-08-20 21:03MET\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -26,30 +26,32 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Vil du ha ${extname} lagt til i /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
+#: ../php5-mapscript.templates:1001
 msgid ""
-"You are installing ${extname} support for php4 and it is not yet enabled in "
+"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 php4 scripts to use it."
+"allow php5 scripts to use it."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Ønskes ${extname} fjernet fra /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
+#: ../php5-mapscript.templates:2001
 msgid ""
-"You are removing ${extname} support for php4, but it is still enabled in the "
+"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 ""

Modified: packages/mapserver/trunk/debian/po/nl.po
===================================================================
--- packages/mapserver/trunk/debian/po/nl.po	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/nl.po	2007-06-15 14:09:47 UTC (rev 876)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mapserver\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-08-21 09:44+0800\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2007-03-09 19:15+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -18,25 +18,43 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
-msgstr "Wilt u dat ${extname} toegevoegd wordt in /etc/php4/${sapiconfig}/php.ini ?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
+msgstr ""
+"Wilt u dat ${extname} toegevoegd wordt in /etc/php4/${sapiconfig}/php.ini ?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "You are installing ${extname} support for php4 and it is not yet enabled in the configuration for the ${sapiconfig} SAPI. Enabling this extension will allow php4 scripts to use it."
-msgstr "U bent bezig ${extname}-ondersteuning te installeren voor php4. Dit is echter nog niet geactiveerd in het configuratiebestand voor de ${sapiconfig} SAPI. Activeren van deze extensie laat php4-scripts toe om deze te gebruiken."
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid ""
+"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 ""
+"U bent bezig ${extname}-ondersteuning te installeren voor php4. Dit is "
+"echter nog niet geactiveerd in het configuratiebestand voor de ${sapiconfig} "
+"SAPI. Activeren van deze extensie laat php4-scripts toe om deze te gebruiken."
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
-msgstr "Wilt u dat ${extname} verwijderd wordt uit /etc/php4/${sapiconfig}/php.ini ?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
+msgstr ""
+"Wilt u dat ${extname} verwijderd wordt uit /etc/php4/${sapiconfig}/php.ini ?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "You are removing ${extname} support for php4, 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 "U bent bezig om ${extname}-ondersteuning voor php4 te verwijderen. Dit is echter nog steeds geactiveerd in de configuratie voor ${sapiconfig} SAPI. Als u dit laat staan zal dit waarschijnlijk problemen veroorzaken wanneer u probeert om PHP te gebruiken."
-
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid ""
+"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 ""
+"U bent bezig om ${extname}-ondersteuning voor php4 te verwijderen. Dit is "
+"echter nog steeds geactiveerd in de configuratie voor ${sapiconfig} SAPI. "
+"Als u dit laat staan zal dit waarschijnlijk problemen veroorzaken wanneer u "
+"probeert om PHP te gebruiken."

Modified: packages/mapserver/trunk/debian/po/pt.po
===================================================================
--- packages/mapserver/trunk/debian/po/pt.po	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/pt.po	2007-06-15 14:09:47 UTC (rev 876)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: mapserver 4.10.0-3\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-08-21 09:44+0800\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2006-12-03 01:19+0000\n"
 "Last-Translator: Rui Branco <ruipb at debianpt.org>\n"
 "Language-Team: Native Portuguese <traduz at debianpt.org>\n"
@@ -16,17 +16,19 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Deverá o ${extname} ser adicionado ao /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
+#: ../php5-mapscript.templates:1001
+#, fuzzy
 msgid ""
-"You are installing ${extname} support for php4 and it is not yet enabled in "
+"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 php4 scripts to use it."
+"allow php5 scripts to use it."
 msgstr ""
 "Está a instalar o suporte ${extname} para o php4 e não está ainda activo na "
 "configuração para o ${sapiconfig} SAPI. Ao activar esta extensão permitirá "
@@ -34,15 +36,17 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Deverá o ${extname} ser removido de /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
+#: ../php5-mapscript.templates:2001
+#, fuzzy
 msgid ""
-"You are removing ${extname} support for php4, but it is still enabled in the "
+"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 ""

Modified: packages/mapserver/trunk/debian/po/sv.po
===================================================================
--- packages/mapserver/trunk/debian/po/sv.po	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/sv.po	2007-06-15 14:09:47 UTC (rev 876)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: mapserver 4.6.1-3\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-08-21 09:44+0800\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2005-10-11 12:32+0200\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -24,33 +24,36 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Ska ${extname} läggas till i /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
+#: ../php5-mapscript.templates:1001
 #, fuzzy
 msgid ""
-"You are installing ${extname} support for php4 and it is not yet enabled in "
+"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 php4 scripts to use it."
+"allow php5 scripts to use it."
 msgstr ""
 "Du installerar ${extname} stöd för php4 och den är ännu inte aktiverad i "
 "konfigurationen för ${sapiconfig} SAPI.  Vill du aktivera den nu?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Ska ${extname} tas bort från /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
+#: ../php5-mapscript.templates:2001
+#, fuzzy
 msgid ""
-"You are removing ${extname} support for php4, but it is still enabled in the "
+"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 ""

Modified: packages/mapserver/trunk/debian/po/templates.pot
===================================================================
--- packages/mapserver/trunk/debian/po/templates.pot	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/templates.pot	2007-06-15 14:09:47 UTC (rev 876)
@@ -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: 2006-08-21 09:44+0800\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
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:1001
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
+#: ../php5-mapscript.templates:1001
 msgid ""
-"You are installing ${extname} support for php4 and it is not yet enabled in "
+"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 php4 scripts to use it."
+"allow php5 scripts to use it."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:2001
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
+#: ../php5-mapscript.templates:2001
 msgid ""
-"You are removing ${extname} support for php4, but it is still enabled in the "
+"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 ""

Modified: packages/mapserver/trunk/debian/po/vi.po
===================================================================
--- packages/mapserver/trunk/debian/po/vi.po	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/po/vi.po	2007-06-15 14:09:47 UTC (rev 876)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: mapserver 4.4.1-2\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-08-21 09:44+0800\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2005-06-10 13:08+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -17,20 +17,21 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr ""
 "Bạn có muốn thêm «${extname}» và o tập tin «/etc/php4/${sapiconfig}/php.ini» "
 "không?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:1001
+#: ../php5-mapscript.templates:1001
 #, fuzzy
 msgid ""
-"You are installing ${extname} support for php4 and it is not yet enabled in "
+"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 php4 scripts to use it."
+"allow php5 scripts to use it."
 msgstr ""
 "Lúc nà y bạn đang cà i đắt cách hỗ trợ «${extname}» trong php4, mà chưa được "
 "hiệu lực trong cấu hình cho SAPI «${sapiconfig}». Bạn có muốn hiệu lực phần "
@@ -38,17 +39,19 @@
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr ""
 "Bạn có muốn loại bỏ «${extname}» ra tập tin «/etc/php4/${sapiconfig}/php."
 "ini» không?"
 
 #. Type: boolean
 #. Description
-#: ../php4-mapscript.templates:2001
+#: ../php5-mapscript.templates:2001
+#, fuzzy
 msgid ""
-"You are removing ${extname} support for php4, but it is still enabled in the "
+"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 ""

Modified: packages/mapserver/trunk/debian/rules
===================================================================
--- packages/mapserver/trunk/debian/rules	2007-06-15 13:43:16 UTC (rev 875)
+++ packages/mapserver/trunk/debian/rules	2007-06-15 14:09:47 UTC (rev 876)
@@ -17,8 +17,6 @@
 version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 CURDIR := $(shell pwd)
 PYVERS=$(shell pyversions -r debian/control)
-#PHP4API=$(shell php-config4 --phpapi)
-#PHP4DIR=$(shell php-config4 --extension-dir)
 PHP5API=$(shell php-config5 --phpapi)
 PHP5DIR=$(shell php-config5 --extension-dir)
 
@@ -59,14 +57,6 @@
 
 	touch configure-stamp
 
-#configure-php4-stamp: patch clean-first-build
-#	dh_testdir
-#	./configure $(COMMON_CONFIG) \
-#		--with-php=/usr/include/php4 \
-#		--with-php-regex-dir=/usr/include/php4/regex
-#
-#	touch configure-php4-stamp
-
 configure-php5-stamp: patch clean-first-build
 	dh_testdir
 	./configure $(COMMON_CONFIG) \
@@ -123,12 +113,6 @@
 
 	touch build-arch-stamp
 
-#build-php4-stamp: configure-php4-stamp
-#	dh_testdir
-#
-#	# Build php_mapscript
-#	$(MAKE)
-
 build-php5-stamp: configure-php5-stamp
 	dh_testdir
 	-cd mapscript/php3 && \
@@ -172,8 +156,7 @@
 clean: unpatch clean-first-build
 	dh_testdir
 	dh_clean
-#	-$(RM) configure-php4-stamp configure-php5-stamp build-php4-stamp build-php5-stamp install-arch-stamp install-indep-stamp install-php4-stamp install-php5-stamp
-	-$(RM) configure-php5-stamp build-php5-stamp install-arch-stamp install-indep-stamp install-php4-stamp install-php5-stamp
+	-$(RM) configure-php5-stamp build-php5-stamp install-arch-stamp install-indep-stamp install-php5-stamp
 	-$(MAKE) distclean
 
 install-indep: install-indep-stamp
@@ -184,7 +167,6 @@
 	dh_install -i
 	touch install-indep-stamp
 
-#install-arch: install-arch-stamp install-php4-stamp install-php5-stamp
 install-arch: install-arch-stamp install-php5-stamp
 install-arch-stamp: build-arch
 	dh_testdir -a
@@ -216,21 +198,6 @@
 	install -m755 shp2mysql.pl debian/tmp/usr/bin/shp2mysql
 	touch install-arch-stamp
 
-
-#install-php4-stamp: build-php4-stamp
-#	dh_testdir
-#	dh_testroot
-#
-#	-mkdir -p debian/tmp$(PHP4DIR)
-#
-#	# php4-mapscript
-#	install -m644 mapscript/php3/php_mapscript.so \
-#		debian/tmp$(PHP4DIR)
-#
-#	echo 'misc:Depends=phpapi-'$(PHP4API) >> debian/php4-mapscript.substvars
-#                      
-#	touch install-php4-stamp
-
 install-php5-stamp: build-php5-stamp
 	dh_testdir
 	dh_testroot