[SCM] mapserver branch, ubuntu/lucid, updated. upstream/6.0.1-44-gce923a6

Jerome Villeneuve Larouche jlarouche at mapgears.com
Mon Nov 19 20:09:59 UTC 2012


The following commit has been merged in the ubuntu/lucid branch:
commit 5c4c653fd83d21bb64ef3566c01fd3be33fc6081
Merge: d2400a50bd13b9f29097a40e94a9eda84bfd359c 3b4c722608724b81ea5d7798800e750529ac8537
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Thu Nov 15 15:03:16 2012 +0000

    6.2.0 Update for Lucid
    
    Merge branch 'master' into ubuntu/lucid

diff --combined debian/changelog
index e3ca86b,06fdabb..9ac1cd8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,12 +1,18 @@@
- mapserver (6.0.3-2~lucid2) lucid; urgency=medium
++mapserver (6.2.0-2~lucid1) lucid; urgency=low
 +
-   * Fix bad dependency: libgdal1 -> libgdal.
++  * Launchpad build for Lucid
 +
-  -- Alan Boudreault <aboudreault at mapgears.com>  Tue, 22 May 2012 23:43:57 +0000
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 14:49:21 +0000
 +
- mapserver (6.0.3-2~lucid1) lucid; urgency=low
+ mapserver (6.2.0-1) unstable; urgency=low
  
-   * Launchpad build for Lucid.
+   * New upstream release
+   * Added libmapserver package
+   * Added patch to fix mapscriptvars to send the right argument to ld
+   * Changed php5-mapscript dependencies, removed misc:depends and added
+     libapache2-mod-php5 explicitly
  
-  -- Alan Boudreault <aboudreault at mapgears.com>  Tue, 22 May 2012 13:56:21 +0000
+  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 13:43:51 +0000
  
  mapserver (6.0.3-1) unstable; urgency=low
  
diff --combined debian/control
index c07ddde,f71de52..6295f20
--- a/debian/control
+++ b/debian/control
@@@ -5,21 -5,34 +5,34 @@@ Maintainer: Debian GIS Project <pkg-gra
  Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>
  Standards-Version: 3.9.3
  Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= 1.1.4),
-  libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal-dev (>=1.4.0), libproj-dev,
-  libpq-dev, php5-dev, swig, python-all (>= 2.6), python-all-dev (>= 2.6), libgeos-dev (>= 3.2),
+  libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.9.0), libproj-dev,
 - libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 3.2.1-1~),
++ libpq-dev, php5-dev, swig, python-all (>= 2.6), python-all-dev (>= 2.6), libgeos-dev (>= 3.2.1-1~),
   ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
-  sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
+  sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
   libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, 
-  libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev, libcairo2-dev
+  libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev
  Build-Conflicts: libcurl3-openssl-dev
  Homepage: http://www.mapserver.org
  Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
  Vcs-Git: git://git.debian.org/git/pkg-grass/mapserver.git
  
+ Package: libmapserver
+ Section: libs
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
+ Description: Shared library for MapServer
+  This package contains the shared library.
+  .
+  MapServer is a CGI-based framework for Internet map services which
+  supports Open Geospatial Consortium (OGC) standards. Scripting
+  functionality in MapScript is provided by the suggested mapscript
+  library packages.
+ 
  Package: php5-mapscript
  Section: php
  Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
+ Depends: ${shlibs:Depends}, libapache2-mod-php5
  Suggests: mapserver-bin, mapserver-doc
  Description: php5-cgi module for MapServer
   PHP MapScript provides MapServer functions for PHP scripts.
diff --combined debian/rules
index 9d9a3cb,4b4b224..9b886d2
--- a/debian/rules
+++ b/debian/rules
@@@ -15,9 -15,7 +15,7 @@@ version_major=$(shell expr `pwd` : '.*-
  CURDIR := $(shell pwd)
  PYVERS=$(shell pyversions -r debian/control)
  RUBYVERS=1.8 1.9.1
- PHP5API=$(shell php-config5 --phpapi)
- PHP5DIR=$(shell php-config5 --extension-dir)
- 
+ #PHP5API=$(shell php-config5 --phpapi)
  
  # Configure config :
  # Not using non free libpdf
@@@ -26,7 -24,6 +24,6 @@@
  
  
  COMMON_CONFIG=	--prefix=/usr \
- 		--enable-debug \
  		--without-tiff \
  		--without-pdf \
  		--with-gd=/usr \
@@@ -49,28 -46,20 +46,20 @@@
  		--with-geos \
  		--with-fastcgi \
  		--with-agg \
- 		--with-experimental-png \
+ 		--with-php \
  		--with-cairo
  
  rstoptions=--stylesheet=mapscript.css --link-stylesheet 
  
- MS_CFLAGS=-g -O2
+ MS_CFLAGS=-O2
  MS_CXXFLAGS=$(MS_CFLAGS)
  
  configure-stamp:
  	dh_testdir
  	./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
  
- 
  	touch configure-stamp
  
- configure-php5-stamp: clean-first-build
- 	dh_testdir
- 	./configure $(COMMON_CONFIG) \
- 		--with-php=/usr/include/php5  CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
- 
- 	touch configure-php5-stamp
- 
  # This is the correct, policy-compliant build target
  #build: build-indep build-arch
  
@@@ -81,7 -70,6 +70,6 @@@ build: build-arc
  build-indep: build-indep-stamp
  build-indep-stamp:
  	dh_testdir
- 
  	touch build-indep-stamp
  
  build-arch: build-arch-stamp
@@@ -94,8 -82,8 +82,8 @@@ build-arch-stamp: configure-stam
  
  	# Build Perl mapscript
  	cd $(CURDIR)/mapscript/perl && \
- 		perl Makefile.PL INSTALLDIRS=vendor \
- 		&& $(MAKE) LD_RUN_PATH="" OPTIMIZE="-O2 -g -W -Wall"
+ 	  perl Makefile.PL INSTALLDIRS=vendor \
+ 	  && $(MAKE) LD_RUN_PATH="" OPTIMIZE="-O2 -g -W -Wall"
  
  	# Build python
  	cd $(CURDIR)/mapscript/python && \
@@@ -110,12 -98,6 +98,6 @@@
  
  	touch build-arch-stamp
  
- build-php5-stamp: configure-php5-stamp
- 	dh_testdir
- 	-cd mapscript/php && \
- 		$(MAKE) clean
- 	# Build php_mapscript
- 	$(MAKE)
  
  # This is needed to do 'make clean', but will be removed by the clean
  # targets.  The end result is that 'debuild clean' only can execute
@@@ -153,7 -135,8 +135,8 @@@ clean-first-build
  clean: clean-first-build
  	dh_testdir
  	dh_prep
- 	-$(RM) configure-php5-stamp build-php5-stamp install-arch-stamp install-indep-stamp install-php5-stamp
+ 	-$(RM) install-arch-stamp install-indep-stamp
+ 	-$(RM) -rf $(CURDIR)/debian/files
  	[ ! -f Makefile ] || $(MAKE) distclean
  	rm -f debian/*.debhelper.log
  
@@@ -165,18 -148,12 +148,12 @@@ install-indep-stamp: build-inde
  	dh_install -i
  	touch install-indep-stamp
  
- install-arch: install-arch-stamp install-php5-stamp
+ install-arch: install-arch-stamp
  install-arch-stamp: build-arch
  	dh_testdir -a
  	dh_testroot -a
  	dh_installdirs -a
- 
- 	-mkdir -p debian/tmp/usr/lib/  debian/tmp/usr/include/ \
- 		debian/tmp/usr/lib/cgi-bin/ \
- 		debian/tmp/usr/bin
- 
- 	# CGI mapserver
- 	install -m755 mapserv debian/tmp/usr/lib/cgi-bin/mapserv
+ 	dh_auto_install
  
  	# Perl mapscript
  	cd $(CURDIR)/mapscript/perl && \
@@@ -196,26 -173,19 +173,19 @@@
  	      $(MAKE) distclean ; \
  	  done
  
- 	# Mapserver  Binary
- 	install -m755 legend scalebar shp2img shptree \
- 		shptreetst shptreevis sortshp tile4ms msencrypt \
- 		debian/tmp/usr/bin
- 	install -m755 shp2mysql.pl debian/tmp/usr/bin/shp2mysql
- 	touch install-arch-stamp
+ 	# removing embedded rpath in binaries
+ 	-find $(CURDIR)/debian/tmp/usr/bin -type f  -exec chrpath --delete {} \;
  
- install-php5-stamp: build-php5-stamp
- 	dh_testdir
- 	dh_testroot
+ 	# remove la file in php ext dir
+ 	-$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/20090626/*.la
  
- 	-mkdir -p debian/tmp$(PHP5DIR)
+ 	# CGI mapserver
+ 	-mkdir -p debian/tmp/usr/lib/cgi-bin
+ 	install -m755 debian/tmp/usr/bin/mapserv debian/tmp/usr/lib/cgi-bin/mapserv
  
- 	# php5-mapscript
- 	install -m644 mapscript/php/php_mapscript.so \
- 		debian/tmp$(PHP5DIR)
-                       
- 	echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars
+ 	#echo 'misc:Depends=libapache2-mod-php5' >> debian/php5-mapscript.substvars
  
- 	touch install-php5-stamp
+ 	touch install-arch-stamp
  
  binary-indep: install-indep
  	dh_testdir -i
@@@ -242,7 -212,7 +212,7 @@@ binary-arch: install-arc
  	dh_installexamples -a
  	chmod a-x debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml
  	dh_installdebconf -a
 -	dh_python2 -ppython-mapscript
 +	dh_python -ppython-mapscript
  	dh_compress -a
  	dh_link -a
  	# Overrides a mismatched error from lintian

-- 
Mapserver



More information about the Pkg-grass-devel mailing list