Author: frankie
Date: 2007-05-18 14:14:47 +0000 (Fri, 18 May 2007)
New Revision: 840

Added:
   packages/mapserver/trunk/debian/README.etch
   packages/mapserver/trunk/debian/control.etch
Removed:
   packages/mapserver/trunk/debian/README.sarge
   packages/mapserver/trunk/debian/patches/sarge-backport.patch
Modified:
   packages/mapserver/trunk/debian/TODO.Debian
   packages/mapserver/trunk/debian/changelog
   packages/mapserver/trunk/debian/control
   packages/mapserver/trunk/debian/patches/00list
Log:
Most essential fixes.


Added: packages/mapserver/trunk/debian/README.etch
===================================================================
--- packages/mapserver/trunk/debian/README.etch                         (rev 0)
+++ packages/mapserver/trunk/debian/README.etch 2007-05-18 14:14:47 UTC (rev 
840)
@@ -0,0 +1,7 @@
+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.
+

Deleted: packages/mapserver/trunk/debian/README.sarge
===================================================================
--- packages/mapserver/trunk/debian/README.sarge        2007-05-18 13:15:54 UTC 
(rev 839)
+++ packages/mapserver/trunk/debian/README.sarge        2007-05-18 14:14:47 UTC 
(rev 840)
@@ -1,21 +0,0 @@
-Backporting MapServer 4.8.* to Sarge
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-Schuyler Erle <[EMAIL PROTECTED]> 1 Apr 2006
-
-1) Patch the debian/control and debian/rules files.
-
-$ cd debian
-$ patch -p2 <patches/sarge-backport.patch
-
-2) Change the version to 4.8.x-0.0.dgis.sarge.1.
-
-$ cd ..
-$ debchange 
-
-3) Rebuild.
-
-$ dpkg-buildpackage -sa
-
-4) Upload.
-
-=30=

Modified: packages/mapserver/trunk/debian/TODO.Debian
===================================================================
--- packages/mapserver/trunk/debian/TODO.Debian 2007-05-18 13:15:54 UTC (rev 
839)
+++ packages/mapserver/trunk/debian/TODO.Debian 2007-05-18 14:14:47 UTC (rev 
840)
@@ -1,4 +1,5 @@
 Debian mapserver TODO list
+--------------------------
 
 Include some more bindings when someone requests them.
 Rename perl-mapscript to libmapscript-perl.

Modified: packages/mapserver/trunk/debian/changelog
===================================================================
--- packages/mapserver/trunk/debian/changelog   2007-05-18 13:15:54 UTC (rev 
839)
+++ packages/mapserver/trunk/debian/changelog   2007-05-18 14:14:47 UTC (rev 
840)
@@ -1,13 +1,20 @@
 mapserver (4.10.1-1) unstable; urgency=low
 
   [ Francesco Paolo Lovergine ]
-  * debian/po/nl.po added. (Closes: #415504)
-  * Moved to gdal 1.4.0 dependency.
+  * debian/po/nl.po added. (closes: #415504)
+  * Moved to gdal 1.4.1 dependency. (closes: #424635, #423538)
+  * Removed php4 support (closes: #418313)
+  * Updated long descriptions.
+  * Removed Thomas Sondag among Uploaders (last contribute dated more than 2 
years ago).
+  * Moved to libcurl4 build-deps.
+  * Added a debian/README.etch for notes on backporting.
+  * A new debian/control.etch file has been introduced to retain etch 
compatibility.
+    All php4 related files have been maintained for the same reason. Please, 
don't remove them!
 
   [ Fabio Tranchitella ]
   * New upstream release.
 
- -- Francesco Paolo Lovergine <[EMAIL PROTECTED]>  Thu, 26 Apr 2007 11:16:20 
+0200
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]>  Fri, 18 May 2007 16:06:27 
+0200
 
 mapserver (4.10.0-6) unstable; urgency=low
 

Modified: packages/mapserver/trunk/debian/control
===================================================================
--- packages/mapserver/trunk/debian/control     2007-05-18 13:15:54 UTC (rev 
839)
+++ packages/mapserver/trunk/debian/control     2007-05-18 14:14:47 UTC (rev 
840)
@@ -2,29 +2,16 @@
 Section: devel
 Priority: extra
 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]>
+Uploaders: Schuyler Erle <[EMAIL PROTECTED]>, Petter Reinholdtsen <[EMAIL 
PROTECTED]>, Paul Wise <[EMAIL PROTECTED]>, Fabio Tranchitella <[EMAIL 
PROTECTED]>, Francesco Paolo Lovergine <[EMAIL PROTECTED]>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.37.2), dpatch, libcurl3-gnutls-dev | 
libcurl3-dev, libpng12-dev,
+Build-Depends: debhelper (>= 5.0.37.2), dpatch, libcurl4-gnutls-dev | 
libcurl4-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,
+ libjpeg62-dev, libgdal1-dev (>=1.4.0), 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
@@ -70,7 +57,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, cgi-mapserver, 
mapserver-doc, php5-mapscript
 Description: mapserver binary utilities
  Binary utilities for using MapServer with the command line.
  .
@@ -80,7 +67,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.
@@ -93,7 +80,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.
  .
@@ -103,7 +90,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.

Added: packages/mapserver/trunk/debian/control.etch
===================================================================
--- packages/mapserver/trunk/debian/control.etch                                
(rev 0)
+++ packages/mapserver/trunk/debian/control.etch        2007-05-18 14:14:47 UTC 
(rev 840)
@@ -0,0 +1,113 @@
+Source: mapserver
+Section: devel
+Priority: extra
+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-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/trunk/debian/patches/00list
===================================================================
--- packages/mapserver/trunk/debian/patches/00list      2007-05-18 13:15:54 UTC 
(rev 839)
+++ packages/mapserver/trunk/debian/patches/00list      2007-05-18 14:14:47 UTC 
(rev 840)
@@ -1,3 +1,4 @@
 20_php_build
 50_clean
 70_ptrreturn
+80_gdal_lib

Deleted: packages/mapserver/trunk/debian/patches/sarge-backport.patch
===================================================================
--- packages/mapserver/trunk/debian/patches/sarge-backport.patch        
2007-05-18 13:15:54 UTC (rev 839)
+++ packages/mapserver/trunk/debian/patches/sarge-backport.patch        
2007-05-18 14:14:47 UTC (rev 840)
@@ -1,61 +0,0 @@
-diff -Naur mapserver-4.8.1/debian/control mapserver-4.8.1-sarge/debian/control
---- mapserver-4.8.1/debian/control     2006-03-03 21:58:40.406655489 -0800
-+++ mapserver-4.8.1-sarge/debian/control       2006-03-03 21:10:47.318214296 
-0800
-@@ -4,7 +4,7 @@
- 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]>
- Standards-Version: 3.6.2
--Build-Depends: debhelper (>= 4), 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, postgresql-dev (>= 7.3.3-1), php4-dev, php5-dev, swig, python-dev, 
libgeos-dev
-+Build-Depends: debhelper (>= 4), 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 | libgdal1-1.3.2-dev, 
proj, libwww-dev, postgresql-dev (>= 7.3.3-1), php4-dev, swig, python-dev, 
libgeos-dev
- Build-Depends-Indep: python-docutils
- Build-Conflicts: libcurl3-openssl-dev
- 
-@@ -21,16 +21,16 @@
-  .
-  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: 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
-diff -Naur mapserver-4.8.1/debian/rules mapserver-4.8.1-sarge/debian/rules
---- mapserver-4.8.1/debian/rules       2006-03-03 21:58:40.417653022 -0800
-+++ mapserver-4.8.1-sarge/debian/rules 2006-03-03 21:43:07.663910290 -0800
-@@ -17,7 +17,8 @@
- version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
- CURDIR := $(shell pwd)
- PYTHON=python
--PHP4API=$(shell php-config4 --phpapi)
-+#PHP4API=$(shell php-config4 --phpapi)
-+PHP4API=$(shell php-config4 --extension-dir | cut -d/ -f5)
- PHP4DIR=$(shell php-config4 --extension-dir)
- PHP5API=$(shell php-config5 --phpapi)
- PHP5DIR=$(shell php-config5 --extension-dir)
-@@ -180,7 +181,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-arch-stamp: build-arch
-       dh_testdir -a
-       dh_testroot -a


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to