The following commit has been merged in the ubuntu/quantal branch: commit 455e451cad981004cb7697daab3f8e2c0848f629 Author: Jerome Villeneuve Larouche <jlarou...@mapgears.com> Date: Thu Nov 22 21:11:40 2012 +0000
Merge branch 'master' into ubuntu/quantal diff --git a/debian/changelog b/debian/changelog index ebe0386..019e7ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +mapserver (6.2.0-3~quantal1) quantal; urgency=low + + * Launchpad Build for Quantal + + -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Thu, 22 Nov 2012 15:31:37 -0500 + +mapserver (6.2.0-2) unstable; urgency=low + + * Added heikolein's patch to link mapscript-perl to libmapserver + + -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Thu, 22 Nov 2012 15:21:55 -0500 + mapserver (6.2.0-2~quantal4) quantal; urgency=high * Launchpad build for Quantal diff --git a/debian/patches/mapscriptperllink b/debian/patches/mapscriptperllink new file mode 100644 index 0000000..1f3c8dc --- /dev/null +++ b/debian/patches/mapscriptperllink @@ -0,0 +1,12 @@ +--- 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 8b1a364..4856be3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 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