[DebianGIS-dev] r875 - packages/mapserver/branches/etch/4.10.2/debian
frankie at alioth.debian.org
frankie at alioth.debian.org
Fri Jun 15 13:43:16 UTC 2007
Author: frankie
Date: 2007-06-15 13:43:16 +0000 (Fri, 15 Jun 2007)
New Revision: 875
Removed:
packages/mapserver/branches/etch/4.10.2/debian/README.etch
packages/mapserver/branches/etch/4.10.2/debian/control.etch
Modified:
packages/mapserver/branches/etch/4.10.2/debian/changelog
packages/mapserver/branches/etch/4.10.2/debian/control
packages/mapserver/branches/etch/4.10.2/debian/rules
Log:
Starting etch branching for 4.10.2 for true.
Deleted: packages/mapserver/branches/etch/4.10.2/debian/README.etch
===================================================================
--- packages/mapserver/branches/etch/4.10.2/debian/README.etch 2007-06-15 13:33:56 UTC (rev 874)
+++ packages/mapserver/branches/etch/4.10.2/debian/README.etch 2007-06-15 13:43:16 UTC (rev 875)
@@ -1,7 +0,0 @@
-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.
-
Modified: packages/mapserver/branches/etch/4.10.2/debian/changelog
===================================================================
--- packages/mapserver/branches/etch/4.10.2/debian/changelog 2007-06-15 13:33:56 UTC (rev 874)
+++ packages/mapserver/branches/etch/4.10.2/debian/changelog 2007-06-15 13:43:16 UTC (rev 875)
@@ -1,5 +1,6 @@
-mapserver (4.10.2-1) unstable; urgency=low
+mapserver (4.10.2-0.etch.1) unstable; urgency=low
+ * Start branching for Etch.
* New upstream release.
(closes: #412836)
* Fixed PHP case in long descriptions.
Modified: packages/mapserver/branches/etch/4.10.2/debian/control
===================================================================
--- packages/mapserver/branches/etch/4.10.2/debian/control 2007-06-15 13:33:56 UTC (rev 874)
+++ packages/mapserver/branches/etch/4.10.2/debian/control 2007-06-15 13:43:16 UTC (rev 875)
@@ -1,27 +1,40 @@
Source: mapserver
Section: devel
-Priority: optional
+Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Schuyler Erle <schuyler at nocat.net>, Petter Reinholdtsen <pere at debian.org>, Paul Wise <pabs at debian.org>, Fabio Tranchitella <kobold at debian.org>, Francesco Paolo Lovergine <frankie at 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, libcurl4-gnutls-dev, libpng12-dev,
+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, php5-dev, swig,
+ 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
+ PHP MapScript allows you to use the MapServer functionalities with php web
scripting language.
.
- This module currently works only with PHP as an Apache DSO.
+ Currently work only with php as an Apache DSO.
Package: perl-mapscript
Section: perl
@@ -57,7 +70,7 @@
Section: misc
Architecture: any
Depends: ${shlibs:Depends}, ${perl:Depends}
-Suggests: libdbi-perl, perl-mapscript, python-mapscript, cgi-mapserver, mapserver-doc, php5-mapscript
+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.
.
@@ -67,7 +80,7 @@
The MapServer system includes MapScript that allows popular
scripting languages such as :
.
- * PHP provided by php5-mapscript.
+ * PHP provided by php4-mapscript.
* Python provided by python-mapscript.
* Perl provided by perl-mapscript.
* Java is not supported by any package.
@@ -80,7 +93,7 @@
Section: doc
Architecture: all
Depends: ${shlibs:Depends}
-Suggests: perl-mapscript, python-mapscript, php5-mapscript, cgi-mapserver
+Suggests: perl-mapscript, python-mapscript, php4-mapscript, cgi-mapserver
Description: documentation for mapserver
Some short documentation and examples for MapServer.
.
@@ -90,7 +103,7 @@
The MapServer system includes MapScript that allows using popular
scripting languages such as :
.
- * PHP provided by php5-mapscript.
+ * PHP provided by php4-mapscript.
* Python provided by python-mapscript.
* Perl provided by perl-mapscript.
* Java is not supported by any package.
Deleted: packages/mapserver/branches/etch/4.10.2/debian/control.etch
===================================================================
--- packages/mapserver/branches/etch/4.10.2/debian/control.etch 2007-06-15 13:33:56 UTC (rev 874)
+++ packages/mapserver/branches/etch/4.10.2/debian/control.etch 2007-06-15 13:43:16 UTC (rev 875)
@@ -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
Modified: packages/mapserver/branches/etch/4.10.2/debian/rules
===================================================================
--- packages/mapserver/branches/etch/4.10.2/debian/rules 2007-06-15 13:33:56 UTC (rev 874)
+++ packages/mapserver/branches/etch/4.10.2/debian/rules 2007-06-15 13:43:16 UTC (rev 875)
@@ -17,8 +17,8 @@
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)
+PHP4API=$(shell php-config4 --phpapi)
+PHP4DIR=$(shell php-config4 --extension-dir)
PHP5API=$(shell php-config5 --phpapi)
PHP5DIR=$(shell php-config5 --extension-dir)
@@ -59,14 +59,14 @@
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-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 +123,12 @@
touch build-arch-stamp
-#build-php4-stamp: configure-php4-stamp
-# dh_testdir
-#
-# # Build php_mapscript
-# $(MAKE)
+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 +172,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-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
-$(MAKE) distclean
@@ -184,7 +184,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-php4-stamp install-php5-stamp
install-arch: install-arch-stamp install-php5-stamp
install-arch-stamp: build-arch
dh_testdir -a
@@ -217,20 +217,20 @@
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-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
More information about the Pkg-grass-devel
mailing list