[DebianGIS-dev] CVS Update: mapserver/debian/patches sarge-backport.patch

[sderle-guest at haydn.debian.org]

  User: sderle-guest
  Date: 06/04/01 07:28:34

  Added:       debian/patches sarge-backport.patch
  Log:
  Created a patch to allow backporting MapServer to Sarge; documented the
  backporting process in debian/README.sarge.
  
  Revision  Changes    Path
  1.1                  mapserver/debian/patches/sarge-backport.patch
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/patches/sarge-backport.patch?annotate=1.1&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/patches/sarge-backport.patch?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=
  
  -----------------------------------
  
  Index: sarge-backport.patch
  ===================================================================
  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 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 <pabs3 at bonedaddy.net>
   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.1-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.1-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