rev 12700 - branches/kde4.2/packages/kdebase/debian

[Modestas Vainius]

Author: modax-guest
Date: 2008-11-22 09:28:08 +0000 (Sat, 22 Nov 2008)
New Revision: 12700

Added:
   branches/kde4.2/packages/kdebase/debian/konqueror.postinst
   branches/kde4.2/packages/kdebase/debian/konqueror.prerm
Modified:
   branches/kde4.2/packages/kdebase/debian/changelog
   branches/kde4.2/packages/kdebase/debian/control
Log:
Merge Armin changes

Modified: branches/kde4.2/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase/debian/changelog	2008-11-21 22:59:42 UTC (rev 12699)
+++ branches/kde4.2/packages/kdebase/debian/changelog	2008-11-22 09:28:08 UTC (rev 12700)
@@ -4,9 +4,13 @@
 
   * Remove kdepimlibs5-dev from kdebase-dev depends.
   * Use sameVersionDep for libkonq5-dev dependecy on kdelibs5-dev.
+  
+  +++ Changes by Armin Berres:
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 07 Nov 2008 22:33:31 +0200
+  * Install konqueror as alternative for x-www-browser. 
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Nov 2008 22:37:25 +0100
+
 kdebase (4:4.1.3-1) experimental; urgency=low
 
   * New upstream release

Modified: branches/kde4.2/packages/kdebase/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase/debian/control	2008-11-21 22:59:42 UTC (rev 12699)
+++ branches/kde4.2/packages/kdebase/debian/control	2008-11-22 09:28:08 UTC (rev 12700)
@@ -36,6 +36,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
+Recommends: kfind
 Description: file manager for KDE 4
  Dolphin is the default KDE 4 file manager, intended to be both powerful and
  easy to use.

Added: branches/kde4.2/packages/kdebase/debian/konqueror.postinst
===================================================================
--- branches/kde4.2/packages/kdebase/debian/konqueror.postinst	                        (rev 0)
+++ branches/kde4.2/packages/kdebase/debian/konqueror.postinst	2008-11-22 09:28:08 UTC (rev 12700)
@@ -0,0 +1,19 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/konqueror 100
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: branches/kde4.2/packages/kdebase/debian/konqueror.prerm
===================================================================
--- branches/kde4.2/packages/kdebase/debian/konqueror.prerm	                        (rev 0)
+++ branches/kde4.2/packages/kdebase/debian/konqueror.prerm	2008-11-22 09:28:08 UTC (rev 12700)
@@ -0,0 +1,22 @@
+#! /bin/sh -e
+
+case "$1" in
+    remove)
+        /usr/sbin/update-alternatives --remove x-www-browser /usr/bin/konqueror
+    ;;
+
+    upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0