--- gpx2shp-0.69.orig/debian/watch +++ gpx2shp-0.69/debian/watch @@ -1,7 +1,2 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# Site Directory Pattern Version Script -version=2 - -http://sourceforge.jp /projects/gpx2shp/files/ gpx2shp-(.*)\.tar\.gz debian uupdate +version=3 +http://sourceforge.jp/projects/gpx2shp/releases/ /projects/gpx2shp/downloads/\d+/gpx2shp-([\d\.\-]+)\.tar\.gz --- gpx2shp-0.69.orig/debian/changelog +++ gpx2shp-0.69/debian/changelog @@ -1,3 +1,64 @@ +gpx2shp (0.69-4) unstable; urgency=low + + [ Francesco Paolo Lovergine ] + * Fixed watch file. + + [ Petter Reinholdtsen ] + * Add Vcs-Browser and Vcs-Svn values to control file. + * Add Homepage URL to control file (Closes: #615423). + * Updated Standards-Version 3.9.4 from 3.7.2. + * Switch to debhelper 8 and dh. + * Build-depend on and use dh_autoreconf to work on + hurd-i386 (Closes: #677941). + + -- Petter Reinholdtsen Fri, 28 Jun 2013 00:12:13 +0200 + +gpx2shp (0.69-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "Build-depend on obsolete proj package": build-depend on libproj-dev + instead, thanks to Luca Falavigna. + (Closes: #674761) + + -- gregor herrmann Mon, 11 Jun 2012 17:19:44 +0200 + +gpx2shp (0.69-3) unstable; urgency=low + + * Added patch: 20_version_0.69.dpatch to fix the ugly program versioning + (closes: #310079) + * Policy bumped to 3.7.2, no changes + * Debhelper compatibility changed to 5 and debian/control updated as consequence + * Added me as Uploader + * Fixed watch file + * Fixed lintian error: debian-rules-ignores-make-clean-error + + -- Francesco Paolo Lovergine Wed, 17 Oct 2007 12:58:07 +0200 + +gpx2shp (0.69-2) unstable; urgency=low + + [ Petter Reinholdtsen ] + * Make package group maintained by the Debian GIS Project. + * Add new co-maintainer Jon Saints as uploader. + * Start using dpatch, and add it to build-depends. + * Move patch to Makefile.am into new patch 10_check_clean.dpatch. + * Increased standard-version from 3.6.1 to 3.6.2 (no changes). + * Updated FSF address in debian/copyright. + + [ Paul Wise ] + * Add the homepage to the package description + + -- Petter Reinholdtsen Sun, 5 Mar 2006 11:29:12 +0100 + +gpx2shp (0.69-1) unstable; urgency=low + + * New upstream release. + - Fix segfault when only -v is used on the command line (Closes: #292614) + * Patched Makefile.am to make sure 'make check' work out of the box, + and to make sure the files generated by 'make check' are removed on + 'make clean'. + + -- Petter Reinholdtsen Tue, 22 Feb 2005 08:48:18 +0100 + gpx2shp (0.68-1) unstable; urgency=low * New upstream version. --- gpx2shp-0.69.orig/debian/rules +++ gpx2shp-0.69/debian/rules @@ -1,99 +1,12 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/dpatch/dpatch.make +build: patch-stamp + dh build --with autoreconf -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +clean: unpatch + dh clean --with autoreconf - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -config.status: configure - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info - - -build: build-stamp - -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) all check - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/gpx2shp. - $(MAKE) install DESTDIR=$(CURDIR)/debian/gpx2shp - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installmime -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ --with autoreconf --- gpx2shp-0.69.orig/debian/control +++ gpx2shp-0.69/debian/control @@ -1,15 +1,18 @@ Source: gpx2shp Section: science Priority: optional -Maintainer: Petter Reinholdtsen -Build-Depends: debhelper (>= 4.0.0), proj, libexpat1-dev -Standards-Version: 3.6.1 +Maintainer: Debian GIS Project +Uploaders: Petter Reinholdtsen , Jon Saints , Francesco Paolo Lovergine +Build-Depends: debhelper (>= 8), dh-autoreconf, dpatch, libproj-dev, libexpat1-dev +Standards-Version: 3.9.4 +Homepage: http://gpx2shp.sourceforge.jp +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-grass/packages/gpx2shp +Vcs-Svn: svn://anonsvn.debian.org/pkg-grass/packages/gpx2shp Package: gpx2shp Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: convert GPS or GPX file to ESRI Shape file Convert GPS or GPX file to ESRI/Shape file. Include the tools gps2shp and gpx2shp. These are very useful when using collected GPS points with existing GIS tools like qgis and GRASS. - --- gpx2shp-0.69.orig/debian/copyright +++ gpx2shp-0.69/debian/copyright @@ -12,7 +12,7 @@ Software Foundation; either version 2, or (at your option) any later version. -Bash is distributed in the hope that it will be useful, but WITHOUT +gpx2shp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -20,5 +20,5 @@ You should have received a copy of the GNU General Public License with your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with the Debian GNU/Linux gpx2shp source package as the file COPYING. If not, -write to the Free Software Foundation, Inc., 59 Temple Place - Suite -330, Boston, MA 02111-1307, USA. +write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301, USA. --- gpx2shp-0.69.orig/debian/compat +++ gpx2shp-0.69/debian/compat @@ -1 +1 @@ -4 +8 --- gpx2shp-0.69.orig/debian/patches/20_version_0.69.dpatch +++ gpx2shp-0.69/debian/patches/20_version_0.69.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_version_0.69.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gpx2shp-0.69~/src/gpx2shp.h gpx2shp-0.69/src/gpx2shp.h +--- gpx2shp-0.69~/src/gpx2shp.h 2007-03-28 20:50:54.000000000 +0200 ++++ gpx2shp-0.69/src/gpx2shp.h 2007-03-28 20:53:24.000000000 +0200 +@@ -1,7 +1,9 @@ + #ifndef GPX2SHP_H_INCLUDED + #define GPX2SHP_H_INCLUDED + +-#define PROG gpx2shp ++#define PROG "gpx2shp" ++#define PROG_VERSION "0.69" ++ + #define FILENAMELENGTH 255 /* 255 is max length for dbf string column */ + #define COMMENTLENGTH 255 /* 255 is max length for dbf string column */ + #define NAMELENGTH 32 +diff -urNad gpx2shp-0.69~/src/main.c gpx2shp-0.69/src/main.c +--- gpx2shp-0.69~/src/main.c 2005-02-06 15:38:38.000000000 +0100 ++++ gpx2shp-0.69/src/main.c 2007-03-28 20:53:04.000000000 +0200 +@@ -11,7 +11,7 @@ + */ + void version(void) + { +- fprintf(stdout, "gpx2shp 0.68\n"); ++ fprintf(stdout, "%s %s\n",PROG,PROG_VERSION); + fprintf(stdout, "\n"); + fprintf(stdout, "by Toshihiro Hiraoka\n"); + fprintf(stdout, " Petter Reinholdtsen\n"); --- gpx2shp-0.69.orig/debian/patches/10_check_clean.dpatch +++ gpx2shp-0.69/debian/patches/10_check_clean.dpatch @@ -0,0 +1,109 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_clean_check.dpatch by Petter Reinholdtsen +## +## All lines beginning with `## DP:' are a description of the patch. +## +## DP: Make sure 'make check' work out of the box, and make sure 'make +## DP: clean' cleans up after the 'check' target. + +@DPATCH@ + +This is the proper change: + +--- gpx2shp-0.69.orig/Makefile.am ++++ gpx2shp-0.69/Makefile.am +@@ -6,18 +6,32 @@ + dpkg-buildpackage -rfakeroot -d -tc -us -uc + + CLEANFILES = \ +- pinatest2_wpt.shx \ +- pinatest2_wpt.shp \ +- pinatest2_wpt.dbf \ +- pinatest2_trk.shx \ +- pinatest2_trk.shp \ +- pinatest2_trk.dbf \ +- pinatest2_rte.shx \ +- pinatest2_rte.shp \ ++ pinatest2_meta.txt \ + pinatest2_rte.dbf \ +- pinatest2_meta.txt ++ pinatest2_rte.shp \ ++ pinatest2_rte.shx \ ++ pinatest2_rte_edg.dbf \ ++ pinatest2_rte_edg.shp \ ++ pinatest2_rte_edg.shx \ ++ pinatest2_rte_pnt.dbf \ ++ pinatest2_rte_pnt.shp \ ++ pinatest2_rte_pnt.shx \ ++ pinatest2_trk.dbf \ ++ pinatest2_trk.shp \ ++ pinatest2_trk.shx \ ++ pinatest2_trk_edg.dbf \ ++ pinatest2_trk_edg.shp \ ++ pinatest2_trk_edg.shx \ ++ pinatest2_trk_pnt.dbf \ ++ pinatest2_trk_pnt.shp \ ++ pinatest2_trk_pnt.shx \ ++ pinatest2_wpt.dbf \ ++ pinatest2_wpt.shp \ ++ pinatest2_wpt.shx + + GPX2SHP=src/gpx2shp ++$(GPX2SHP): ++ $(MAKE) -C `dirname $(GPX2SHP)` `basename $(GPX2SHP)` + check: $(GPX2SHP) + $(GPX2SHP) || true + $(GPX2SHP) --version + +This change is generated by automake: + +--- gpx2shp-0.69.orig/Makefile.in ++++ gpx2shp-0.69/Makefile.in +@@ -108,16 +108,28 @@ + EXTRA_DIST = gps2shp pinatest2.gpx debian develop + + CLEANFILES = \ +- pinatest2_wpt.shx \ +- pinatest2_wpt.shp \ +- pinatest2_wpt.dbf \ +- pinatest2_trk.shx \ +- pinatest2_trk.shp \ +- pinatest2_trk.dbf \ +- pinatest2_rte.shx \ +- pinatest2_rte.shp \ ++ pinatest2_meta.txt \ + pinatest2_rte.dbf \ +- pinatest2_meta.txt ++ pinatest2_rte.shp \ ++ pinatest2_rte.shx \ ++ pinatest2_rte_edg.dbf \ ++ pinatest2_rte_edg.shp \ ++ pinatest2_rte_edg.shx \ ++ pinatest2_rte_pnt.dbf \ ++ pinatest2_rte_pnt.shp \ ++ pinatest2_rte_pnt.shx \ ++ pinatest2_trk.dbf \ ++ pinatest2_trk.shp \ ++ pinatest2_trk.shx \ ++ pinatest2_trk_edg.dbf \ ++ pinatest2_trk_edg.shp \ ++ pinatest2_trk_edg.shx \ ++ pinatest2_trk_pnt.dbf \ ++ pinatest2_trk_pnt.shp \ ++ pinatest2_trk_pnt.shx \ ++ pinatest2_wpt.dbf \ ++ pinatest2_wpt.shp \ ++ pinatest2_wpt.shx + + + GPX2SHP = src/gpx2shp +@@ -507,6 +519,8 @@ + + debian-dist: + dpkg-buildpackage -rfakeroot -d -tc -us -uc ++$(GPX2SHP): ++ $(MAKE) -C `dirname $(GPX2SHP)` `basename $(GPX2SHP)` + check: $(GPX2SHP) + $(GPX2SHP) || true + $(GPX2SHP) --version + --- gpx2shp-0.69.orig/debian/patches/00list +++ gpx2shp-0.69/debian/patches/00list @@ -0,0 +1,2 @@ +10_check_clean +20_version_0.69