[SCM] rel2gpx branch, master, updated. upstream/0.26-19-gf26a10e

[Andreas Tille]

The following commit has been merged in the master branch:
commit ceb6c2fb0d1954421280cc24fa87c6bf9cca97b7
Author: Andreas Tille <tille at debian.org>
Date:   Mon Oct 21 21:00:28 2013 +0200

    Upstream incorporated Debian patches

diff --git a/debian/changelog b/debian/changelog
index 02845c7..e44beaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 rel2gpx (0.27-1) UNRELEASED; urgency=low
 
-  * New upstream version
+  * New upstream version (all patched incorporated)
   * debian/watch: Adapted to new upstream version, thanks to
     Bart Martens <bartm at debian.org> for the patch
   * debian/examples/get-jakobswege-in-deutschland: New usage
diff --git a/debian/patches/omit_defined.patch b/debian/patches/omit_defined.patch
deleted file mode 100644
index 24a338b..0000000
--- a/debian/patches/omit_defined.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: gregor herrmann <gregoa at debian.org>
-Date: Sat, 14 Sep 2013 14:28:02 +0200
-Description: Avoid dereferencing
- Perl says:
-   defined(@array) is deprecated at /usr/bin/rel2gpx line 669.
-           (Maybe you should just omit the defined()?)
-   defined(@array) is deprecated at /usr/bin/rel2gpx line 671.
-           (Maybe you should just omit the defined()?)
-   defined(@array) is deprecated at /usr/bin/rel2gpx line 677.
-           (Maybe you should just omit the defined()?)
- ... but this hint is wrong.  The defined needs to be kept but the
- dereferencing is wrong
-
---- rel2gpx.orig/rel2gpx.pl
-+++ rel2gpx/rel2gpx.pl
-@@ -666,15 +666,15 @@
-    @{$self->{LON}} = reverse(@{$self->{LON}});
-    @{$self->{NID}} = reverse(@{$self->{NID}});
-    @{$self->{wayIds}} = reverse(@{$self->{wayIds}});
--   if (defined @{$self->{PREV}}){
-+   if (defined $self->{PREV}){
-       my @aTmp = (@{$self->{PREV}});
--      if (defined @{$self->{NEXT}}){
-+      if (defined $self->{NEXT}){
-          @{$self->{PREV}} = (@{$self->{NEXT}});
-       }else{
-          @{$self->{PREV}} = ();
-       }
-    }else{
--      if (defined @{$self->{NEXT}}){
-+      if (defined $self->{NEXT}){
-          @{$self->{PREV}} = (@{$self->{NEXT}});
-       }else{
-          @{$self->{PREV}} = ();
diff --git a/debian/patches/properly_handle_distances.patch b/debian/patches/properly_handle_distances.patch
deleted file mode 100644
index 5a34f15..0000000
--- a/debian/patches/properly_handle_distances.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Date: Thu, 12 Sep 2013 21:34:03 +0200
-Description: according to http://wiki.openstreetmap.org/wiki/Walking_Routes:
- 'Given including a unit and with a dot for decimals. (e.g. "12.5km")'
- Prevent error when distances are properly specified
-
---- a/rel2gpx.pl
-+++ b/rel2gpx.pl
-@@ -1879,9 +1879,14 @@ sub loadOsm{
-          print "  ", $LH->maketext("Fehler: Relation [_1] existiert nicht", $relId), "\n";
-          next;
-       }
-+      # according to http://wiki.openstreetmap.org/wiki/Walking_Routes:
-+      # Given including a unit and with a dot for decimals. (e.g. "12.5km")
-+      if ($relDistance =~ /^([.\d]+)\s*km/) {
-+         $relDistance = $1;
-+      }
-       print $LH->maketext("Name:"),"     $relName\n";
-       print $LH->maketext("Ref: "),"     $relRef\n";
--      print $LH->maketext("Dist:"),"     $relDistance\n";
-+      print $LH->maketext("Dist:"),"     ${relDistance}km\n";
-       print "\n";
-       $fn = $relName;
-       $fn =~ tr/ /_/;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0112f64..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-omit_defined.patch
-properly_handle_distances.patch

-- 
create GPX-Tracks from OSM relation