From 751283c5d7310649b32af1e8bd45fd4ee9bc2f91 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 22 Apr 2006 15:37:56 +0000 Subject: [PATCH] Strip the trailing '/dir' from '--dir-file' option parameter to make it GNU install-info compatible (Clint Adams). Closes: #61640, #67237 --- ChangeLog | 5 +++++ debian/changelog | 2 ++ scripts/install-info.pl | 1 + 3 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 93090edc..3d621f83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-22 Clint Adams + + * scripts/install-info.pl: Strip any trailing '/dir' from the + '--dir-file' option parameter, to make it GNU install-info compatible. + 2006-04-21 Guillem Jover * src/query.c (enqperpackage): Change dynamically consutructed diff --git a/debian/changelog b/debian/changelog index c9ca59ed..b5c51d71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ dpkg (1.13.19~) UNRELEASED; urgency=low [ Guillem Jover ] * Fix strings so that they can be more easily translated. Closes: #134358 + * Strip the trailing '/dir' from '--dir-file' option parameter to make it + GNU install-info compatible (Clint Adams). Closes: #61640, #67237 -- Bart Cornelis (cobaco) Thu, 13 Apr 2006 12:51:15 +0200 diff --git a/scripts/install-info.pl b/scripts/install-info.pl index 3daa033c..7ad007a4 100755 --- a/scripts/install-info.pl +++ b/scripts/install-info.pl @@ -92,6 +92,7 @@ while ($ARGV[0] =~ m/^--/) { $description=$'; } elsif (m/^--dir-file=/) { # for compatibility with GNU install-info $infodir=$'; + $infodir=~s/\/dir$//; } else { print STDERR "$name: unknown option \`$_'\n"; &usage(STDERR); exit 1; } -- 2.39.5