Commit c091eed6 authored by Petter Reinholdtsen's avatar Petter Reinholdtsen Committed by Bas Couwenberg

Imported Debian patch 0.69-2

parent aaff8e1f
......@@ -6,32 +6,18 @@ debian-dist:
dpkg-buildpackage -rfakeroot -d -tc -us -uc
CLEANFILES = \
pinatest2_meta.txt \
pinatest2_rte.dbf \
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.shx \
pinatest2_wpt.shp \
pinatest2_wpt.shx
pinatest2_wpt.dbf \
pinatest2_trk.shx \
pinatest2_trk.shp \
pinatest2_trk.dbf \
pinatest2_rte.shx \
pinatest2_rte.shp \
pinatest2_rte.dbf \
pinatest2_meta.txt
GPX2SHP=src/gpx2shp
$(GPX2SHP):
$(MAKE) -C `dirname $(GPX2SHP)` `basename $(GPX2SHP)`
check: $(GPX2SHP)
$(GPX2SHP) || true
$(GPX2SHP) --version
......
......@@ -108,28 +108,16 @@ SUBDIRS = src man
EXTRA_DIST = gps2shp pinatest2.gpx debian develop
CLEANFILES = \
pinatest2_meta.txt \
pinatest2_rte.dbf \
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.shx \
pinatest2_wpt.shp \
pinatest2_wpt.shx
pinatest2_wpt.dbf \
pinatest2_trk.shx \
pinatest2_trk.shp \
pinatest2_trk.dbf \
pinatest2_rte.shx \
pinatest2_rte.shp \
pinatest2_rte.dbf \
pinatest2_meta.txt
GPX2SHP = src/gpx2shp
......@@ -519,8 +507,6 @@ uninstall-info: uninstall-info-recursive
debian-dist:
dpkg-buildpackage -rfakeroot -d -tc -us -uc
$(GPX2SHP):
$(MAKE) -C `dirname $(GPX2SHP)` `basename $(GPX2SHP)`
check: $(GPX2SHP)
$(GPX2SHP) || true
$(GPX2SHP) --version
......
This diff is collapsed.
This diff is collapsed.
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 <pere@debian.org> Sun, 5 Mar 2006 11:29:12 +0100
gpx2shp (0.69-1) unstable; urgency=low
* New upstream release.
......
Source: gpx2shp
Section: science
Priority: optional
Maintainer: Petter Reinholdtsen <pere@debian.org>
Build-Depends: debhelper (>= 4.0.0), proj, libexpat1-dev
Standards-Version: 3.6.1
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Petter Reinholdtsen <pere@debian.org>, Jon Saints <saintsjd@yahoo.com>
Build-Depends: debhelper (>= 4.0.0), dpatch, proj, libexpat1-dev
Standards-Version: 3.6.2
Package: gpx2shp
Architecture: any
......@@ -12,4 +13,5 @@ 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.
.
Homepage: http://gpx2shp.sourceforge.jp
......@@ -12,7 +12,7 @@ the terms of the GNU General Public License as published by the Free
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 @@ for more details.
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.
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_clean_check.dpatch by Petter Reinholdtsen <pere@hungry.com>
##
## 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
......@@ -24,7 +24,7 @@ else
CFLAGS += -O2
endif
config.status: configure
config.status: configure patch
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
......@@ -40,7 +40,8 @@ build-stamp: config.status
touch build-stamp
clean:
clean: doclean unpatch
doclean:
dh_testdir
dh_testroot
rm -f build-stamp
......@@ -54,7 +55,6 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
dh_clean
install: build
......@@ -97,3 +97,5 @@ binary-arch: build install
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
include /usr/share/dpatch/dpatch.make
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment