[SCM] mapserver branch, master, updated. upstream/6.2.0-41-gd43275e

2013-06-12 Thread Jerome Villeneuve Larouche
The following commit has been merged in the master branch:
commit 703c7438de6f2295e6715db72bd24e0bdc82dc83
Merge: a1d8f513c275a1fd216b17004a00287312e133d1 
0c336b08f0b2d11bf9fb8f30b3ed6f7e57d22e01
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Apr 25 12:50:48 2013 +

Merge commit 'upstream/6.2.1'


-- 
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.0-41-gd43275e

2013-06-12 Thread Jerome Villeneuve Larouche
The following commit has been merged in the master branch:
commit d43275ef2d800fbef3027ed6f0b2d78e7c466308
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Apr 25 13:19:01 2013 +

Removed mapscriptperllink patch

diff --git a/debian/changelog b/debian/changelog
index 7720e75..93e9090 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapserver (6.2.1-1) unstable; urgency=low
 
   * New Upstream release
+  * Removed mapscriptperllink patch
 
  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 25 Apr 2013 
08:53:21 -0400
 
diff --git a/debian/patches/mapscriptperllink b/debian/patches/mapscriptperllink
deleted file mode 100644
index 1f3c8dc..000
--- a/debian/patches/mapscriptperllink
+++ /dev/null
@@ -1,12 +0,0 @@
 a/mapscript/perl/Makefile.PL.in
-+++ b/mapscript/perl/Makefile.PL.in
-@@ -18,7 +18,8 @@
-
- $libs = STREAM;
- chomp $libs;
--$libs = -L$libdir -lmapserver;
-+# libmapserver.la not used here
-+$libs = -L$libdir -L$home/.libs -lmapserver;
-
- $static_libs = STREAM;
- chomp $static_libs;
diff --git a/debian/patches/series b/debian/patches/series
index 4856be3..8b1a364 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fixmapscriptvars.patch
-mapscriptperllink

-- 
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.0-41-gd43275e

2013-06-12 Thread Jerome Villeneuve Larouche
The following commit has been merged in the master branch:
commit 276607b802596f26848bc702520ab1d32949250d
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Apr 25 12:53:40 2013 +

New Upstream release

diff --git a/debian/changelog b/debian/changelog
index dc7fb6d..7720e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (6.2.1-1) unstable; urgency=low
+
+  * New Upstream release
+
+ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 25 Apr 2013 
08:53:21 -0400
+
 mapserver (6.2.0-2) unstable; urgency=low
 
   * Added heikolein's patch to link mapscript-perl to libmapserver

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