[gpx2shp] 04/18: Imported Debian patch 0.69-1

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gpx2shp.

commit aaff8e1f739c7091e1e0f31e3938d1cd43c004c3
Merge: 2e2f146 4743c1d
Author: Petter Reinholdtsen <pere at debian.org>
Date:   Tue Feb 22 08:48:18 2005 +0100

    Imported Debian patch 0.69-1

 ChangeLog        |   59 +-
 Makefile.am      |   42 +-
 Makefile.in      |  258 ++-
 NEWS             |   15 +
 TODO             |    1 -
 aclocal.m4       |  233 ++-
 configure        | 1355 +++++++-----
 configure.ac     |    9 +-
 debian/changelog |   10 +
 gps2shp          |    4 +-
 man/Makefile.in  |  129 +-
 src/Makefile.in  |  189 +-
 src/config.h.in  |    3 -
 src/configure    | 6022 ------------------------------------------------------
 src/configure.ac |   43 -
 src/dbfopen.c    |   16 +-
 src/gpx2shp.h    |    2 +-
 src/main.c       |    5 +
 src/misc.c       |    4 +-
 src/setpath.c    |   28 -
 src/utils.c      |   13 -
 21 files changed, 1479 insertions(+), 6961 deletions(-)

diff --cc Makefile.am
index c5860c9,05f1ce1..a353a07
--- a/Makefile.am
+++ b/Makefile.am
@@@ -6,16 -6,22 +6,36 @@@ debian-dist
  	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
  
- check: src/gpx2shp
- 	src/gpx2shp -s pinatest2.gpx
+ GPX2SHP=src/gpx2shp
++$(GPX2SHP):
++	$(MAKE) -C `dirname $(GPX2SHP)` `basename $(GPX2SHP)`
+ check: $(GPX2SHP)
+ 	$(GPX2SHP) || true
+ 	$(GPX2SHP) --version
+ 	$(GPX2SHP) -s pinatest2.gpx
+ 	$(GPX2SHP) -e pinatest2.gpx
+ 	$(GPX2SHP) -p pinatest2.gpx
+ 	$(GPX2SHP) -v pinatest2.gpx > /dev/null
diff --cc Makefile.in
index e681c78,aa19324..0332283
--- a/Makefile.in
+++ b/Makefile.in
@@@ -80,17 -108,19 +108,31 @@@ SUBDIRS = src ma
  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
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@@ -411,9 -507,13 +519,15 @@@ uninstall-info: uninstall-info-recursiv
  
  debian-dist:
  	dpkg-buildpackage -rfakeroot -d -tc -us -uc
- 
- check: src/gpx2shp
- 	src/gpx2shp -s pinatest2.gpx
++$(GPX2SHP):
++	$(MAKE) -C `dirname $(GPX2SHP)` `basename $(GPX2SHP)`
+ check: $(GPX2SHP)
+ 	$(GPX2SHP) || true
+ 	$(GPX2SHP) --version
+ 	$(GPX2SHP) -s pinatest2.gpx
+ 	$(GPX2SHP) -e pinatest2.gpx
+ 	$(GPX2SHP) -p pinatest2.gpx
+ 	$(GPX2SHP) -v pinatest2.gpx > /dev/null
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --cc debian/changelog
index 94471f8,94471f8..bf9dc83
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,13 @@@
++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 <pere at debian.org>  Tue, 22 Feb 2005 08:48:18 +0100
++
  gpx2shp (0.68-1) unstable; urgency=low
  
    * New upstream version.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpx2shp.git