[SCM] mapserver branch, master, updated. upstream/6.0.1-29-g379df24
The following commit has been merged in the master branch: commit 379df247b85194039cd45d3c11da4981eb3bc3ec Author: Francesco Paolo Lovergine Date: Wed Mar 14 21:48:31 2012 +0100 Minor changes for policies. diff --git a/debian/changelog b/debian/changelog index 55aabda..83b2e3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mapserver (6.0.1-4) unstable; urgency=low * Fixed typo that prevented AGG use in debian/rules. (closes: #663875) * Now using libpng-dev as b-d. + * Migrated to debhelper level 9 and policy bumped to 3.9.3. -- Francesco Paolo Lovergine Wed, 14 Mar 2012 21:43:53 +0100 diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 9f7683e..73679f0 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: devel Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine , Alan Boudreault -Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= 1.1.4), +Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9), 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.4.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, diff --git a/debian/rules b/debian/rules index 3ba2baa..f0aeb5b 100755 --- a/debian/rules +++ b/debian/rules @@ -236,7 +236,7 @@ binary-indep: install-indep binary-arch: install-arch dh_testdir -a dh_testroot -a - dh_install --autodest --list-missing --sourcedir=debian/tmp + dh_install --autodest --list-missing dh_installchangelogs -a HISTORY.TXT dh_installdocs -a dh_installexamples -a -- 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.0.1-29-g379df24
The following commit has been merged in the master branch: commit d3373f80051daeb3d4257b5031e9d79d926627d1 Author: Francesco Paolo Lovergine Date: Wed Mar 14 21:44:55 2012 +0100 Fixed #663875 diff --git a/debian/changelog b/debian/changelog index 32f5798..55aabda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mapserver (6.0.1-4) unstable; urgency=low + + * Fixed typo that prevented AGG use in debian/rules. +(closes: #663875) + * Now using libpng-dev as b-d. + + -- Francesco Paolo Lovergine Wed, 14 Mar 2012 21:43:53 +0100 + mapserver (6.0.1-3) unstable; urgency=low * Let the configure script search in the system directory for jpeg stuff. diff --git a/debian/control b/debian/control index fafe3e6..9f7683e 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine , Alan Boudreault Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4), +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.4.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, -- 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.0.1-29-g379df24
The following commit has been merged in the master branch: commit 3429fb363584c4eae12ba8f95fbcd60a437ffbc7 Merge: bcf38f44911786075b8fc24569c593072f96d9b0 98327ede46bfa4cfb9db03113c41207203447f15 Author: Francesco Paolo Lovergine Date: Mon Mar 12 20:25:37 2012 +0100 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/mapserver Conflicts: debian/changelog diff --combined debian/rules index 4099358,76eeb08..3ba2baa --- a/debian/rules +++ b/debian/rules @@@ -34,7 -34,6 +34,6 @@@ COMMON_CONFIG=--prefix=/usr --with-fribidi-config \ --with-zlib=/usr \ --with-xpm=/usr \ - --with-jpeg=/usr \ --with-gdal \ --with-ogr \ --with-proj \ @@@ -49,7 -48,7 +48,7 @@@ --with-threads \ --with-geos \ --with-fastcgi \ - -with-agg \ + --with-agg \ --with-experimental-png \ --with-cairo -- 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.0.1-29-g379df24
The following commit has been merged in the master branch: commit bcf38f44911786075b8fc24569c593072f96d9b0 Author: Francesco Paolo Lovergine Date: Sat Mar 3 00:10:53 2012 +0100 AGG disabled by error. diff --git a/debian/changelog b/debian/changelog index 81af6d1..45154ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mapserver (6.0.1-3) unstable; urgency=low + + * Added usual Break/Provides/Replaces fields for upgrading perl-mapscript +to libmapscript-perl. + * Typo in debian/rules disabled AGG. + + -- Francesco Paolo Lovergine Sat, 24 Dec 2011 14:17:24 +0100 + mapserver (6.0.1-2) unstable; urgency=low * Added missed stuff for libmapscript-perl. diff --git a/debian/rules b/debian/rules index a04fff0..4099358 100755 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,7 @@ COMMON_CONFIG=--prefix=/usr \ --with-threads \ --with-geos \ --with-fastcgi \ - -with-agg \ + --with-agg \ --with-experimental-png \ --with-cairo -- 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
