Author: nd-guest Date: 2008-04-12 22:10:37 +0000 (Sat, 12 Apr 2008) New Revision: 1518
Added: packages/osm2pgsql/trunk/debian/patches/ packages/osm2pgsql/trunk/debian/patches/00list packages/osm2pgsql/trunk/debian/patches/10-missing-includes.dpatch Modified: packages/osm2pgsql/trunk/debian/changelog packages/osm2pgsql/trunk/debian/compat packages/osm2pgsql/trunk/debian/control packages/osm2pgsql/trunk/debian/rules Log: Added patch to actually fix the FTBFS bug. Modified: packages/osm2pgsql/trunk/debian/changelog =================================================================== --- packages/osm2pgsql/trunk/debian/changelog 2008-04-12 13:37:33 UTC (rev 1517) +++ packages/osm2pgsql/trunk/debian/changelog 2008-04-12 22:10:37 UTC (rev 1518) @@ -1,3 +1,15 @@ +osm2pgsql (0.52.20080408-2) UNRELEASED; urgency=low + + * Added 10-missing-includes.dpatch to actually build with + gcc-4.3. Thanks Chris Lamb for the patch. (Closes: #475692) + * Added dpatch to Build-Depends in debian/control. + Added patch targets to debian/rules. + * Added a get-orig-source target to debian/rules to fetch upstream + source from svn repository. + * Bumped debhelper compatibility level to 5. + + -- Andreas Putzo <[EMAIL PROTECTED]> Sat, 12 Apr 2008 21:09:32 +0000 + osm2pgsql (0.52.20080408-1) unstable; urgency=low * New upstream snapshot. (Closes: #474846) Modified: packages/osm2pgsql/trunk/debian/compat =================================================================== --- packages/osm2pgsql/trunk/debian/compat 2008-04-12 13:37:33 UTC (rev 1517) +++ packages/osm2pgsql/trunk/debian/compat 2008-04-12 22:10:37 UTC (rev 1518) @@ -1 +1 @@ -4 +5 Modified: packages/osm2pgsql/trunk/debian/control =================================================================== --- packages/osm2pgsql/trunk/debian/control 2008-04-12 13:37:33 UTC (rev 1517) +++ packages/osm2pgsql/trunk/debian/control 2008-04-12 22:10:37 UTC (rev 1518) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian GIS Project <[email protected]> Uploaders: Andreas Putzo <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4), libbz2-dev, libgeos-dev, libpq-dev, libxml2-dev, proj +Build-Depends: debhelper (>= 5), dpatch, libbz2-dev, libgeos-dev, libpq-dev, libxml2-dev, proj Standards-Version: 3.7.3 Package: osm2pgsql Added: packages/osm2pgsql/trunk/debian/patches/00list =================================================================== --- packages/osm2pgsql/trunk/debian/patches/00list (rev 0) +++ packages/osm2pgsql/trunk/debian/patches/00list 2008-04-12 22:10:37 UTC (rev 1518) @@ -0,0 +1 @@ +10-missing-includes Added: packages/osm2pgsql/trunk/debian/patches/10-missing-includes.dpatch =================================================================== --- packages/osm2pgsql/trunk/debian/patches/10-missing-includes.dpatch (rev 0) +++ packages/osm2pgsql/trunk/debian/patches/10-missing-includes.dpatch 2008-04-12 22:10:37 UTC (rev 1518) @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-missing-includes.dpatch by Andreas Putzo <[EMAIL PROTECTED]> +## +## DP: Add missing includes to compile with gcc-4.3. Patch by Chris Lamb <[EMAIL PROTECTED]>. + [EMAIL PROTECTED]@ +diff -urNad osm2pgsql-0.52.20080408~/build_geometry.cpp osm2pgsql-0.52.20080408/build_geometry.cpp +--- osm2pgsql-0.52.20080408~/build_geometry.cpp 2007-12-10 22:02:04.000000000 +0000 ++++ osm2pgsql-0.52.20080408/build_geometry.cpp 2008-04-12 20:31:38.000000000 +0000 +@@ -22,6 +22,7 @@ + + #include <iostream> + #include <cstring> ++#include <cstdlib> + + #include <geos_c.h> + Property changes on: packages/osm2pgsql/trunk/debian/patches/10-missing-includes.dpatch ___________________________________________________________________ Name: svn:executable + * Modified: packages/osm2pgsql/trunk/debian/rules =================================================================== --- packages/osm2pgsql/trunk/debian/rules 2008-04-12 13:37:33 UTC (rev 1517) +++ packages/osm2pgsql/trunk/debian/rules 2008-04-12 22:10:37 UTC (rev 1518) @@ -4,6 +4,13 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpatch/dpatch.make + +SVNREPO := http://svn.openstreetmap.org/applications/utils/export/osm2pgsql +SVNREV := 7141 +VERSION := 0.52 +DATE := $(shell date +%Y%m%d) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -12,19 +19,34 @@ CFLAGS += -O2 endif +get-orig-source: + dh_testdir + test -d ../tarballs/. || mkdir -p ../tarballs + @echo Downloading osm2pgsql from ${SVNREPO} + svn export -r ${SVNREV} ${SVNREPO} ../tarballs/osm2pgsql-${VERSION}.${DATE}/ + @echo Building snapshot tarball. + tar czvf ../tarballs/osm2pgsql-${VERSION}.${DATE}.orig.tar.gz -C ../tarballs osm2pgsql-${VERSION}.${DATE} + @echo Cleaning up + rm -rf ../tarballs/osm2pgsql-${VERSION}.${DATE} + @echo . + @echo To update debian/changelog type + @echo dch -v ${VERSION}.${DATE}-1 + @echo . + configure: configure-stamp configure-stamp: dh_testdir touch configure-stamp -build: build-stamp +build: patch build-stamp build-stamp: configure-stamp dh_testdir $(MAKE) touch $@ -clean: +clean: clean-patched unpatch +clean-patched: dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -57,4 +79,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
