[libxml-treebuilder-perl] 03/06: Drop local-entities.patch, merged upstream.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libxml-treebuilder-perl.

commit d90c889b0cadc509f77ab83d15368d6706a93e4e
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Dec 15 18:29:40 2013 +0100

    Drop local-entities.patch, merged upstream.
---
 debian/patches/local-entities.patch | 45 -------------------------------------
 debian/patches/series               |  1 -
 2 files changed, 46 deletions(-)

diff --git a/debian/patches/local-entities.patch b/debian/patches/local-entities.patch
deleted file mode 100644
index 4317c31..0000000
--- a/debian/patches/local-entities.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Fix local path resolution for external entities
-Origin: upstream, https://github.com/jfearn/XML-TreeBuilder/commit/d81004996dae0f123a77af2c79576e7977559dc0
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=90464
-Bug-Debian: http://bugs.debian.org/728885
-Last-Update: 2013-12-01
-
---- a/lib/XML/TreeBuilder.pm
-+++ b/lib/XML/TreeBuilder.pm
-@@ -10,6 +10,7 @@ use Carp;
- use IO::File;
- use XML::Catalog v1.0.1;
- use File::Basename;
-+use File::Spec;
- use vars qw(@ISA $VERSION);
- 
- $VERSION = '5.1';
-@@ -227,16 +228,19 @@ sub new {
-                         = fileparse($file);
-                     $base = $directories;
-                 }
--                elsif ( $sysid =~ /^file:/ ) {
--                    $sysid =~ s/^file:\/\///;
--                    my ( $filename, $directories, $suffix )
--                        = fileparse($sysid);
--                    $base = $directories;
--                }
-                 else {
--                    my ( $filename, $directories, $suffix )
--                        = fileparse($base);
--                    $file = "$directories$sysid";
-+                    $sysid =~ s/^file:\/\/// if ( $sysid =~ /^file:/ );
-+
-+                    if ( File::Spec->file_name_is_absolute($sysid) ) {
-+                        my ( $filename, $directories, $suffix )
-+                            = fileparse($sysid);
-+                        $base = $directories;
-+                    }
-+                    else {
-+                        my ( $filename, $directories, $suffix )
-+                            = fileparse($base);
-+                        $file = File::Spec->rel2abs( $sysid, $directories );
-+                    }
-                 }
-                 my $fh = new IO::File( $file, "r" );
-                 croak "$!" unless $fh;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 26d8d12..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-local-entities.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libxml-treebuilder-perl.git