r42734 - in /trunk/libmodule-corelist-perl/debian: changelog lintian-overrides postrm preinst
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Tue Aug 25 07:24:12 UTC 2009
Author: dmn
Date: Tue Aug 25 07:24:02 2009
New Revision: 42734
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42734
Log:
* revert the removal of corelist.1.gz diversion
- add an override about diversion-for-unknown-file lintian error
- thanks to Niko Tyni
Added:
trunk/libmodule-corelist-perl/debian/lintian-overrides
Modified:
trunk/libmodule-corelist-perl/debian/changelog
trunk/libmodule-corelist-perl/debian/postrm
trunk/libmodule-corelist-perl/debian/preinst
Modified: trunk/libmodule-corelist-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-corelist-perl/debian/changelog?rev=42734&op=diff
==============================================================================
--- trunk/libmodule-corelist-perl/debian/changelog (original)
+++ trunk/libmodule-corelist-perl/debian/changelog Tue Aug 25 07:24:02 2009
@@ -1,3 +1,11 @@
+libmodule-corelist-perl (2.18-2) unstable; urgency=low
+
+ * revert the removal of corelist.1.gz diversion
+ - add an override about diversion-for-unknown-file lintian error
+ - thanks to Niko Tyni
+
+ -- Damyan Ivanov <dmn at debian.org> Tue, 25 Aug 2009 10:20:19 +0300
+
libmodule-corelist-perl (2.18-1) unstable; urgency=low
[ Nathan Handler ]
Added: trunk/libmodule-corelist-perl/debian/lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-corelist-perl/debian/lintian-overrides?rev=42734&op=file
==============================================================================
--- trunk/libmodule-corelist-perl/debian/lintian-overrides (added)
+++ trunk/libmodule-corelist-perl/debian/lintian-overrides Tue Aug 25 07:24:02 2009
@@ -1,0 +1,3 @@
+# we divert corelist.1.gz because corelist.1p.gz that we ship is of lower
+# priproty to man-db
+libmodule-corelist-perl: diversion-for-unknown-file usr/share/man/man1/corelist.1.gz preinst:12
Modified: trunk/libmodule-corelist-perl/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-corelist-perl/debian/postrm?rev=42734&op=diff
==============================================================================
--- trunk/libmodule-corelist-perl/debian/postrm (original)
+++ trunk/libmodule-corelist-perl/debian/postrm Tue Aug 25 07:24:02 2009
@@ -4,6 +4,9 @@
then
dpkg-divert --remove --package libmodule-corelist-perl --rename \
--divert /usr/bin/corelist.bundled /usr/bin/corelist
+
+ dpkg-divert --remove --package libmodule-corelist-perl --rename \
+ --divert /usr/share/man/man1/corelist.bundled.1.gz /usr/share/man/man1/corelist.1.gz
fi
# dh_installdeb will replace this with shell code automatically
Modified: trunk/libmodule-corelist-perl/debian/preinst
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-corelist-perl/debian/preinst?rev=42734&op=diff
==============================================================================
--- trunk/libmodule-corelist-perl/debian/preinst (original)
+++ trunk/libmodule-corelist-perl/debian/preinst Tue Aug 25 07:24:02 2009
@@ -5,13 +5,11 @@
dpkg-divert --add --package libmodule-corelist-perl --rename \
--divert /usr/bin/corelist.bundled /usr/bin/corelist
- # remove unneeded diversion
- # this package installs the manpage as corelist.1p.gz which takes precedence
- # over corelist.1.gz
- if [ -n "`dpkg-divert --list /usr/share/man/man1/corelist.1.gz`" ]; then
- dpkg-divert --remove --package libmodule-corelist-perl --rename \
- --divert /usr/share/man/man1/corelist.bundled.1.gz /usr/share/man/man1/corelist.1.gz
- fi
+ # this diversion is needed even if we don't actually ship corelist.1.gz,
+ # because otherwise it takes precedence over corelist.1p.gz (which we do
+ # ship)
+ dpkg-divert --add --package libmodule-corelist-perl --rename \
+ --divert /usr/share/man/man1/corelist.bundled.1.gz /usr/share/man/man1/corelist.1.gz
fi
# dh_installdeb will replace this with shell code automatically
More information about the Pkg-perl-cvs-commits
mailing list