r1684 - in /unstable/evolution/debian: changelog evolution.preinst

[corsac at users.alioth.debian.org]

Author: corsac
Date: Tue Jun 29 15:58:23 2010
New Revision: 1684

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1684
Log:
only match evolution main process, evolution-data-server and 
evolution-exchange storage process for candidate to be stopped at upgrade 
time.

Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/evolution.preinst

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1684&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Tue Jun 29 15:58:23 2010
@@ -3,10 +3,11 @@
   * debian/control:
     - bump gtkhtml build-depends to 3.30.2.
   * debian/preinst:
-    - only match evolution main process and evolution-exchange storage process
-      for candidate to be stopped at upgrade time.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 29 Jun 2010 17:48:45 +0200
+    - only match evolution main process, evolution-data-server and 
+      evolution-exchange storage process for candidate to be stopped at upgrade 
+      time.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 29 Jun 2010 17:55:58 +0200
 
 evolution (2.30.2-1) unstable; urgency=low
 

Modified: unstable/evolution/debian/evolution.preinst
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.preinst?rev=1684&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.preinst (original)
+++ unstable/evolution/debian/evolution.preinst Tue Jun 29 15:58:23 2010
@@ -12,7 +12,7 @@
 
 upgrade_check() {
   seen=0
-  while pgrep -fx 'evolution|/usr/lib/evolution/.*/evolution-exchange-storage' > /dev/null; do
+  while pgrep -fx 'evolution|/usr/lib/evolution/.*/evolution-exchange-storage|/usr/lib/evolution/evolution-data-server-.*' > /dev/null; do
     error_msg
     seen=$(($seen + 1))
     if [ $seen = 3 ]; then