rev 14217 - trunk/packages/kdelibs/debian

Modestas Vainius modax-guest at alioth.debian.org
Sat Apr 4 22:39:08 UTC 2009


Author: modax-guest
Date: 2009-04-04 22:39:07 +0000 (Sat, 04 Apr 2009)
New Revision: 14217

Modified:
   trunk/packages/kdelibs/debian/kdelibs5.preinst
   trunk/packages/kdelibs/debian/kdelibs5.templates
   trunk/packages/kdelibs/debian/libplasma3.symbols.in
Log:
* Fix version of a symbol in libplasma3.symbols.in
* Fix indentation in kdelibs5.preinst
* Do not trigger "kde running" due to kdm_greet(root). Just show info.
* kdelibs5.preinst should not fail when there are no KDE 4 running.


Modified: trunk/packages/kdelibs/debian/kdelibs5.preinst
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5.preinst	2009-04-04 21:43:00 UTC (rev 14216)
+++ trunk/packages/kdelibs/debian/kdelibs5.preinst	2009-04-04 22:39:07 UTC (rev 14217)
@@ -22,6 +22,12 @@
                 fi
                 user=`ps -o user= -p $pid`
                 cmd=`ps -o comm= -p $pid`
+
+                # Exclude kdm_greet(root)
+                if [ "$user" = "root" ] && [ "$cmd" = "kdm_greet" ]; then
+                   continue
+                fi
+
                 echo -n "${pid}/$cmd($user) "
                 i=$(($i+1))
             fi
@@ -40,32 +46,30 @@
 # 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
+    if [ -e /usr/lib/libkdecore.so.5 ]; then
+        kde4apps=`lib_users '/usr/lib/libkdecore.so.5' 6` || {
             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_settitle kdelibs5/upgrade_kdehome_running_title
+        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 ! 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
+        db_settitle kdelibs5/upgrade_kdehome_info_title
+        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
+    db_go || true
     if [ -n "$kde4apps" ]; then
         db_get kdelibs5/upgrade_kdehome_running
         if [ "$RET" = "false" ]; then
@@ -73,7 +77,7 @@
             exit 1
         fi
     fi
-	db_stop
+    db_stop
 fi
 
 #DEBHELPER#

Modified: trunk/packages/kdelibs/debian/kdelibs5.templates
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5.templates	2009-04-04 21:43:00 UTC (rev 14216)
+++ trunk/packages/kdelibs/debian/kdelibs5.templates	2009-04-04 22:39:07 UTC (rev 14217)
@@ -1,3 +1,7 @@
+Template: kdelibs5/upgrade_kdehome_running_title
+Type: title
+Description: Upgrading kdelibs5 while KDE 4 is running
+
 Template: kdelibs5/upgrade_kdehome_running
 Type: boolean
 Default: false
@@ -10,7 +14,7 @@
  ~/.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
+ 1) Answer "No", terminate all KDE applications and/or KDE sessions and try
  upgrading again.
  .
  2) If you answer "Yes", you should make sure that no new KDE 4 applications
@@ -25,6 +29,10 @@
  .
  Currently running KDE 4 applications: ${apps}
 
+Template: kdelibs5/upgrade_kdehome_info_title
+Type: title
+Description: Upgrading kdelibs5
+
 Template: kdelibs5/upgrade_kdehome_info
 Type: note
 Description: New user settings directory (KDEHOME) for KDE 4 applications.

Modified: trunk/packages/kdelibs/debian/libplasma3.symbols.in
===================================================================
--- trunk/packages/kdelibs/debian/libplasma3.symbols.in	2009-04-04 21:43:00 UTC (rev 14216)
+++ trunk/packages/kdelibs/debian/libplasma3.symbols.in	2009-04-04 22:39:07 UTC (rev 14217)
@@ -755,7 +755,7 @@
  _ZN6Plasma6Applet14listCategoriesERK7QStringb at Base 4:4.2.2
  _ZN6Plasma6Applet14mouseMoveEventEP24QGraphicsSceneMouseEvent at Base 4:4.2.2
  _ZN6Plasma6Applet14paintInterfaceEP8QPainterPK24QStyleOptionGraphicsItemRK5QRect at Base 4:4.2.2
- _ZN6Plasma6Applet15appletDestroyedEPS0_ at Base 4:4.2.2+svn922902
+ _ZN6Plasma6Applet15appletDestroyedEPS0_ at Base 4:4.2.2
  _ZN6Plasma6Applet15geometryChangedEv at Base 4:4.2.2
  _ZN6Plasma6Applet15hoverEnterEventEP24QGraphicsSceneHoverEvent at Base 4:4.2.2
  _ZN6Plasma6Applet15hoverLeaveEventEP24QGraphicsSceneHoverEvent at Base 4:4.2.2




More information about the pkg-kde-commits mailing list