r42636 - in /trunk/libmodule-corelist-perl/debian: changelog postrm preinst

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Aug 24 13:49:39 2009
New Revision: 42636

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42636
Log:
remove unnecessary diversion of corelist.1.gz

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=42636&op=diff
==============================================================================
--- trunk/libmodule-corelist-perl/debian/changelog (original)
+++ trunk/libmodule-corelist-perl/debian/changelog Mon Aug 24 13:49:39 2009
@@ -12,6 +12,7 @@
     from perl (>= 5.8.0), perl-modules (>= 5.10) | libversion-perl
     to perl (>= 5.10) | libversion-perl
   * Standards-Version: 3.8.3 (no changes needed)
+  * remove unnecessary diversion of corelist.1.gz
 
  -- Damyan Ivanov <dmn at debian.org>  Mon, 24 Aug 2009 15:53:25 +0300
 

Modified: trunk/libmodule-corelist-perl/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-corelist-perl/debian/postrm?rev=42636&op=diff
==============================================================================
--- trunk/libmodule-corelist-perl/debian/postrm (original)
+++ trunk/libmodule-corelist-perl/debian/postrm Mon Aug 24 13:49:39 2009
@@ -4,9 +4,6 @@
 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=42636&op=diff
==============================================================================
--- trunk/libmodule-corelist-perl/debian/preinst (original)
+++ trunk/libmodule-corelist-perl/debian/preinst Mon Aug 24 13:49:39 2009
@@ -5,8 +5,13 @@
     dpkg-divert --add --package libmodule-corelist-perl --rename \
         --divert /usr/bin/corelist.bundled /usr/bin/corelist
 
-    dpkg-divert --add --package libmodule-corelist-perl --rename \
-        --divert /usr/share/man/man1/corelist.bundled.1.gz /usr/share/man/man1/corelist.1.gz
+    # 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
 fi
 
 # dh_installdeb will replace this with shell code automatically