rev 3571 - trunk/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-04-17 17:24:14 +0000 (Mon, 17 Apr 2006)
New Revision: 3571

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/konqueror.postinst
Log:
See changelog.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-04-17 17:09:06 UTC (rev 3570)
+++ trunk/packages/kdebase/debian/changelog	2006-04-17 17:24:14 UTC (rev 3571)
@@ -15,6 +15,9 @@
   * Remove xlibs-static-pic build-dependency, and replace it with
     libfontenc-dev, for the more modular X.Org 7.
 
+  * Improve konqueror's use of alternatives, by slaving the konqueror manpage
+    to the x-www-browser manpage. Thanks to Magnus Holmgren. (Closes: #363076)
+
   +++ Changes by Pierre Habouzit.
 
   * Add gl.po to the debconf templates. (Closes: #361208)

Modified: trunk/packages/kdebase/debian/konqueror.postinst
===================================================================
--- trunk/packages/kdebase/debian/konqueror.postinst	2006-04-17 17:09:06 UTC (rev 3570)
+++ trunk/packages/kdebase/debian/konqueror.postinst	2006-04-17 17:24:14 UTC (rev 3571)
@@ -2,7 +2,8 @@
 
 case "$1" in
     configure)
-	update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/konqueror 100
+	update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/konqueror 100 \
+	--slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz "/usr/share/man/man1/konqueror.1.gz"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)