[SCM] mapcache branch, master, updated. upstream/1.2.0-87-g555f286
The following commit has been merged in the master branch: commit 5dd993938b21610811412f4b27ab89c0c130db43 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Sep 12 20:28:05 2013 +0200 Update mapcache_seed_typo.patch headers, applied upstream. diff --git a/debian/patches/mapcache_seed_typo.patch b/debian/patches/mapcache_seed_typo.patch index 5f9a4c8..ddabea6 100644 --- a/debian/patches/mapcache_seed_typo.patch +++ b/debian/patches/mapcache_seed_typo.patch @@ -1,5 +1,7 @@ Description: Fix typo in mapcache_seed utility. Author: Bas Couwenberg sebas...@xs4all.nl +Bug: https://github.com/mapserver/mapcache/pull/83 +Applied-Upstream: https://github.com/mapserver/mapcache/commit/fd657d632d6f633d0d2d21ce4dfa7f3deb64944d Last-Update: 2013-07-23 --- a/util/mapcache_seed.c +++ b/util/mapcache_seed.c -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.2.0-87-g555f286
The following commit has been merged in the master branch: commit 555f2862830fd8fb2452175a0f80e33a01b61ab8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Sep 18 13:10:45 2013 +0200 Sync build dependencies with mapserver. diff --git a/debian/control b/debian/control index c07e6cf..52c6089 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault abou Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), libcurl4-gnutls-dev, libpng-dev, libjpeg-dev, zlib1g-dev (= 1.1.4), libgd-dev (= 2.1.0~rc1-2), libfreetype6-dev (= 2.0.9), - libgdal1-dev (=1.9.0), libproj-dev, libgeos-dev (= 3.3.1-1~), + libgdal1-dev (= 1.9.0), libproj-dev, libgeos-dev (= 3.3.1-1~), libfribidi-dev, libcairo2-dev, apache2-dev, dh-apache2, libfcgi-dev, libpcre3-dev, libpixman-1-dev, -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.2.0-87-g555f286
The following commit has been merged in the master branch: commit 2c2113b4706edbe5702b6c1ee70bbd18704124ff Merge: 5dd993938b21610811412f4b27ab89c0c130db43 0771daf41c345ea31ee8f1577601a21407e4dfea Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Sep 18 00:58:52 2013 +0200 Merge remote-tracking branch 'origin/master' into jessie Conflicts: debian/patches/mapcache_seed_typo.patch -- Packaging for MapCache ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
