[SCM] mapserver branch, wheezy, updated. upstream/6.0.1-35-g02769dd

2013-07-23 Thread Bas Couwenberg 
The following commit has been merged in the wheezy branch:
commit 7b3c0a996794d6c3d046278301fa70a71d1bc942
Author: Francesco Paolo Lovergine 
Date:   Mon Mar 12 20:25:37 2012 +0100

Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/mapserver

Conflicts:
debian/changelog

diff --git a/debian/rules b/debian/rules
index 76eeb08..3ba2baa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ COMMON_CONFIG=--prefix=/usr \
--with-threads \
--with-geos \
--with-fastcgi \
-   -with-agg \
+   --with-agg \
--with-experimental-png \
--with-cairo
 

-- 
Packaging for 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, wheezy, updated. upstream/6.0.1-35-g02769dd

2013-07-23 Thread Bas Couwenberg 
The following commit has been merged in the wheezy branch:
commit ddae968da8a16f331c91d93b19b3025048e7d890
Author: Francesco Paolo Lovergine 
Date:   Wed Mar 14 21:44:55 2012 +0100

Fixed #663875

Conflicts:
debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 865ca81..ed39861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapserver (6.0.1-4) unstable; urgency=low
+
+  * Fixed typo that prevented AGG use in debian/rules.
+(closes: #663875)
+
+ -- Francesco Paolo Lovergine   Wed, 14 Mar 2012 21:43:53 
+0100
+
 mapserver (6.0.1-3.2) unstable; urgency=low
 
   * Non-maintainer upload.

-- 
Packaging for 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, wheezy, updated. upstream/6.0.1-35-g02769dd

2013-07-23 Thread Bas Couwenberg 
The following commit has been merged in the wheezy branch:
commit 02769ddc212dff6c760b18a177ab21a69556946b
Author: Bas Couwenberg 
Date:   Wed Jul 24 00:06:27 2013 +0200

Update changelog for stable-proposed-updates.

diff --git a/debian/changelog b/debian/changelog
index bada3e7..6f7a5f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mapserver (6.0.1-4) unstable; urgency=low
+mapserver (6.0.1-4) stable-proposed-updates; urgency=low
 
   [ Francesco Paolo Lovergine ]
   * Fixed typo that prevented AGG use in debian/rules.
@@ -11,7 +11,7 @@ mapserver (6.0.1-4) unstable; urgency=low
   * Cherry pick fix for strict Content-Type matching from v6.2.1:
 
https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
 
- -- Francesco Paolo Lovergine   Wed, 14 Mar 2012 21:43:53 
+0100
+ -- Bas Couwenberg   Wed, 24 Jul 2013 00:05:08 +0200
 
 mapserver (6.0.1-3.2) unstable; urgency=low
 

-- 
Packaging for 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, wheezy, updated. upstream/6.0.1-35-g02769dd

2013-07-23 Thread Bas Couwenberg 
The following commit has been merged in the wheezy branch:
commit 41da88726d806600f704fc484f6ebbbfe1375e56
Author: Bas Couwenberg 
Date:   Tue Jul 23 23:41:19 2013 +0200

Link executables with -ldl. Thanks Colin Watson for the patch.

diff --git a/debian/changelog b/debian/changelog
index dfb6fbb..4b21a7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 mapserver (6.0.1-4) unstable; urgency=low
 
+  [ Francesco Paolo Lovergine ]
   * Fixed typo that prevented AGG use in debian/rules.
 (closes: #663875)
   * Migrated to debhelper level 9 and policy bumped to 3.9.3. 
 
+  [ Bas Couwenberg ]
+  * Link executables with -ldl. Thanks Colin Watson for the patch.
+(closes: #709186)
+
  -- Francesco Paolo Lovergine   Wed, 14 Mar 2012 21:43:53 
+0100
 
 mapserver (6.0.1-3.2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index f0aeb5b..640079f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,7 @@ MS_CXXFLAGS=$(MS_CFLAGS)
 
 configure-stamp:
dh_testdir
-   ./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" 
CXXFLAGS="$(MS_CXXFLAGS)"
+   ./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" 
CXXFLAGS="$(MS_CXXFLAGS)" XTRALIBS=-ldl
 
 
touch configure-stamp
@@ -67,7 +67,7 @@ configure-stamp:
 configure-php5-stamp: clean-first-build
dh_testdir
./configure $(COMMON_CONFIG) \
-   --with-php=/usr/include/php5  CFLAGS="$(MS_CFLAGS)" 
CXXFLAGS="$(MS_CXXFLAGS)"
+   --with-php=/usr/include/php5  CFLAGS="$(MS_CFLAGS)" 
CXXFLAGS="$(MS_CXXFLAGS)" XTRALIBS=-ldl
 
touch configure-php5-stamp
 

-- 
Packaging for 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, wheezy, updated. upstream/6.0.1-35-g02769dd

2013-07-23 Thread Bas Couwenberg 
The following commit has been merged in the wheezy branch:
commit 085279a1ce6af4e409e1f7068f1d51dc95b40834
Author: Bas Couwenberg 
Date:   Tue Jul 23 23:51:42 2013 +0200

Cherry pick fix for strict Content-Type matching from v6.2.1.

diff --git a/debian/changelog b/debian/changelog
index 4b21a7e..bada3e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mapserver (6.0.1-4) unstable; urgency=low
   [ Bas Couwenberg ]
   * Link executables with -ldl. Thanks Colin Watson for the patch.
 (closes: #709186)
+  * Cherry pick fix for strict Content-Type matching from v6.2.1:
+
https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
 
  -- Francesco Paolo Lovergine   Wed, 14 Mar 2012 21:43:53 
+0100
 
diff --git a/debian/patches/contenttype b/debian/patches/contenttype
new file mode 100644
index 000..9c5c4be
--- /dev/null
+++ b/debian/patches/contenttype
@@ -0,0 +1,21 @@
+Description: Fix parsing POST request when Content-Type has an encoding 
appended.
+Origin: 
https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
+Bug: https://github.com/mapserver/mapserver/pull/4585
+Last-Update 2013-05-09
+--- a/cgiutil.c2013-05-09 03:05:00.0 +0200
 b/cgiutil.c2013-05-09 03:07:25.0 +0200
+@@ -166,8 +166,12 @@
+ 
+ /* if the content_type is application/x-www-form-urlencoded, 
+we have to parse it like the QUERY_STRING variable */
+-if(strcmp(request->contenttype, "application/x-www-form-urlencoded") == 
0)   
+-{
++//if(strcmp(request->contenttype, "application/x-www-form-urlencoded") == 
0) {
++/*
++ * Cherry picked fix for strict Content-Type matching from:
++ * 
https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
++ */
++if(strncmp(request->contenttype, "application/x-www-form-urlencoded", 
strlen("application/x-www-form-urlencoded")) == 0) {
+   while( data_len > 0 && isspace(post_data[data_len-1]) )
+ post_data[--data_len] = '\0';
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d6df403..38b6725 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fixgeos
 php54
 multiarch-libgd
+contenttype

-- 
Packaging for 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, wheezy, updated. upstream/6.0.1-35-g02769dd

2013-07-23 Thread Bas Couwenberg 
The following commit has been merged in the wheezy branch:
commit c5b3ae0b8eb2f471373f6c751f3ffc4f8f41552d
Author: Francesco Paolo Lovergine 
Date:   Wed Mar 14 21:48:31 2012 +0100

Minor changes for policies.

Conflicts:
debian/changelog

diff --git a/debian/changelog b/debian/changelog
index ed39861..dfb6fbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapserver (6.0.1-4) unstable; urgency=low
 
   * Fixed typo that prevented AGG use in debian/rules.
 (closes: #663875)
+  * Migrated to debhelper level 9 and policy bumped to 3.9.3. 
 
  -- Francesco Paolo Lovergine   Wed, 14 Mar 2012 21:43:53 
+0100
 
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 12d012b..91ffced 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: devel
 Priority: optional
 Maintainer: Debian GIS Project 
 Uploaders: Francesco Paolo Lovergine , Alan Boudreault 

-Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev 
(>= 1.1.4),
+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.4.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,
diff --git a/debian/rules b/debian/rules
index 3ba2baa..f0aeb5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -236,7 +236,7 @@ binary-indep: install-indep
 binary-arch: install-arch
dh_testdir -a
dh_testroot -a
-   dh_install --autodest --list-missing --sourcedir=debian/tmp
+   dh_install --autodest --list-missing 
dh_installchangelogs -a HISTORY.TXT
dh_installdocs -a
dh_installexamples -a

-- 
Packaging for 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