rev 14209 - trunk/packages/kdelibs/debian

Modestas Vainius modax-guest at alioth.debian.org
Sat Apr 4 11:50:03 UTC 2009


Author: modax-guest
Date: 2009-04-04 11:50:03 +0000 (Sat, 04 Apr 2009)
New Revision: 14209

Added:
   trunk/packages/kdelibs/debian/NEWS
   trunk/packages/kdelibs/debian/kdelibs5.preinst
   trunk/packages/kdelibs/debian/kdelibs5.templates
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
Log:
+++ Changes by Modestas Vainius:
* Add debconf templates to warn existing KDE 4 users about KDEHOME change
  this revision introduces.
* Add NEWS entry about KDEHOME change.

(untested).

Added: trunk/packages/kdelibs/debian/NEWS
===================================================================
--- trunk/packages/kdelibs/debian/NEWS	                        (rev 0)
+++ trunk/packages/kdelibs/debian/NEWS	2009-04-04 11:50:03 UTC (rev 14209)
@@ -0,0 +1,10 @@
+kde4libs (4:4.2.2-1) unstable; urgency=low
+
+  Defaut user settings and data directory (KDEHOME) has been switched to
+  upstream default (~/.kde) from the previous Debian specific default
+  (~/.kde4).  KDE 3 applications has always used (and will continue to use)
+  ~/.kde. If you have used a KDE 4 application previously, you may want to
+  migrate settings from the old directory to the new one. You can do this
+  manually or use Kaboom wizard from the kaboom package.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Sat, 04 Apr 2009 14:47:39 +0300

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2009-04-04 08:08:08 UTC (rev 14208)
+++ trunk/packages/kdelibs/debian/changelog	2009-04-04 11:50:03 UTC (rev 14209)
@@ -1,4 +1,4 @@
-kde4libs (4:4.2.2-0r3) UNRELEASED; urgency=low
+kde4libs (4:4.2.2-0r4) unstable; urgency=low
 
   * New upstream release.
 
@@ -24,8 +24,14 @@
   * Add patch 24_runtime_qt45_locale_initialization.diff to fix locale
     initialization when kde is run with Qt 4.5 but built with Qt 4.4.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Apr 2009 02:48:46 +0300
+  +++ Changes by Modestas Vainius:
 
+  * Add debconf templates to warn existing KDE 4 users about KDEHOME change
+    this revision introduces.
+  * Add NEWS entry about KDEHOME change.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Apr 2009 14:48:20 +0300
+
 kde4libs (4:4.2.1-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2009-04-04 08:08:08 UTC (rev 14208)
+++ trunk/packages/kdelibs/debian/control	2009-04-04 11:50:03 UTC (rev 14209)
@@ -23,7 +23,8 @@
 Package: kdelibs5
 Architecture: any
 Depends: ${shlibs:Depends}, kdelibs5-data (>= ${source:Version}),
- kdelibs-bin(>= ${binary:Version}), dbus-x11, shared-mime-info, xauth, xdg-utils
+ kdelibs-bin(>= ${binary:Version}), dbus-x11, shared-mime-info, xauth, xdg-utils,
+ debconf | debconf-2.0
 Recommends: ttf-dejavu, kdebase-runtime (>= 4:4.2.0)
 Conflicts: kdebase-workspace-libs4+5 (<< 4.2.2), kdepimlibs5 (<< 4.2.2)
 Replaces: kdelibs-bin (<< 4:4.1.74)

Added: trunk/packages/kdelibs/debian/kdelibs5.preinst
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5.preinst	                        (rev 0)
+++ trunk/packages/kdelibs/debian/kdelibs5.preinst	2009-04-04 11:50:03 UTC (rev 14209)
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+. /usr/share/debconf/confmodule
+
+set -e
+
+lib_users() {
+    local lib max
+    local i pid user cmd
+
+    lib=`readlink -f $1`
+    max=$2
+    i=0
+
+    test -d /proc || return 2
+    for pid in `ls -1 /proc | grep '^[[:digit:]]\+$' | sort -n`; do
+        if [ -r /proc/$pid/maps ]; then
+            if grep -F -q "$lib" /proc/$pid/maps; then
+                if [ "$i" -ge "$max" ]; then
+                    echo "..."
+                    break
+                fi
+                user=`ps -o user= -p $pid`
+                cmd=`ps -o comm= -p $pid`
+                echo -n "${pid}/$cmd($user) "
+                i=$(($i+1))
+            fi
+        fi
+    done
+    if [ "$i" -gt 0 ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+oldver="$2"
+kde4apps=""
+
+# Check if upgrading from << 4:4.2.2-1
+if [ "$1" = "upgrade" -a -n "$oldver" ] && dpkg --compare-versions "$oldver" lt "4:4.2.2-1"; then
+    # Are there any KDE 4 applications running?
+    if [ -f /usr/lib/libkdecore.so.5 ]; then
+        kde4apps=`lib_users '/usr/lib/libkdecore.so.5' 6`
+        if [ "$?" -ne 0 ]; then
+            kde4apps=""
+        fi
+    fi
+
+    if [ -n "$kde4apps" ]; then
+        # Ask whether to stop upgrading
+	    db_title "Upgrading kdelibs5 while KDE 4 is running"
+	    db_fset kdelibs5/upgrade_kdehome_running seen false
+	    db_reset kdelibs5/upgrade_kdehome_running
+        db_subst kdelibs5/upgrade_kdehome_running apps "$kde4apps"
+	    if ! db_input high kdelibs5/upgrade_kdehome_running; then
+            # If the question was skipped, continue upgrading...
+            kde4apps=""
+        fi
+    else
+        # Just display a note about configuration change
+        db_title "Upgrading kdelibs5"
+	    db_fset kdelibs5/upgrade_kdehome_info seen false
+	    db_input medium kdelibs5/upgrade_kdehome_info || true
+    fi
+
+    # If either note was displayed successfully...
+	db_go || true
+    if [ -n "$kde4apps" ]; then
+        db_get kdelibs5/upgrade_kdehome_running
+        if [ "$RET" = "false" ]; then
+            db_stop
+            exit 1
+        fi
+    fi
+	db_stop
+fi
+
+#DEBHELPER#

Added: trunk/packages/kdelibs/debian/kdelibs5.templates
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5.templates	                        (rev 0)
+++ trunk/packages/kdelibs/debian/kdelibs5.templates	2009-04-04 11:50:03 UTC (rev 14209)
@@ -0,0 +1,39 @@
+Template: kdelibs5/upgrade_kdehome_running
+Type: boolean
+Default: false
+Description: Upgrade even if newly started KDE 4 applications will use other user settings directory (KDEHOME)?
+ You are about to upgrade to the new version of the kdelibs5 package which
+ introduces a major configuration change, but it seems that there are a few KDE
+ 4 applications running on your system at the moment. Newly started KDE 4
+ applications will use ~/.kde directory to store user settings and data (also
+ known as KDEHOME) by default while currently running KDE 4 applications use
+ ~/.kde4.  KDE 3 applications has always used (and will continue to use)
+ ~/.kde. To avoid potential setting/data loss, you should:
+ .
+ 1) Answer "No", terminate all KDE applications and/or KDE session and try
+ upgrading again.
+ .
+ 2) If you answer "Yes", you should make sure that no new KDE 4 applications
+ are started before you migrate your KDE 4 settings and data.  Beware, that
+ clean termination of the old KDE 4 session might not be safe due to this
+ reason.
+ .
+ Once upgrade is complete, login to KDE as usual or, if you are only using
+ individual KDE 4 applications, you may use Kaboom (available in the package of
+ the same name) wizard to migrate your user settings and data before starting
+ any KDE 4 application.
+ .
+ Currently running KDE 4 applications: ${apps}
+
+Template: kdelibs5/upgrade_kdehome_info
+Type: note
+Description: New user settings directory (KDEHOME) for KDE 4 applications.
+ Once this package is upgraded, KDE 4 applications will use ~/.kde directory to
+ store user settings and data (also known as KDEHOME) by default.  Currently,
+ KDE 4 applications use ~/.kde4. KDE 3 applications has always used (and will
+ continue to use) ~/.kde.
+ .
+ When upgrade is complete, it is safe to login to KDE as usual or, if you are
+ only using individual KDE 4 applications, you may use Kaboom (available in the
+ package of the same name) wizard to migrate your user data before starting a
+ KDE 4 application.




More information about the pkg-kde-commits mailing list