The following commit has been merged in the ubuntu/precise branch:
commit 097dcb1ed1122606ac4edb8bbde111a05602f3de
Merge: 5059850cb6726c15dcf4fb39f8f618f38cf7d49b 
276607b802596f26848bc702520ab1d32949250d
Author: Jerome Villeneuve Larouche <jlarou...@mapgears.com>
Date:   Thu Apr 25 13:15:02 2013 +0000

    Merge branch 'master' into ubuntu/precise
    Removed mapscriptperllink patch

diff --combined debian/changelog
index e72da15,7720e75..6d8942e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,14 @@@
- mapserver (6.2.0-3~precise4) precise; urgency=high
++mapserver (6.2.1-2~precise2) precise; urgency=high
 +
-   * Added SVG support
- 
-  -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Thu, 07 Feb 2013 
08:51:56 -0500
- 
- mapserver (6.2.0-3~precise3) precise; urgency=low
- 
-   * Updated control to use proj >=4.8.0
++  * Launchpad build for Precise
 +
-  -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Mon, 03 Dec 2012 
18:51:42 -0500
++ -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Thu, 25 Apr 2013 
08:54:37 -0400
 +
- mapserver (6.2.0-3~precise1) precise; urgency=high
+ mapserver (6.2.1-1) unstable; urgency=low
  
-   * Launchpad build for Precise
+   * New Upstream release
  
-  -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Thu, 22 Nov 2012 
20:58:46 +0000
+  -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Thu, 25 Apr 2013 
08:53:21 -0400
  
  mapserver (6.2.0-2) unstable; urgency=low
  
diff --combined debian/patches/mapscriptperllink
index 1f3c8dc,1f3c8dc..0000000
deleted file mode 100644,100644
--- a/debian/patches/mapscriptperllink
+++ /dev/null
@@@ -1,12 -1,12 +1,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 --combined debian/patches/series
index 4856be3,4856be3..8b1a364
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,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

Reply via email to