[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 6afa15cf3d2ba0acac62595c3180ce802bfb7ce7
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 22:17:48 2013 +0200

Empty dependency_libs in la files.

diff --git a/debian/changelog b/debian/changelog
index a92a115..1d4f91e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
 
   * Merge change from 6.0.1-4: Migrated to debhelper level 9.
   * Drop possible-gpl-code-linked-with-openssl lintian override.
+  * Empty dependency_libs in la files.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/rules b/debian/rules
index 771c850..8429cd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -179,6 +179,9 @@ install-arch-stamp: build-arch
# remove la file in php ext dir
-$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/20090626/*.la
 
+   # empty dependency_libs in la file
+   sed -i /dependency_libs/ s/'.*'/''/ 
$(CURDIR)/debian/tmp/usr/lib/libmapserver.la
+
# CGI mapserver
-mkdir -p debian/tmp/usr/lib/cgi-bin
install -m755 debian/tmp/usr/bin/mapserv 
debian/tmp/usr/lib/cgi-bin/mapserv

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit ddb1645aa610b70c476ab5026b8b6a82aabfc908
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 22:35:57 2013 +0200

Depend on PHP API version instead of libapache2-mod-php5.

diff --git a/debian/changelog b/debian/changelog
index a11daae..f8eea61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mapserver (6.2.1-3) UNRELEASED; urgency=low
 
-  * Merge change from 6.0.1-4: Migrated to debhelper level 9.
+  * Merge changes from 6.0.1-4: 
+- Migrated to debhelper level 9.
+- Depend on PHP API version instead of libapache2-mod-php5.
   * Drop possible-gpl-code-linked-with-openssl lintian override.
   * Empty dependency_libs in la files.
   * Use PHP5API variable instead of hardcoded path to la file.
diff --git a/debian/control b/debian/control
index 5c06887..6474d2f 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Description: Shared library for MapServer
 Package: php5-mapscript
 Section: php
 Architecture: any
-Depends: ${shlibs:Depends}, libapache2-mod-php5
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: mapserver-bin, mapserver-doc
 Description: php5-cgi module for MapServer
  PHP MapScript provides MapServer functions for PHP scripts.
diff --git a/debian/rules b/debian/rules
index c432bd7..45ed9d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,7 +186,7 @@ install-arch-stamp: build-arch
-mkdir -p debian/tmp/usr/lib/cgi-bin
install -m755 debian/tmp/usr/bin/mapserv 
debian/tmp/usr/lib/cgi-bin/mapserv
 
-   #echo 'misc:Depends=libapache2-mod-php5'  
debian/php5-mapscript.substvars
+   echo 'misc:Depends=phpapi-'$(PHP5API)  debian/php5-mapscript.substvars
 
# libmapserver-dev headers
-mkdir -p debian/tmp/usr/include/mapserver/

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 67d762c68b8be9b7be9510fd333d5e662a235360
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 22:23:16 2013 +0200

Use PHP5API variable instead of hardcoded path to la file.

diff --git a/debian/changelog b/debian/changelog
index 1d4f91e..a11daae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Merge change from 6.0.1-4: Migrated to debhelper level 9.
   * Drop possible-gpl-code-linked-with-openssl lintian override.
   * Empty dependency_libs in la files.
+  * Use PHP5API variable instead of hardcoded path to la file.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/rules b/debian/rules
index 8429cd5..c432bd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 CURDIR := $(shell pwd)
 PYVERS=$(shell pyversions -r debian/control)
 RUBYVERS=1.8 1.9.1
-#PHP5API=$(shell php-config5 --phpapi)
+PHP5API=$(shell php-config5 --phpapi)
 
 # Configure config :
 # Not using non free libpdf
@@ -177,7 +177,7 @@ install-arch-stamp: build-arch
-find $(CURDIR)/debian/tmp/usr/bin -type f  -exec chrpath --delete {} \;
 
# remove la file in php ext dir
-   -$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/20090626/*.la
+   -$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/$(PHP5API)/*.la
 
# empty dependency_libs in la file
sed -i /dependency_libs/ s/'.*'/''/ 
$(CURDIR)/debian/tmp/usr/lib/libmapserver.la

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit d819bef321bb77578de90884924a65267b9bf170
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 22:05:48 2013 +0200

Merge change from 6.0.1-4: Migrated to debhelper level 9.

diff --git a/debian/changelog b/debian/changelog
index 82836df..188f04c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (6.2.1-3) UNRELEASED; urgency=low
+
+  * Merge change from 6.0.1-4: Migrated to debhelper level 9.
+
+ -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
+
 mapserver (6.2.1-2) unstable; urgency=low
 
   * Add patch php_segfault.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index ef1aae1..5c06887 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault 
aboudrea...@mapgears.com
 Standards-Version: 3.9.3
-Build-Depends: debhelper (= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
+Build-Depends: debhelper (= 9), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
  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~),
  ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 99939561813d1fa52d28ce5366ecd65def5de645
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 22:09:37 2013 +0200

Drop possible-gpl-code-linked-with-openssl lintian override.

diff --git a/debian/changelog b/debian/changelog
index 188f04c..a92a115 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapserver (6.2.1-3) UNRELEASED; urgency=low
 
   * Merge change from 6.0.1-4: Migrated to debhelper level 9.
+  * Drop possible-gpl-code-linked-with-openssl lintian override.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index 81b06de..000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-libmapscript-ruby1.8: possible-gpl-code-linked-with-openssl
-mapserver-bin: possible-gpl-code-linked-with-openssl
-php5-mapscript: possible-gpl-code-linked-with-openssl
-perl-mapscript: possible-gpl-code-linked-with-openssl
-cgi-mapserver: possible-gpl-code-linked-with-openssl
-python-mapscript: possible-gpl-code-linked-with-openssl
-libmapscript-ruby1.9.1: possible-gpl-code-linked-with-openss
diff --git a/debian/rules b/debian/rules
index 3644e6f..771c850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -219,11 +219,6 @@ binary-arch: install-arch
dh_python2 -ppython-mapscript
dh_compress -a
dh_link -a
-   # Overrides a mismatched error from lintian
-   for pkg in $$(cat debian/lintian-overrides|cut -d: -f1); do \
-   echo $$pkg: possible-gpl-code-linked-with-openssl 
debian/$$pkg.lintian-overrides; \
-   cat debian/$$pkg.lintian-overrides; \
-   done
dh_lintian -a
dh_strip -a
dh_fixperms -a

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 2519c987dddee42924f6840322e6c52409a7a356
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Jun 15 01:03:12 2013 +0200

Upload for Debian closes: #706157

diff --git a/debian/changelog b/debian/changelog
index 530cafd..86ef4d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 mapserver (6.2.1-3) UNRELEASED; urgency=low
 
+  * Upload for Debian closes: #706157
   * Merge changes from 6.0.1-4: 
 - Migrated to debhelper level 9.
 - Depend on PHP API version instead of libapache2-mod-php5.

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 56aa9870a3ef0442d8e3e9a5a8a80e9d86900af9
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 22:55:04 2013 +0200

Additional cleanup to allow building twice.

diff --git a/debian/changelog b/debian/changelog
index e3475da..3b2804f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Empty dependency_libs in la files.
   * Use PHP5API variable instead of hardcoded path to la file.
   * Remove RPATH from mapscript libraries.
+  * Additional cleanup to allow building twice.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/libmapserver.install b/debian/libmapserver.install
index 6546608..c5d9217 100644
--- a/debian/libmapserver.install
+++ b/debian/libmapserver.install
@@ -1 +1 @@
-usr/lib/libmapserver*.so*
\ No newline at end of file
+usr/lib/libmapserver*.so*
diff --git a/debian/rules b/debian/rules
index 03e637c..54fb3af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,12 +112,13 @@ clean-first-build:
[ ! -f $(CURDIR)/Makefile ] || $(MAKE) mapscriptvars 
touch mapscriptvars
[ ! -f $(CURDIR)/mapscript/perl/Makefile ] || $(MAKE) distclean -C 
$(CURDIR)/mapscript/perl
+   -$(RM) mapscript/perl/Makefile.PL
-cd mapscript/python  \
  for python in $(PYVERS); do $$python setup.py clean; done
-   -$(RM) -rf mapscript/python/build
+   -$(RM) -rf mapscript/python/build mapscript/python/Makefile
[ ! -f $(CURDIR)/mapscript/ruby/Makefile ] || $(MAKE) distclean -C 
$(CURDIR)/mapscript/ruby
-$(RM) -rf $(CURDIR)/mapscript/ruby/mapscript_wrap.c
-   -$(RM) mapscriptvars
+   -$(RM) mapscriptvars libtool
 
-$(RM)  mapscript/perl/mapscript.i \
mapscript/tcl/mapscript.i \

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 7b9c87512d9a7422bbf50dbb2178569a8f9c573d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Jun 15 00:43:03 2013 +0200

Use --install-layout=deb for python setup.py.

diff --git a/debian/changelog b/debian/changelog
index 637118a..11568c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Additional cleanup to allow building twice.
   * Remove unused shlibs:Depends.
   * shp2mysql was removed, no more perl in mapserver-bin.
+  * Use --install-layout=deb for python setup.py.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/rules b/debian/rules
index 6e04f1c..653e461 100755
--- a/debian/rules
+++ b/debian/rules
@@ -163,7 +163,7 @@ install-arch-stamp: build-arch
# Python mapscript
cd $(CURDIR)/mapscript/python  set -e ; \
  for python in $(PYVERS); do \
-   $$python setup.py install --root=$(CURDIR)/debian/python-mapscript 
; \
+   $$python setup.py install --install-layout=deb 
--root=$(CURDIR)/debian/python-mapscript ; \
  done
 
# Ruby mapscript

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 03e73edba3eeb41e9e6166d531b2acd81acdddbe
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Jun 15 00:51:46 2013 +0200

Drop debian-changes-6.2.1-1 from patch series.

diff --git a/debian/changelog b/debian/changelog
index 7c4affa..e64e5e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Update configure arguments (several no longer supported).
   * Add mapows-contenttype.patch to handle Content-Type headers with a
 charset appended.
+  * Drop debian-changes-6.2.1-1 from patch series.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index f4c9173..a986975 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 fixmapscriptvars.patch
 php_segfault
-debian-changes-6.2.1-1
 mapows-contenttype.patch

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 7cb27c5dd8d8753376f45403e05266abeecc6b05
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 23:36:33 2013 +0200

shp2mysql was removed, no more perl in mapserver-bin.

diff --git a/debian/changelog b/debian/changelog
index ef83912..637118a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Remove RPATH from mapscript libraries.
   * Additional cleanup to allow building twice.
   * Remove unused shlibs:Depends.
+  * shp2mysql was removed, no more perl in mapserver-bin.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/control b/debian/control
index 5840dcd..8024a76 100644
--- a/debian/control
+++ b/debian/control
@@ -88,8 +88,8 @@ Description: Python library for MapServer
 Package: mapserver-bin
 Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
-Suggests: libdbi-perl, perl-mapscript, python-mapscript, cgi-mapserver, 
mapserver-doc, php5-mapscript, shapelib
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: perl-mapscript, python-mapscript, cgi-mapserver, mapserver-doc, 
php5-mapscript, shapelib
 Description: MapServer utilities
  This package provides command-line utilities for MapServer.
  .
diff --git a/debian/rules b/debian/rules
index 54fb3af..6e04f1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -234,7 +234,6 @@ binary-arch: install-arch
dh_installdeb -a
dh_shlibdeps -a
dh_perl -plibmapscript-perl
-   dh_perl -pmapserver-bin
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 0cbd2ce17a9c792386c1eefabc12410c92bad269
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 22:48:58 2013 +0200

Bump libgeos-dev build dependency to 3.3.1-1~.

diff --git a/debian/changelog b/debian/changelog
index 34a4dae..e3475da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Merge changes from 6.0.1-4: 
 - Migrated to debhelper level 9.
 - Depend on PHP API version instead of libapache2-mod-php5.
+- Bump libgeos-dev build dependency to 3.3.1-1~.
   * Drop possible-gpl-code-linked-with-openssl lintian override.
   * Empty dependency_libs in la files.
   * Use PHP5API variable instead of hardcoded path to la file.
diff --git a/debian/control b/debian/control
index 6474d2f..2ffaefd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan 
Boudreault abou
 Standards-Version: 3.9.3
 Build-Depends: debhelper (= 9), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
  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.6-3~), python-all-dev (= 
2.6.6-3~), libgeos-dev (= 3.3.1-1~),
  ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
  sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
  libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, 
libreadline-dev, 

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit d57854d5888f8e8217f079f0d4e71a44dea09716
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 23:30:51 2013 +0200

Remove unused shlibs:Depends.

diff --git a/debian/changelog b/debian/changelog
index 3b2804f..ef83912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Use PHP5API variable instead of hardcoded path to la file.
   * Remove RPATH from mapscript libraries.
   * Additional cleanup to allow building twice.
+  * Remove unused shlibs:Depends.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/control b/debian/control
index 2ffaefd..5840dcd 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Description: Shared library for MapServer
 Package: libmapserver-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
 Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
 Description: Shared library for MapServer
  This package contains the shared library.
@@ -101,7 +101,7 @@ Description: MapServer utilities
 Package: mapserver-doc
 Section: doc
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
 Suggests: perl-mapscript, python-mapscript, php5-mapscript, cgi-mapserver
 Description: documentation for MapServer
  This package provides some brief documentation for MapServer.

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 41c3067eee836bdc44f4b124f22f6fd69f2548c0
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Jun 15 00:46:15 2013 +0200

Update configure arguments (several no longer supported).

diff --git a/debian/changelog b/debian/changelog
index 11568c3..7e656da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Remove unused shlibs:Depends.
   * shp2mysql was removed, no more perl in mapserver-bin.
   * Use --install-layout=deb for python setup.py.
+  * Update configure arguments (several no longer supported).
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/rules b/debian/rules
index 653e461..5544b0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,17 +24,12 @@ PHP5API=$(shell php-config5 --phpapi)
 
 
 COMMON_CONFIG= --prefix=/usr \
-   --without-tiff \
-   --without-pdf \
--with-gd=/usr \
--with-freetype=/usr \
--with-fribidi-config \
-   --with-zlib=/usr \
-   --with-xpm=/usr \
--with-gdal \
--with-ogr \
--with-proj \
-   --with-eppl \
--with-postgis \
--with-wcs \
--with-sos \
@@ -45,7 +40,6 @@ COMMON_CONFIG=--prefix=/usr \
--with-threads \
--with-geos \
--with-fastcgi \
-   --with-agg \
--with-php \
--with-cairo
 

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 3009140928dd0a9fbb43bc6933349ff16213367c
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jun 14 22:48:09 2013 +0200

Remove RPATH from mapscript libraries.

diff --git a/debian/changelog b/debian/changelog
index f8eea61..34a4dae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Drop possible-gpl-code-linked-with-openssl lintian override.
   * Empty dependency_libs in la files.
   * Use PHP5API variable instead of hardcoded path to la file.
+  * Remove RPATH from mapscript libraries.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/rules b/debian/rules
index 45ed9d7..03e637c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -174,7 +174,11 @@ install-arch-stamp: build-arch
  done
 
# removing embedded rpath in binaries
-   -find $(CURDIR)/debian/tmp/usr/bin -type f  -exec chrpath --delete {} \;
+   -find $(CURDIR)/debian/tmp/usr/bin -type f -not -name mapserver-config 
-exec chrpath --delete {} \;
+
+   # removing embedded rpath in libraries
+   -find $(CURDIR)/debian/python-mapscript/usr/ -name _mapscript.so -type 
f -exec chrpath --delete {} \;
+   -find $(CURDIR)/debian/libmapscript-ruby*/usr/lib/ruby/ -type f -exec 
chrpath --delete {} \;
 
# remove la file in php ext dir
-$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/$(PHP5API)/*.la

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 88a24c2f9259913913315ef2d294da32401b079f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Jun 15 00:49:29 2013 +0200

Add mapows-contenttype.patch to handle Content-Type headers with a charset 
appended.

diff --git a/debian/changelog b/debian/changelog
index 7e656da..7c4affa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * shp2mysql was removed, no more perl in mapserver-bin.
   * Use --install-layout=deb for python setup.py.
   * Update configure arguments (several no longer supported).
+  * Add mapows-contenttype.patch to handle Content-Type headers with a
+charset appended.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/patches/mapows-contenttype.patch 
b/debian/patches/mapows-contenttype.patch
new file mode 100644
index 000..78ffcca
--- /dev/null
+++ b/debian/patches/mapows-contenttype.patch
@@ -0,0 +1,16 @@
+Description: Handle Content-Type HTTP headers with a charset appended.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Bug: https://github.com/mapserver/mapserver/pull/4663
+Applied-Upstream: 6.2.2, 
https://github.com/mapserver/mapserver/commit/72a9a19831c2e434e7beb0fc55acadbfdc26cfd1
+Last-Update: 2013-06-04
+--- a/mapows.c
 b/mapows.c
+@@ -95,7 +95,7 @@ static int msOWSPreParseRequest(cgiReque
+ owsRequestObj *ows_request)
+ {
+   /* decide if KVP or XML */
+-  if (request-type == MS_GET_REQUEST || (request-type == MS_POST_REQUEST  
strcmp(request-contenttype, application/x-www-form-urlencoded)==0)) {
++  if (request-type == MS_GET_REQUEST || (request-type == MS_POST_REQUEST  
strncmp(request-contenttype, application/x-www-form-urlencoded, 
strlen(application/x-www-form-urlencoded)) == 0)) {
+ int i;
+ /* parse KVP parameters service, version and request */
+ for (i = 0; i  request-NumParams; ++i) {
diff --git a/debian/patches/series b/debian/patches/series
index 73cca95..f4c9173 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fixmapscriptvars.patch
 php_segfault
 debian-changes-6.2.1-1
+mapows-contenttype.patch

-- 
Mapserver

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

[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

2013-06-20 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 757bad7bddb7327ff451c531a5b421e57fb4ddf9
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Jun 15 00:55:02 2013 +0200

Update libgd build dependency to libgd-dev for the libgd2 transition, keep 
alternative to allow backports for wheezy with libgd2-xpm-dev.

diff --git a/debian/changelog b/debian/changelog
index e64e5e8..530cafd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Add mapows-contenttype.patch to handle Content-Type headers with a
 charset appended.
   * Drop debian-changes-6.2.1-1 from patch series.
+  * Update libgd build dependency to libgd-dev for the libgd2 transition,
+keep alternative to allow backports for wheezy with libgd2-xpm-dev.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/control b/debian/control
index 8024a76..c79a275 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project 
pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault 
aboudrea...@mapgears.com
 Standards-Version: 3.9.3
 Build-Depends: debhelper (= 9), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(= 1.1.4),
- libgd2-xpm-dev (= 2.0.1-10), libfreetype6-dev (= 2.0.9), libjpeg-dev, 
libgdal1-dev (=1.9.0), libproj-dev,
+ libgd-dev (= 2.1.0~rc1-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.3.1-1~),
  ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
  sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,

-- 
Mapserver

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