Package: mapserver Version: 4.10.0-6 Severity: normal Tags: patch Hi,
Attached is the diff for my mapserver 4.10.0-6.1 NMU during the current BSP which I'll upload to delayed-0. -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u mapserver-4.10.0/debian/control mapserver-4.10.0/debian/control --- mapserver-4.10.0/debian/control +++ mapserver-4.10.0/debian/control @@ -1,27 +1,14 @@ Source: mapserver Section: devel -Priority: extra +Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Thomas Sondag <[EMAIL PROTECTED]>, Schuyler Erle <[EMAIL PROTECTED]>, Petter Reinholdtsen <[EMAIL PROTECTED]>, Paul Wise <[EMAIL PROTECTED]>, Fabio Tranchitella <[EMAIL PROTECTED]> 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-1.3.2-dev, 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: debhelper (>= 5.0.37.2), dpatch, libcurl4-gnutls-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, libpq-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 @@ -31,7 +18,7 @@ PHP MapScript allows you to use the MapServer functionalities with php web scripting language. . - Currently work only with php as an Apache DSO. + This module currently works only with php as an Apache DSO. Package: perl-mapscript Section: perl @@ -67,7 +54,7 @@ Section: misc Architecture: any Depends: ${shlibs:Depends}, ${perl:Depends} -Suggests: libdbi-perl, perl-mapscript, python-mapscript, php4-mapscript, cgi-mapserver, mapserver-doc +Suggests: libdbi-perl, perl-mapscript, python-mapscript, php5-mapscript, cgi-mapserver, mapserver-doc Description: mapserver binary utilities Binary utilities for using MapServer with the command line. . @@ -77,7 +64,7 @@ The MapServer system includes MapScript that allows popular scripting languages such as : . - * PHP provided by php4-mapscript. + * PHP provided by php5-mapscript. * Python provided by python-mapscript. * Perl provided by perl-mapscript. * Java is not supported by any package. @@ -90,7 +77,7 @@ Section: doc Architecture: all Depends: ${shlibs:Depends} -Suggests: perl-mapscript, python-mapscript, php4-mapscript, cgi-mapserver +Suggests: perl-mapscript, python-mapscript, php5-mapscript, cgi-mapserver Description: documentation for mapserver Some short documentation and examples for MapServer. . @@ -100,7 +87,7 @@ The MapServer system includes MapScript that allows using popular scripting languages such as : . - * PHP provided by php4-mapscript. + * PHP provided by php5-mapscript. * Python provided by python-mapscript. * Perl provided by perl-mapscript. * Java is not supported by any package. diff -u mapserver-4.10.0/debian/rules mapserver-4.10.0/debian/rules --- mapserver-4.10.0/debian/rules +++ mapserver-4.10.0/debian/rules @@ -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,7 +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-php5-stamp -$(MAKE) distclean install-indep: install-indep-stamp @@ -183,7 +167,7 @@ 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 dh_testroot -a @@ -215,20 +199,6 @@ 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 diff -u mapserver-4.10.0/debian/changelog mapserver-4.10.0/debian/changelog --- mapserver-4.10.0/debian/changelog +++ mapserver-4.10.0/debian/changelog @@ -1,3 +1,15 @@ +mapserver (4.10.0-6.1) unstable; urgency=high + + * Non-maintainer upload during BSP. + * Update build dependencies for curl and libgdal transitions + (Closes: #423538, #424635). + * Set severity to optional to match overrides. + * Drop php4 binary packages (Closes: #418313). + * Fix language in description (Closes: #416449). + * Add Dutch debconf translation (Closes: #415504). + + -- Luk Claes <[EMAIL PROTECTED]> Sun, 20 May 2007 17:55:46 +0200 + mapserver (4.10.0-6) unstable; urgency=low * debian/po/de.po: added, thanks to Kobayashi Noritada. (Closes: #413119) only in patch2: unchanged: --- mapserver-4.10.0.orig/debian/po/nl.po +++ mapserver-4.10.0/debian/po/nl.po @@ -0,0 +1,42 @@ +# 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 PROTECTED]>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: mapserver\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-08-21 09:44+0800\n" +"PO-Revision-Date: 2007-03-09 19:15+0100\n" +"Last-Translator: Bart Cornelis <[EMAIL PROTECTED]>\n" +"Language-Team: debian-l10n-dutch <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Dutch\n" + +#. 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 ?" + +#. 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." + +#. 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 ?" + +#. 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." +
_______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel