The following commit has been merged in the master branch: commit 2ad7f30ffc7e28daa9fa5e564a54b87057fcfeb0 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Fri Mar 11 22:53:23 2011 +0100
Major packaging changes. diff --git a/debian/changelog b/debian/changelog index 0f80329..25ada9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ mapserver (5.6.6-1) unstable; urgency=low + [ Alan Boudreault ] * New upstream release some bug fixes. - -- Alan Boudreault <aboudrea...@mapgears.com> Tue, 18 Jan 2011 14:39:57 -0500 + [ Francesco Paolo Lovergine ] + * Moved to debian source 3.0 and quilt support. + * Policy bumped to 3.9.1 withous changes. + * Fixed Vcs-* fields in debian/control. + + -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 11 Mar 2011 22:50:39 +0100 mapserver (5.6.5-2) unstable; urgency=high diff --git a/debian/control b/debian/control index 4797405..3832da9 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: devel Priority: optional 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.0 -Build-Depends: debhelper (>= 7), dpatch, libcurl4-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4), +Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 7), libcurl4-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4), libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg62-dev, libgdal1-dev (>=1.4.0), libproj-dev, libpq-dev, php5-dev, swig, python-all, python-all-dev, python-central (>= 0.5), libgeos-dev (>= 2.2.3-2), ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, @@ -15,8 +15,8 @@ Build-Depends-Indep: python-docutils Build-Conflicts: libcurl3-openssl-dev XS-Python-Version: all Homepage: http://www.mapserver.org -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/mapserver/trunk -Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mapserver/trunk +Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git +Vcs-Git: git://git.debian.org/git/pkg-grass/mapserver.git Package: php5-mapscript Section: php diff --git a/debian/patches/00list b/debian/patches/series old mode 100755 new mode 100644 similarity index 100% rename from debian/patches/00list rename to debian/patches/series diff --git a/debian/patches/symbol_index_overflow.dpatch b/debian/patches/symbol_index_overflow old mode 100755 new mode 100644 similarity index 72% rename from debian/patches/symbol_index_overflow.dpatch rename to debian/patches/symbol_index_overflow index eda3c77..1d7c38f --- a/debian/patches/symbol_index_overflow.dpatch +++ b/debian/patches/symbol_index_overflow @@ -1,14 +1,8 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## symbol_index_overflow.dpatch by Alan Boudreault <aboudrea...@mapgears.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mapserver-5.6.5~/mapdraw.c mapserver-5.6.5/mapdraw.c ---- mapserver-5.6.5~/mapdraw.c 2010-07-14 05:36:48.000000000 -0400 -+++ mapserver-5.6.5/mapdraw.c 2011-01-06 11:54:27.000000000 -0500 -@@ -1408,6 +1408,10 @@ +Index: mapserver/mapdraw.c +=================================================================== +--- mapserver.orig/mapdraw.c 2011-03-09 21:27:34.000000000 +0100 ++++ mapserver/mapdraw.c 2011-03-11 22:42:06.000000000 +0100 +@@ -1421,6 +1421,10 @@ nStatus = MS_FAILURE; } */ @@ -19,9 +13,10 @@ diff -urNad mapserver-5.6.5~/mapdraw.c mapserver-5.6.5/mapdraw.c #endif else { -diff -urNad mapserver-5.6.5~/mapfile.c mapserver-5.6.5/mapfile.c ---- mapserver-5.6.5~/mapfile.c 2010-06-23 13:41:14.000000000 -0400 -+++ mapserver-5.6.5/mapfile.c 2011-01-06 11:55:26.000000000 -0500 +Index: mapserver/mapfile.c +=================================================================== +--- mapserver.orig/mapfile.c 2011-03-09 21:27:34.000000000 +0100 ++++ mapserver/mapfile.c 2011-03-11 22:42:06.000000000 +0100 @@ -4911,6 +4911,10 @@ return MS_FAILURE; } @@ -52,9 +47,10 @@ diff -urNad mapserver-5.6.5~/mapfile.c mapserver-5.6.5/mapfile.c } } -diff -urNad mapserver-5.6.5~/mapserver.h mapserver-5.6.5/mapserver.h ---- mapserver-5.6.5~/mapserver.h 2010-07-14 05:45:57.000000000 -0400 -+++ mapserver-5.6.5/mapserver.h 2011-01-06 11:54:27.000000000 -0500 +Index: mapserver/mapserver.h +=================================================================== +--- mapserver.orig/mapserver.h 2011-03-09 21:27:34.000000000 +0100 ++++ mapserver/mapserver.h 2011-03-11 22:42:06.000000000 +0100 @@ -373,6 +373,8 @@ #define MS_REFCNT_DECR_IS_NOT_ZERO(obj) (MS_REFCNT_DECR(obj))>0 #define MS_REFCNT_DECR_IS_ZERO(obj) (MS_REFCNT_DECR(obj))<=0 diff --git a/debian/rules b/debian/rules index e87e0e1..053d1ad 100755 --- a/debian/rules +++ b/debian/rules @@ -59,14 +59,14 @@ rstoptions=--stylesheet=mapscript.css --link-stylesheet MS_CFLAGS=-g -O2 MS_CXXFLAGS=$(MS_CFLAGS) -configure-stamp: patch +configure-stamp: dh_testdir ./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)" touch configure-stamp -configure-php5-stamp: patch clean-first-build +configure-php5-stamp: clean-first-build dh_testdir ./configure $(COMMON_CONFIG) \ --with-php=/usr/include/php5 CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)" @@ -145,14 +145,14 @@ clean-first-build: [ ! -f $(CURDIR)/Makefile ] || $(MAKE) distclean - # Remove some generated files until 50_clean.dpatch is applied upstream. + # Remove some generated files -$(RM) Makefile mapscript/java/Makefile -$(RM) mapscript/csharp/Makefile mapscript/php3/Makefile -$(RM) config.log config.status -$(RM) debian/.#* .#* -clean: unpatch clean-first-build +clean: clean-first-build dh_testdir dh_prep -$(RM) configure-php5-stamp build-php5-stamp install-arch-stamp install-indep-stamp install-php5-stamp @@ -268,4 +268,3 @@ binary: binary-indep binary-arch .PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-indep install-arch -include /usr/share/dpatch/dpatch.make diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Mapserver _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel