[SCM] rel2gpx branch, master, updated. 8d846f1eb5a17fef4b2a164fa995b61f1522fa63

[Andreas Tille]

The following commit has been merged in the master branch:
commit 8d846f1eb5a17fef4b2a164fa995b61f1522fa63
Author: Andreas Tille <tille at debian.org>
Date:   Sun Sep 15 19:24:26 2013 +0200

    The defined needs to stay but dereferencing is wrong (thanks to gregor herrmann <gregoa at debian.org> for the hint)

diff --git a/debian/patches/omit_defined.patch b/debian/patches/omit_defined.patch
index 8c2fdb2..24a338b 100644
--- a/debian/patches/omit_defined.patch
+++ b/debian/patches/omit_defined.patch
@@ -1,13 +1,15 @@
-Author: Andreas Tille <tille at debian.org>
-Date: Thu, 12 Sep 2013 21:34:03 +0200
-Description: Prevent useless warnings saying:
- 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 patch is unfortunately wrong
+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
@@ -16,17 +18,17 @@ Description: Prevent useless warnings saying:
     @{$self->{NID}} = reverse(@{$self->{NID}});
     @{$self->{wayIds}} = reverse(@{$self->{wayIds}});
 -   if (defined @{$self->{PREV}}){
-+   if (@{$self->{PREV}}){
++   if (defined $self->{PREV}){
        my @aTmp = (@{$self->{PREV}});
 -      if (defined @{$self->{NEXT}}){
-+      if (@{$self->{NEXT}}){
++      if (defined $self->{NEXT}){
           @{$self->{PREV}} = (@{$self->{NEXT}});
        }else{
           @{$self->{PREV}} = ();
        }
     }else{
 -      if (defined @{$self->{NEXT}}){
-+      if (@{$self->{NEXT}}){
++      if (defined $self->{NEXT}){
           @{$self->{PREV}} = (@{$self->{NEXT}});
        }else{
           @{$self->{PREV}} = ();
diff --git a/debian/patches/series b/debian/patches/series
index 4baf145..0112f64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-##omit_defined.patch
+omit_defined.patch
 properly_handle_distances.patch

-- 
create GPX-Tracks from OSM relation