[SCM] mapserver branch, ubuntu/lucid, updated. upstream/6.2.0-51-g5682ba8

2013-06-12 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/lucid branch:
commit 6b5365fba50358f2ce6d831e5243b1b9d494da15
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Feb 7 14:24:58 2013 +

Added SVG Support

diff --git a/debian/changelog b/debian/changelog
index 56a44a3..4051231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (6.2.0-3~lucid4) lucid; urgency=high
+
+  * Added SVG support
+
+ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 07 Feb 2013 
09:10:12 -0500
+
 mapserver (6.2.0-3~lucid3) lucid; urgency=low
 
   * Updated control to use proj =4.8.0
diff --git a/debian/control b/debian/control
index 7b97640..6d765ea 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (= 8), libcurl4-gnutls-dev, 
libpng-dev, zlib1g-dev (=
  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, 
- libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev
+ libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev, libsvg-cairo
 Build-Conflicts: libcurl3-openssl-dev
 Homepage: http://www.mapserver.org
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
diff --git a/debian/rules b/debian/rules
index be2fd30..42aafdd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,8 @@ COMMON_CONFIG=--prefix=/usr \
--with-fastcgi \
--with-agg \
--with-php \
-   --with-cairo
+   --with-cairo \
+   --with-libsvg-cairo
 
 rstoptions=--stylesheet=mapscript.css --link-stylesheet 
 

-- 
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, ubuntu/lucid, updated. upstream/6.2.0-51-g5682ba8

2013-06-12 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/lucid branch:
commit 7518b6e36aebafc69e735daa23a91679813719c0
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Thu Nov 29 15:31:44 2012 +

Updated control to use proj =4.8.0

diff --git a/debian/changelog b/debian/changelog
index 921b11a..56a44a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (6.2.0-3~lucid3) lucid; urgency=low
+
+  * Updated control to use proj =4.8.0
+
+ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 29 Nov 2012 
10:13:56 -0500
+
 mapserver (6.2.0-3~lucid1) lucid; urgency=low
 
   * Launchpad build for Lucid
diff --git a/debian/control b/debian/control
index afb8344..7b97640 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 (= 8), 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,
+ libgd2-xpm-dev (= 2.0.1-10), libfreetype6-dev (= 2.0.9), libjpeg-dev, 
libgdal1-dev (=1.9.0), libproj-dev (=4.8.0),
  libpq-dev, php5-dev, swig, python-all (= 2.6), python-all-dev (= 2.6), 
libgeos-dev (= 3.2.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


[SCM] mapserver branch, ubuntu/lucid, updated. upstream/6.2.0-51-g5682ba8

2013-06-12 Thread Jerome Villeneuve Larouche
The following commit has been merged in the ubuntu/lucid branch:
commit 5682ba8926407f9f164f60e84702d5fab34167d4
Merge: 6b5365fba50358f2ce6d831e5243b1b9d494da15 
d43275ef2d800fbef3027ed6f0b2d78e7c466308
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date:   Wed Jun 5 18:28:18 2013 +

Merge branch 'master' into ubuntu/lucid

diff --combined debian/changelog
index 4051231,93e9090..0611601
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,9 +1,15 @@@
- mapserver (6.2.0-3~lucid4) lucid; urgency=high
++mapserver (6.2.1-2~lucid1) lucid; urgency=high
 +
-   * Added SVG support
- 
-  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 07 Feb 2013 
09:10:12 -0500
- 
- mapserver (6.2.0-3~lucid3) lucid; urgency=low
- 
-   * Updated control to use proj =4.8.0
++  * Launchpad build for Lucid
 +
-  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 29 Nov 2012 
10:13:56 -0500
++ -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 25 Apr 2013 
09:40:08 -0400
 +
- mapserver (6.2.0-3~lucid1) lucid; urgency=low
+ mapserver (6.2.1-1) unstable; urgency=low
  
-   * Launchpad build for Lucid
+   * New Upstream release
+   * Removed mapscriptperllink patch
  
-  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 22 Nov 2012 
16:16:47 -0500
+  -- Jerome Villeneuve Larouche jlarou...@mapgears.com  Thu, 25 Apr 2013 
08:53:21 -0400
  
  mapserver (6.2.0-2) unstable; urgency=low
  

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