tags 278495 patch
thanks

Hi folks,

I've prepared an NMU for this bug with the attached patch (should look
familiar), and will be uploading shortly.

-release, please consider doc-base 0.7.18-0.1 for sarge.

Thanks,
-- 
Steve Langasek
postmodern programmer
diff -Nru /var/tmp/01YrgvV4q7/doc-base-0.7.18/debian/changelog 
/var/tmp/RqTMmGK6ub/doc-base-0.7.18/debian/changelog
--- /var/tmp/01YrgvV4q7/doc-base-0.7.18/debian/changelog        2003-03-30 
09:14:12.000000000 -0800
+++ /var/tmp/RqTMmGK6ub/doc-base-0.7.18/debian/changelog        2005-05-12 
17:35:41.000000000 -0700
@@ -1,3 +1,13 @@
+doc-base (0.7.18-0.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for sarge-targetted RC bugfix
+  * Fix install-docs to not require perl's File::Basename, so that it
+    works even when perl is unconfigured.  Thanks to Colin Watson for
+    the patch.  Closes: #278495.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Thu, 12 May 2005 17:25:15 -0700
+
 doc-base (0.7.18) unstable; urgency=low
 
   * postinst: don't die if /usr/lib/menu doesn't exist; closes: #186707
diff -Nru /var/tmp/01YrgvV4q7/doc-base-0.7.18/install-docs 
/var/tmp/RqTMmGK6ub/doc-base-0.7.18/install-docs
--- /var/tmp/01YrgvV4q7/doc-base-0.7.18/install-docs    2003-03-15 
14:08:38.000000000 -0800
+++ /var/tmp/RqTMmGK6ub/doc-base-0.7.18/install-docs    2005-05-12 
17:30:22.000000000 -0700
@@ -16,7 +16,28 @@
 
 # ---end-of-configuration-part---
 
-use File::Basename;
+# This would normally be just 'use File::Basename;'. However, install-docs
+# often gets called opportunistically by packages if it's present, and
+# there's no way for those packages to make sure that perl is configured
+# when doing so, so it's possible that standard modules will not be usable.
+
+sub basename {
+  (my $basename = $_[0]) =~ s#.*/##s;
+  return $basename;
+}
+
+sub dirname {
+  my ($dirname, $basename) = ($_[0] =~ m#^(.*/)?(.*)#s);
+  $dirname = './' if not defined $dirname or $dirname eq '';
+  $dirname =~ s#(.)/*\z#$1#s;
+  unless (length $basename) {
+    ($dirname) = ($dirname =~ m#^(.*/)?#s);
+    $dirname = './' if not defined $dirname or $dirname eq '';
+    $dirname =~ s#(.)/*\z#$1#s;
+  }
+  return $dirname;
+}
+
 # set umask explicitly
 umask 022;
 
diff -Nru /var/tmp/01YrgvV4q7/doc-base-0.7.18/pod2htmd.tmp 
/var/tmp/RqTMmGK6ub/doc-base-0.7.18/pod2htmd.tmp
--- /var/tmp/01YrgvV4q7/doc-base-0.7.18/pod2htmd.tmp    1969-12-31 
16:00:00.000000000 -0800
+++ /var/tmp/RqTMmGK6ub/doc-base-0.7.18/pod2htmd.tmp    2005-05-12 
17:33:01.000000000 -0700
@@ -0,0 +1,2 @@
+
+.
diff -Nru /var/tmp/01YrgvV4q7/doc-base-0.7.18/pod2htmi.tmp 
/var/tmp/RqTMmGK6ub/doc-base-0.7.18/pod2htmi.tmp
--- /var/tmp/01YrgvV4q7/doc-base-0.7.18/pod2htmi.tmp    1969-12-31 
16:00:00.000000000 -0800
+++ /var/tmp/RqTMmGK6ub/doc-base-0.7.18/pod2htmi.tmp    2005-05-12 
17:33:01.000000000 -0700
@@ -0,0 +1,2 @@
+
+.

Attachment: signature.asc
Description: Digital signature

Reply via email to