[DebianGIS-dev] DebianGis CVS update: mapserver/debian changelog control rules

[DebianGis CVS Commit]

  User: pabs-guest
  Date: 05/11/21 13:31:11

  Modified:    debian   changelog control rules
  Log:
  Fix location of php extensions (Closes: #339007)
  
  Revision  Changes    Path
  1.42      +7 -0      mapserver/debian/changelog
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog?annotate=1.42&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog?rev=1.42&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog.diff?r1=1.42&r2=1.41&cvsroot=
  
  -----------------------------------
  
  Index: changelog
  ===================================================================
  RCS file: /cvsroot/pkg-grass/mapserver/debian/changelog,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- changelog	18 Nov 2005 08:25:47 -0000	1.41
  +++ changelog	21 Nov 2005 13:31:10 -0000	1.42
  @@ -1,3 +1,10 @@
  +mapserver (4.6.1-6) unstable; urgency=low
  +
  +  * Install php extensions into the directory output by php-configN and depend
  +    on the phpapi virtual package specified by php-configN (Closes: #339007)
  +
  + -- Paul Wise <pabs3 at bonedaddy.net>  Sat, 19 Nov 2005 13:10:09 +0800
  +
   mapserver (4.6.1-5) unstable; urgency=low
   
     [ Petter Reinholdtsen ]
  
  
  
  1.26      +2 -2      mapserver/debian/control
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/control?annotate=1.26&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/control?rev=1.26&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/control.diff?r1=1.26&r2=1.25&cvsroot=
  
  -----------------------------------
  
  Index: control
  ===================================================================
  RCS file: /cvsroot/pkg-grass/mapserver/debian/control,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- control	13 Nov 2005 17:13:24 -0000	1.25
  +++ control	21 Nov 2005 13:31:10 -0000	1.26
  @@ -11,7 +11,7 @@
   Section: web
   Priority: extra
   Architecture: any
  -Depends: ${shlibs:Depends}, ${misc:Depends}, libapache-mod-php4 | phpapi-20020918
  +Depends: ${shlibs:Depends}, ${misc:Depends}
   Suggests: mapserver-bin, mapserver-doc
   Replaces: php-mapscript
   Conflicts: php-mapscript
  @@ -24,7 +24,7 @@
   Package: php5-mapscript
   Section: web
   Architecture: any
  -Depends: ${shlibs:Depends}, ${misc:Depends}, libapache-mod-php5 | phpapi-20041030
  +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
  
  
  
  1.13      +12 -4     mapserver/debian/rules
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/rules?annotate=1.13&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/rules?rev=1.13&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/rules.diff?r1=1.13&r2=1.12&cvsroot=
  
  -----------------------------------
  
  Index: rules
  ===================================================================
  RCS file: /cvsroot/pkg-grass/mapserver/debian/rules,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- rules	13 Nov 2005 17:13:24 -0000	1.12
  +++ rules	21 Nov 2005 13:31:10 -0000	1.13
  @@ -17,6 +17,10 @@
   version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
   CURDIR := $(shell pwd)
   PYTHON=python
  +PHP4API=$(shell php-config4 --phpapi)
  +PHP4DIR=$(shell php-config4 --extension-dir)
  +PHP5API=$(shell php-config5 --phpapi)
  +PHP5DIR=$(shell php-config5 --extension-dir)
   
   # Configure config :
   # Not using non free libpdf
  @@ -169,11 +173,13 @@
   	dh_testdir
   	dh_testroot
   
  -	-mkdir -p debian/tmp/usr/lib/php4/20020429
  +	-mkdir -p debian/tmp$(PHP4DIR)
   
   	# php4-mapscript
   	install -m644 mapscript/php3/php_mapscript.so \
  -		debian/tmp/usr/lib/php4/20020429
  +		debian/tmp$(PHP4DIR)
  +
  +	echo 'misc:Depends=phpapi-'$(PHP4API) >> debian/php4-mapscript.substvars
                         
   	touch install-php4-stamp
   
  @@ -181,12 +187,14 @@
   	dh_testdir
   	dh_testroot
   
  -	-mkdir -p debian/tmp/usr/lib/php5/20041030
  +	-mkdir -p debian/tmp$(PHP5DIR)
   
   	# php5-mapscript
   	install -m644 mapscript/php3/php_mapscript.so \
  -		debian/tmp/usr/lib/php5/20041030
  +		debian/tmp$(PHP5DIR)
                         
  +	echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars
  +
   	touch install-php5-stamp
   
   binary-indep: install