[SCM] Debian package checker branch, master, updated. 2.5.13-1-gd8979e5

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit d8979e550d1b4e803f731ae1343a75242d50a636
Author: Niels Thykier <niels@thykier.net>
Date:   Thu May 30 10:40:26 2013 +0200

    L::{Path,Util}: Remove deprecated methods
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 7adcfba..7ebaf25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lintian (2.5.14) UNRELEASED; urgency=low
+
+  * lib/Lintian/{Path,Util}.pm:
+    + [NT] Remove deprecated methods.
+
+ -- Niels Thykier <niels@thykier.net>  Thu, 30 May 2013 10:38:26 +0200
+
 lintian (2.5.13) unstable; urgency=low
 
   Upload to unstable.
diff --git a/lib/Lintian/Path.pm b/lib/Lintian/Path.pm
index 63bc261..d5f837d 100644
--- a/lib/Lintian/Path.pm
+++ b/lib/Lintian/Path.pm
@@ -228,11 +228,6 @@ sub is_dir { return $_[0]->_is_type ('d'); }
 sub is_file { return $_[0]->_is_type ('-') || $_[0]->_is_type ('h'); }
 sub is_regular_file  { return $_[0]->_is_type ('-'); }
 
-=item link_resolved
-
-Deprecated alias of link_normalized for << 2.5.13~.  This will go away
-in >= 2.5.14~.
-
 =item link_normalized
 
 Returns the target of the link normalized against it's directory name.
@@ -251,16 +246,8 @@ L<is_ancestor_of|Lintian::Util/is_ancestor_of(PARENTDIR, PATH)> for
 that.  If you must use this method, remember to check that the target
 is not a symlink (or if it is, that it can be resolved safely).
 
-This method was named link_resolved in Lintian << 2.5.13~.
-
 =cut
 
-sub link_resolved {
-    warnings::warnif('deprecated',
-                     'link_resolved was renamed to link_normalized');
-    goto \&link_normalized;
-}
-
 sub link_normalized {
     my ($self) = @_;
     return $self->{'link_target'} if exists $self->{'link_target'};
diff --git a/lib/Lintian/Util.pm b/lib/Lintian/Util.pm
index 1eb7b55..3c06a65 100644
--- a/lib/Lintian/Util.pm
+++ b/lib/Lintian/Util.pm
@@ -1128,31 +1128,8 @@ Examples:
   normalize_pkg_path('/usr/bin', '/../etc/passwd')
 
 
-The sub was named resolve_pkg_path in Lintian << 2.5.13~ and had its
-return value changed.
-
-=item resolve_pkg_path (CURDIR, DEST)
-
-Deprecated alias of normalize_pkg_path for << 2.5.13~.  This will go
-away in >= 2.5.14~.
-
-UPGRADING: resolve_pkg_path returns '.' for the root dir and C<q{}>
-for an "unsafe" path.  normalize_pkg_path returns C<q{}> for the root
-dir and C<undef> for an unsafe path (this is the same as
-L<link_resolved|Lintian::Path/link_resolved>.
-
 =cut
 
-sub resolve_pkg_path {
-    warnings::warnif('deprecated',
-                     'resolve_pkg_path was renamed to normalize_pkg_path');
-    my $ret = normalize_pkg_path(@_);
-    # Keep the old behaviour
-    return q{} unless defined($ret);
-    return q{.} if $ret eq q{};
-    return $ret;
-}
-
 sub normalize_pkg_path {
     my ($curdir, $dest) = @_;
     my (@cc, @dc);

-- 
Debian package checker