Author: frankie Date: 2010-03-09 11:46:37 +0000 (Tue, 09 Mar 2010) New Revision: 2761
Added: packages/dans-gdal-scripts/trunk/debian/patches/ packages/dans-gdal-scripts/trunk/debian/patches/00list packages/dans-gdal-scripts/trunk/debian/patches/werror.dpatch Modified: packages/dans-gdal-scripts/trunk/debian/changelog packages/dans-gdal-scripts/trunk/debian/control packages/dans-gdal-scripts/trunk/debian/rules Log: Minor fix for FTBS on s390 and ia64. Modified: packages/dans-gdal-scripts/trunk/debian/changelog =================================================================== --- packages/dans-gdal-scripts/trunk/debian/changelog 2010-03-08 14:34:14 UTC (rev 2760) +++ packages/dans-gdal-scripts/trunk/debian/changelog 2010-03-09 11:46:37 UTC (rev 2761) @@ -1,3 +1,11 @@ +dans-gdal-scripts (0.16-2) unstable; urgency=medium + + * Added supoort for dpatch. + * Added a patch werror.dpatch to relax -Werror at compile time. + That prevented building on some archs. + + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 09 Mar 2010 12:40:37 +0100 + dans-gdal-scripts (0.16-1) unstable; urgency=low * New upstream release, with a new gdal_make_ndv_mask program. Modified: packages/dans-gdal-scripts/trunk/debian/control =================================================================== --- packages/dans-gdal-scripts/trunk/debian/control 2010-03-08 14:34:14 UTC (rev 2760) +++ packages/dans-gdal-scripts/trunk/debian/control 2010-03-09 11:46:37 UTC (rev 2761) @@ -3,7 +3,7 @@ Priority: extra Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 7), autotools-dev, libgdal1-dev, libproj-dev, libboost1.40-dev +Build-Depends: debhelper (>= 7), autotools-dev, libgdal1-dev, libproj-dev, libboost1.40-dev, dpatch Standards-Version: 3.8.4 Homepage: http://www.gina.alaska.edu/projects/gina-tools Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/dans-gdal-scripts/ Added: packages/dans-gdal-scripts/trunk/debian/patches/00list =================================================================== --- packages/dans-gdal-scripts/trunk/debian/patches/00list (rev 0) +++ packages/dans-gdal-scripts/trunk/debian/patches/00list 2010-03-09 11:46:37 UTC (rev 2761) @@ -0,0 +1 @@ +werror Added: packages/dans-gdal-scripts/trunk/debian/patches/werror.dpatch =================================================================== --- packages/dans-gdal-scripts/trunk/debian/patches/werror.dpatch (rev 0) +++ packages/dans-gdal-scripts/trunk/debian/patches/werror.dpatch 2010-03-09 11:46:37 UTC (rev 2761) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## werror.dpatch by Francesco Paolo Lovergine <fran...@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dans-gdal-scripts-0.16~/src/Makefile.in dans-gdal-scripts-0.16/src/Makefile.in +--- dans-gdal-scripts-0.16~/src/Makefile.in 2009-09-03 22:10:43.000000000 +0200 ++++ dans-gdal-scripts-0.16/src/Makefile.in 2010-03-09 12:45:27.000000000 +0100 +@@ -248,7 +248,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + with_gdal = @with_gdal@ +-AM_CPPFLAGS = @GDALCFLAGS@ -Wall -Wextra -Werror -O2 ++AM_CPPFLAGS = @GDALCFLAGS@ -Wall -Wextra -O2 + gdal_raw2geotiff_SOURCES = gdal_raw2geotiff.cc common.cc + gdal_dem2rgb_SOURCES = gdal_dem2rgb.cc common.cc georef.cc ndv.cc + gdal_list_corners_SOURCES = gdal_list_corners.cc common.cc polygon.cc polygon-rasterizer.cc debugplot.cc georef.cc mask.cc rectangle_finder.cc ndv.cc Property changes on: packages/dans-gdal-scripts/trunk/debian/patches/werror.dpatch ___________________________________________________________________ Added: svn:executable + * Modified: packages/dans-gdal-scripts/trunk/debian/rules =================================================================== --- packages/dans-gdal-scripts/trunk/debian/rules 2010-03-08 14:34:14 UTC (rev 2760) +++ packages/dans-gdal-scripts/trunk/debian/rules 2010-03-09 11:46:37 UTC (rev 2761) @@ -14,9 +14,9 @@ CROSS= --build $(DEB_BUILD_GNU_TYPE) endif +include /usr/share/dpatch/dpatch.make - -config.status: configure +config.status: patch configure dh_testdir # Add here commands to configure the package. ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -36,7 +36,7 @@ dh_auto_build touch $@ -clean: +clean: unpatch dh_testdir dh_testroot @@ -77,4 +77,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install patch unpatch _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
