r498: * Typo, Closes: #122679

   * Export dirname from Dh_Lib, and related cleanup, Closes: #125770
   * Document dirname, basename in PROGRAMMING

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index fd3c12ecf7e25af2bc2d23fe01bcc86e229e1c8c..588ea063cce39d687ef3e5239fd38c3038f712c4 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -12,7 +12,7 @@ use vars qw(@ISA @EXPORT %dh);
 @ISA=qw(Exporter);
 @EXPORT=qw(&init &doit &complex_doit &verbose_print &error &warning &tmpdir
            &pkgfile &pkgext &isnative &autoscript &filearray &GetPackages
-           &basename &xargs %dh &compat);
+           &basename &dirname &xargs %dh &compat);
 
 my $max_compat=3;
 

diff --git a/debian/changelog b/debian/changelog
index fee302f9ca871c1e80e272987b47d0b130912ef8..62afa777c6821ba83c7091b0b0c74632fa8a0cf8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 debhelper (3.0.52) unstable; urgency=low
 
   * Typo, Closes: #122679
-UNRELEASED
+  * Export dirname from Dh_Lib, and related cleanup, Closes: #125770
+  * Document dirname, basename in PROGRAMMING
 
  -- Joey Hess <joeyh@debian.org>  Thu,  6 Dec 2001 11:58:52 -0500
 

diff --git a/dh_installman b/dh_installman
index 7d4c349c8f8fcf523114ca8a85779cdd47fe75af..3882188b36d21d67c7f1e67b664467f3aae53a1b 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -79,7 +79,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
 
        foreach my $page (@manpages) {
-               my $basename=Debian::Debhelper::Dh_Lib::basename($page);
+               my $basename=basename($page);
 
                # Support compressed pages.
                my $gz='';
@@ -171,9 +171,9 @@ sub find_so_man {
        if ($l=~m/\.so\s+(.*)/) {
                my $solink=$1;
                # This test is here to prevent links like ... man8/../man8/foo.8
-               if (Debian::Debhelper::Dh_Lib::basename($File::Find::dir) eq
-                   Debian::Debhelper::Dh_Lib::dirname($solink)) {
-                       $solink=Debian::Debhelper::Dh_Lib::basename($solink);
+               if (basename($File::Find::dir) eq
+                   dirname($solink)) {
+                       $solink=basename($solink);
                }
                else {
                        $solink="../$solink";

diff --git a/dh_installmanpages b/dh_installmanpages
index 1f946739528269cd1035a18481c2731380c74947..9002094ccd341589df59d4be9bb7dee3e6881169 100755 (executable)
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -112,9 +112,9 @@ sub find_so_man {
        if ($l=~m/\.so\s+(.*)/) {
                my $solink=$1;
                # This test is here to prevent links like ... man8/../man8/foo.8
-               if (Debian::Debhelper::Dh_Lib::basename($File::Find::dir) eq
-                   Debian::Debhelper::Dh_Lib::dirname($solink)) {
-                       $solink=Debian::Debhelper::Dh_Lib::basename($solink);
+               if (basename($File::Find::dir) eq
+                   dirname($solink)) {
+                       $solink=basename($solink);
                }
                else {
                        $solink="../$solink";

diff --git a/dh_link b/dh_link
index 771eae0f412dfe4c804e8294a69ead8db280bb05..41754f5c24f500d3087c9a19ca77bea4a26104e6 100755 (executable)
--- a/dh_link
+++ b/dh_link
@@ -107,7 +107,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                $dest=~s:^/::;
 
                # Make sure the directory the link will be in exists.
-               my $basedir=Debian::Debhelper::Dh_Lib::dirname("$tmp/$dest");
+               my $basedir=dirname("$tmp/$dest");
                if (! -e $basedir) {
                        doit("install","-d",$basedir);
                }

diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index 69302d34268df98368b629daf37a674b636025f7..423d21edfb50e6992dcf82d637ea38af052c9931 100644 (file)
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -210,6 +210,10 @@ autoscript()
           (optional)
        This command automatically adds shell script snippets to a debian
        maintainer script (like the postinst or prerm).
+dirname()
+       Return directory part of pathname.
+basename()
+       Return base of pathname,
 
 -- Joey Hess <joeyh@debian.org>