[SCM] mapserver branch, master, updated. upstream/6.2.1-59-g9805d86
Bas Couwenberg
sebastic at xs4all.nl
Thu Jun 20 22:44:33 UTC 2013
The following commit has been merged in the master branch:
commit 9805d86ef8bca571b39ec54b71eb874786749d98
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jun 21 00:41:29 2013 +0200
Drop libgd2-xpm-dev alternative, libgd-dev is a virtual packge on wheezy.
diff --git a/debian/changelog b/debian/changelog
index 86ef4d4..aff0ab0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
* Add mapows-contenttype.patch to handle Content-Type headers with a
charset appended.
* Drop debian-changes-6.2.1-1 from patch series.
- * Update libgd build dependency to libgd-dev for the libgd2 transition,
- keep alternative to allow backports for wheezy with libgd2-xpm-dev.
+ * Update libgd build dependency to libgd-dev for the libgd2 transition.
-- Bas Couwenberg <sebastic at xs4all.nl> Fri, 14 Jun 2013 22:00:07 +0200
diff --git a/debian/control b/debian/control
index c79a275..eb5893c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>
Standards-Version: 3.9.3
Build-Depends: debhelper (>= 9), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= 1.1.4),
- libgd-dev (>= 2.1.0~rc1-2) | libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.9.0), libproj-dev,
+ libgd-dev (>= 2.1.0~rc1-2), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.9.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,
sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
--
Mapserver
More information about the Pkg-grass-devel
mailing list