This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository gpx2shp.
commit 7e287cf308c26c24e05a5189425c0c32ecf157b1 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed Oct 17 12:58:07 2007 +0200 Imported Debian patch 0.69-3 --- config.guess | 49 ++++++--- config.sub | 76 ++++++++----- debian/.svn/entries | 122 +++++++++++++++++++++ debian/.svn/format | 1 + debian/.svn/prop-base/changelog.svn-base | 9 ++ debian/.svn/prop-base/compat.svn-base | 9 ++ debian/.svn/prop-base/control.svn-base | 9 ++ debian/.svn/prop-base/copyright.svn-base | 9 ++ debian/.svn/prop-base/docs.svn-base | 9 ++ debian/.svn/prop-base/rules.svn-base | 13 +++ debian/.svn/prop-base/watch.svn-base | 9 ++ .../text-base/changelog.svn-base} | 11 ++ debian/.svn/text-base/compat.svn-base | 1 + .../{control => .svn/text-base/control.svn-base} | 6 +- debian/.svn/text-base/copyright.svn-base | 24 ++++ debian/.svn/text-base/docs.svn-base | 3 + debian/{rules => .svn/text-base/rules.svn-base} | 0 debian/.svn/text-base/watch.svn-base | 2 + debian/changelog | 12 ++ debian/compat | 2 +- debian/control | 6 +- debian/patches/.svn/entries | 67 +++++++++++ debian/patches/.svn/format | 1 + debian/patches/.svn/prop-base/00list.svn-base | 9 ++ .../.svn/prop-base/10_check_clean.dpatch.svn-base | 9 ++ .../.svn/prop-base/20_version_0.69.dpatch.svn-base | 5 + debian/patches/.svn/text-base/00list.svn-base | 2 + .../.svn/text-base/10_check_clean.dpatch.svn-base | 109 ++++++++++++++++++ .../.svn/text-base/20_version_0.69.dpatch.svn-base | 33 ++++++ debian/patches/00list | 1 + debian/patches/20_version_0.69.dpatch | 33 ++++++ debian/rules | 3 +- debian/watch | 9 +- 33 files changed, 604 insertions(+), 59 deletions(-) diff --git a/config.guess b/config.guess index c38553d..278f9e9 100644 --- a/config.guess +++ b/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2006-02-23' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -210,7 +212,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -328,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -770,6 +772,8 @@ EOF case ${UNAME_MACHINE} in pc98) echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac @@ -777,10 +781,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:MSYS_NT-*:*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[345]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -831,6 +835,9 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -947,6 +954,9 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -989,7 +999,7 @@ EOF LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -1205,6 +1215,15 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/config.sub b/config.sub index ad9f395..1761d8b 100644 --- a/config.sub +++ b/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2006-02-23' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -240,15 +241,16 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -274,21 +276,19 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -318,18 +318,18 @@ case $basic_machine in | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -358,23 +358,21 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -477,8 +475,8 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -685,6 +683,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -912,6 +914,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -923,6 +929,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1128,7 +1137,7 @@ case $basic_machine in sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1217,7 +1226,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1369,6 +1378,12 @@ else # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1378,9 +1393,9 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1406,6 +1421,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; diff --git a/debian/.svn/entries b/debian/.svn/entries new file mode 100644 index 0000000..f26b919 --- /dev/null +++ b/debian/.svn/entries @@ -0,0 +1,122 @@ +8 + +dir +673 +svn+ssh://svn.debian.org/svn/pkg-grass/packages/gpx2shp/debian +svn+ssh://svn.debian.org/svn/pkg-grass + + + +2006-03-11T04:49:56.000000Z +366 +pabs-guest + + +svn:special svn:externals svn:needs-lock + + + + + + + + + + + +220fd583-0115-0410-9793-b82d1709ac0f + +control +file +674 + + + +2007-03-28T18:56:29.000000Z +7ecf6de6cd51a3ff6646ffcb95c29417 +2007-03-28T19:06:23.790197Z +674 +frankie +has-props + +compat +file +674 + + + +2007-03-28T18:55:03.000000Z +1dcca23355272056f04fe8bf20edfce0 +2007-03-28T19:06:23.790197Z +674 +frankie +has-props + +watch +file +674 + + + +2007-03-28T19:05:07.000000Z +17b1427f8c0b04f648de5d64a83bae14 +2007-03-28T19:06:23.790197Z +674 +frankie +has-props + +patches +dir + +changelog +file +674 + + + +2007-03-28T19:05:32.000000Z +60bfca2f54b1317ea3255531a87abb8d +2007-03-28T19:06:23.790197Z +674 +frankie +has-props + +copyright +file + + + + +2007-03-28T18:37:20.000000Z +fe35dd98f2c2800f51840a41ebd2b5c4 +2006-03-05T10:46:36.000000Z +359 +pere +has-props + +docs +file + + + + +2007-03-28T18:37:20.000000Z +df4925b19d7b1a4890fd9f84446734b9 +2005-12-26T22:51:38.000000Z +241 +pere +has-props + +rules +file + + + + +2007-03-28T18:37:20.000000Z +4e56f159961159062b5941d4f30cfbad +2006-03-05T10:46:36.000000Z +359 +pere +has-props + diff --git a/debian/.svn/format b/debian/.svn/format new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/.svn/format @@ -0,0 +1 @@ +8 diff --git a/debian/.svn/prop-base/changelog.svn-base b/debian/.svn/prop-base/changelog.svn-base new file mode 100644 index 0000000..7b57b30 --- /dev/null +++ b/debian/.svn/prop-base/changelog.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:eol-style +V 6 +native +K 12 +svn:keywords +V 23 +Author Date Id Revision +END diff --git a/debian/.svn/prop-base/compat.svn-base b/debian/.svn/prop-base/compat.svn-base new file mode 100644 index 0000000..7b57b30 --- /dev/null +++ b/debian/.svn/prop-base/compat.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:eol-style +V 6 +native +K 12 +svn:keywords +V 23 +Author Date Id Revision +END diff --git a/debian/.svn/prop-base/control.svn-base b/debian/.svn/prop-base/control.svn-base new file mode 100644 index 0000000..7b57b30 --- /dev/null +++ b/debian/.svn/prop-base/control.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:eol-style +V 6 +native +K 12 +svn:keywords +V 23 +Author Date Id Revision +END diff --git a/debian/.svn/prop-base/copyright.svn-base b/debian/.svn/prop-base/copyright.svn-base new file mode 100644 index 0000000..7b57b30 --- /dev/null +++ b/debian/.svn/prop-base/copyright.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:eol-style +V 6 +native +K 12 +svn:keywords +V 23 +Author Date Id Revision +END diff --git a/debian/.svn/prop-base/docs.svn-base b/debian/.svn/prop-base/docs.svn-base new file mode 100644 index 0000000..7b57b30 --- /dev/null +++ b/debian/.svn/prop-base/docs.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:eol-style +V 6 +native +K 12 +svn:keywords +V 23 +Author Date Id Revision +END diff --git a/debian/.svn/prop-base/rules.svn-base b/debian/.svn/prop-base/rules.svn-base new file mode 100644 index 0000000..5336d10 --- /dev/null +++ b/debian/.svn/prop-base/rules.svn-base @@ -0,0 +1,13 @@ +K 13 +svn:eol-style +V 6 +native +K 14 +svn:executable +V 1 +* +K 12 +svn:keywords +V 23 +Author Date Id Revision +END diff --git a/debian/.svn/prop-base/watch.svn-base b/debian/.svn/prop-base/watch.svn-base new file mode 100644 index 0000000..7b57b30 --- /dev/null +++ b/debian/.svn/prop-base/watch.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:eol-style +V 6 +native +K 12 +svn:keywords +V 23 +Author Date Id Revision +END diff --git a/debian/changelog b/debian/.svn/text-base/changelog.svn-base similarity index 77% copy from debian/changelog copy to debian/.svn/text-base/changelog.svn-base index ecc2133..cd73474 100644 --- a/debian/changelog +++ b/debian/.svn/text-base/changelog.svn-base @@ -1,3 +1,14 @@ +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 + + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 28 Mar 2007 21:05:22 +0200 + gpx2shp (0.69-2) unstable; urgency=low [ Petter Reinholdtsen ] diff --git a/debian/.svn/text-base/compat.svn-base b/debian/.svn/text-base/compat.svn-base new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/.svn/text-base/compat.svn-base @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/.svn/text-base/control.svn-base similarity index 78% copy from debian/control copy to debian/.svn/text-base/control.svn-base index b57fa79..14a4cee 100644 --- a/debian/control +++ b/debian/.svn/text-base/control.svn-base @@ -2,9 +2,9 @@ Source: gpx2shp Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> -Uploaders: Petter Reinholdtsen <p...@debian.org>, Jon Saints <saint...@yahoo.com> -Build-Depends: debhelper (>= 4.0.0), dpatch, proj, libexpat1-dev -Standards-Version: 3.6.2 +Uploaders: Petter Reinholdtsen <p...@debian.org>, Jon Saints <saint...@yahoo.com>, Francesco Paolo Lovergine <fran...@debian.org> +Build-Depends: debhelper (>= 5), dpatch, proj, libexpat1-dev +Standards-Version: 3.7.2 Package: gpx2shp Architecture: any diff --git a/debian/.svn/text-base/copyright.svn-base b/debian/.svn/text-base/copyright.svn-base new file mode 100644 index 0000000..329cf6f --- /dev/null +++ b/debian/.svn/text-base/copyright.svn-base @@ -0,0 +1,24 @@ +This package was debianized by Petter Reinholdtsen <p...@debian.org> on +Sun, 12 Dec 2004 17:13:58 +0100. + +It was downloaded from <URL:http://sourceforge.jp/projects/gpx2shp/> + +Upstream Author: "HIRAOKA, Toshihiro" <washito...@yahoo.co.jp> + +License: + +gpx2shp is free software; you can redistribute it and/or modify it under +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. + +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. + +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., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301, USA. diff --git a/debian/.svn/text-base/docs.svn-base b/debian/.svn/text-base/docs.svn-base new file mode 100644 index 0000000..5502ed8 --- /dev/null +++ b/debian/.svn/text-base/docs.svn-base @@ -0,0 +1,3 @@ +NEWS +README +TODO diff --git a/debian/rules b/debian/.svn/text-base/rules.svn-base old mode 100755 new mode 100644 similarity index 100% copy from debian/rules copy to debian/.svn/text-base/rules.svn-base diff --git a/debian/.svn/text-base/watch.svn-base b/debian/.svn/text-base/watch.svn-base new file mode 100644 index 0000000..e210a16 --- /dev/null +++ b/debian/.svn/text-base/watch.svn-base @@ -0,0 +1,2 @@ +version=3 +http://keihanna.dl.sourceforge.jp/gpx2shp/12892/gpx2shp-([\d\.\-]+)\.tar\.gz diff --git a/debian/changelog b/debian/changelog index ecc2133..5edbd0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +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 <fran...@debian.org> Wed, 17 Oct 2007 12:58:07 +0200 + gpx2shp (0.69-2) unstable; urgency=low [ Petter Reinholdtsen ] diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index b57fa79..14a4cee 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: gpx2shp Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> -Uploaders: Petter Reinholdtsen <p...@debian.org>, Jon Saints <saint...@yahoo.com> -Build-Depends: debhelper (>= 4.0.0), dpatch, proj, libexpat1-dev -Standards-Version: 3.6.2 +Uploaders: Petter Reinholdtsen <p...@debian.org>, Jon Saints <saint...@yahoo.com>, Francesco Paolo Lovergine <fran...@debian.org> +Build-Depends: debhelper (>= 5), dpatch, proj, libexpat1-dev +Standards-Version: 3.7.2 Package: gpx2shp Architecture: any diff --git a/debian/patches/.svn/entries b/debian/patches/.svn/entries new file mode 100644 index 0000000..dc1be1c --- /dev/null +++ b/debian/patches/.svn/entries @@ -0,0 +1,67 @@ +8 + +dir +673 +svn+ssh://svn.debian.org/svn/pkg-grass/packages/gpx2shp/debian/patches +svn+ssh://svn.debian.org/svn/pkg-grass + + + +2006-03-05T10:46:36.000000Z +359 +pere + + +svn:special svn:externals svn:needs-lock + + + + + + + + + + + +220fd583-0115-0410-9793-b82d1709ac0f + +10_check_clean.dpatch +file + + + + +2007-03-28T18:37:20.000000Z +183fde2a61ab2369e85298dda17decdf +2005-12-26T23:06:51.000000Z +246 +pere +has-props + +20_version_0.69.dpatch +file +675 + + + +2007-03-28T18:53:30.000000Z +40a054dffa3a47265be2fa839ab7918b +2007-03-28T20:31:24.368078Z +675 +frankie +has-props + +00list +file +675 + + + +2007-03-28T20:28:33.000000Z +9825264b2e3f6d47d490cd8739a7ae7b +2007-03-28T20:31:24.368078Z +675 +frankie +has-props + diff --git a/debian/patches/.svn/format b/debian/patches/.svn/format new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/patches/.svn/format @@ -0,0 +1 @@ +8 diff --git a/debian/patches/.svn/prop-base/00list.svn-base b/debian/patches/.svn/prop-base/00list.svn-base new file mode 100644 index 0000000..7b57b30 --- /dev/null +++ b/debian/patches/.svn/prop-base/00list.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:eol-style +V 6 +native +K 12 +svn:keywords +V 23 +Author Date Id Revision +END diff --git a/debian/patches/.svn/prop-base/10_check_clean.dpatch.svn-base b/debian/patches/.svn/prop-base/10_check_clean.dpatch.svn-base new file mode 100644 index 0000000..7b57b30 --- /dev/null +++ b/debian/patches/.svn/prop-base/10_check_clean.dpatch.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:eol-style +V 6 +native +K 12 +svn:keywords +V 23 +Author Date Id Revision +END diff --git a/debian/patches/.svn/prop-base/20_version_0.69.dpatch.svn-base b/debian/patches/.svn/prop-base/20_version_0.69.dpatch.svn-base new file mode 100644 index 0000000..869ac71 --- /dev/null +++ b/debian/patches/.svn/prop-base/20_version_0.69.dpatch.svn-base @@ -0,0 +1,5 @@ +K 14 +svn:executable +V 1 +* +END diff --git a/debian/patches/.svn/text-base/00list.svn-base b/debian/patches/.svn/text-base/00list.svn-base new file mode 100644 index 0000000..9057be3 --- /dev/null +++ b/debian/patches/.svn/text-base/00list.svn-base @@ -0,0 +1,2 @@ +10_check_clean +20_version_0.69 diff --git a/debian/patches/.svn/text-base/10_check_clean.dpatch.svn-base b/debian/patches/.svn/text-base/10_check_clean.dpatch.svn-base new file mode 100644 index 0000000..2f90d07 --- /dev/null +++ b/debian/patches/.svn/text-base/10_check_clean.dpatch.svn-base @@ -0,0 +1,109 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_clean_check.dpatch by Petter Reinholdtsen <p...@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 + diff --git a/debian/patches/.svn/text-base/20_version_0.69.dpatch.svn-base b/debian/patches/.svn/text-base/20_version_0.69.dpatch.svn-base new file mode 100644 index 0000000..eb8b134 --- /dev/null +++ b/debian/patches/.svn/text-base/20_version_0.69.dpatch.svn-base @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_version_0.69.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 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"); diff --git a/debian/patches/00list b/debian/patches/00list index 34f678e..9057be3 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1,2 @@ 10_check_clean +20_version_0.69 diff --git a/debian/patches/20_version_0.69.dpatch b/debian/patches/20_version_0.69.dpatch new file mode 100644 index 0000000..eb8b134 --- /dev/null +++ b/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 <fran...@debian.org> +## +## 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"); diff --git a/debian/rules b/debian/rules index cd16a49..5677bb5 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,8 @@ doclean: rm -f build-stamp # Add here commands to clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean + ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif diff --git a/debian/watch b/debian/watch index b2b4ef5..e210a16 100644 --- a/debian/watch +++ b/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://keihanna.dl.sourceforge.jp/gpx2shp/12892/gpx2shp-([\d\.\-]+)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpx2shp.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel