[PATCH] Replace /usr/share/doc symlinks with separate changelog and copyright files in the arch-independent packages (perl-doc and perl-modules) to make sure they correspond to the right package version. (Closes: #536384, #542137)
Niko Tyni
ntyni at debian.org
Tue Aug 25 21:12:17 UTC 2009
---
debian/changelog | 4 ++++
debian/perl-doc.README.Debian | 3 +++
debian/perl-doc.docs | 3 +++
debian/perl-doc.postinst | 15 ---------------
debian/perl-doc.preinst | 5 +++++
debian/perl-modules.docs | 2 ++
debian/perl-modules.preinst | 5 +++++
7 files changed, 22 insertions(+), 15 deletions(-)
create mode 100644 debian/perl-doc.README.Debian
delete mode 100644 debian/perl-doc.postinst
create mode 100644 debian/perl-modules.docs
diff --git a/debian/changelog b/debian/changelog
index cd94002..384dc62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ perl (5.10.1-1) UNRELEASED; urgency=low
+ libio-compress-bzip2-perl
* Don't test .ph file syntax when DEB_BUILD_OPTIONS contains "nocheck"
or "x-perl-notest"
+ * Replace /usr/share/doc symlinks with separate changelog and copyright
+ files in the arch-independent packages (perl-doc and perl-modules)
+ to make sure they correspond to the right package version.
+ (Closes: #536384, #542137)
-- Niko Tyni <ntyni at debian.org> Thu, 20 Aug 2009 14:51:52 +0300
diff --git a/debian/perl-doc.README.Debian b/debian/perl-doc.README.Debian
new file mode 100644
index 0000000..594816e
--- /dev/null
+++ b/debian/perl-doc.README.Debian
@@ -0,0 +1,3 @@
+Note that parts of this package, including Perl changelog history
+since version 5.000, can be found in /usr/share/doc/perl rather than
+this directory.
diff --git a/debian/perl-doc.docs b/debian/perl-doc.docs
index 268ff43..c9571dc 100644
--- a/debian/perl-doc.docs
+++ b/debian/perl-doc.docs
@@ -3,3 +3,6 @@ Porting/Contract perl
Porting/patching.pod perl
Porting/pumpkin.pod perl
README perl
+debian/changelog perl-doc/changelog.Debian
+debian/copyright perl-doc/copyright
+debian/perl-doc.README.Debian perl-doc/README.Debian
diff --git a/debian/perl-doc.postinst b/debian/perl-doc.postinst
deleted file mode 100644
index 7c631be..0000000
--- a/debian/perl-doc.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = configure ]
-then
- # The 5.6.0 packages had /usr/share/doc/perl-doc as a directory,
- # now a symlink to perl. At this point the directory should be
- # empty, convert to a symlink.
- docs=/usr/share/doc
- if [ ! -L $docs/perl-doc ] && [ -d $docs/perl-doc ]
- then
- rmdir $docs/perl-doc && ln -s perl $docs/perl-doc
- fi
-fi
-
-exit 0
diff --git a/debian/perl-doc.preinst b/debian/perl-doc.preinst
index 9885ba4..8142307 100644
--- a/debian/perl-doc.preinst
+++ b/debian/perl-doc.preinst
@@ -6,4 +6,9 @@ then
--divert /usr/bin/perldoc.stub /usr/bin/perldoc
fi
+# this used to be a symlink, see #536384
+if [ -h /usr/share/doc/perl-doc ]; then
+ rm -f /usr/share/doc/perl-doc
+fi
+
exit 0
diff --git a/debian/perl-modules.docs b/debian/perl-modules.docs
new file mode 100644
index 0000000..da4ebf0
--- /dev/null
+++ b/debian/perl-modules.docs
@@ -0,0 +1,2 @@
+debian/changelog perl-modules/changelog.Debian
+debian/copyright perl-modules/copyright
diff --git a/debian/perl-modules.preinst b/debian/perl-modules.preinst
index 75006d9..7d4b13e 100644
--- a/debian/perl-modules.preinst
+++ b/debian/perl-modules.preinst
@@ -7,4 +7,9 @@ then
rm -f /etc/Net
fi
+# this used to be a symlink, see #536384
+if [ -h /usr/share/doc/perl-modules ]; then
+ rm -f /usr/share/doc/perl-modules
+fi
+
exit 0
--
1.5.6.5
--VbJkn9YxBvnuCH5J--
More information about the Perl-maintainers
mailing list