r1764 - in /unstable/evolution/debian: changelog evolution.preinst evolution.templates

[corsac at users.alioth.debian.org]

Author: corsac
Date: Mon Oct 11 22:28:17 2010
New Revision: 1764

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1764
Log:
start implementing conditional upgrade after the three tries

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

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1764&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Mon Oct 11 22:28:17 2010
@@ -1,3 +1,10 @@
+evolution (2.30.3-3) UNRELEASED; urgency=low
+
+  * Update debconf script to ask about aborting the upgrade or proceeding by
+    killing processes.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 12 Oct 2010 00:27:21 +0200
+
 evolution (2.30.3-2) unstable; urgency=low
 
   * debian/patches:

Modified: unstable/evolution/debian/evolution.preinst
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.preinst?rev=1764&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.preinst (original)
+++ unstable/evolution/debian/evolution.preinst Mon Oct 11 22:28:17 2010
@@ -8,6 +8,11 @@
   db_fset evolution/needs_shutdown seen false
   db_input high evolution/needs_shutdown || true
   db_go
+}
+
+end() {
+  db_title Evolution processes still present
+  db_input high evolution/kill_processes || true
 }
 
 upgrade_check() {

Modified: unstable/evolution/debian/evolution.templates
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.templates?rev=1764&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.templates (original)
+++ unstable/evolution/debian/evolution.templates Mon Oct 11 22:28:17 2010
@@ -8,3 +8,16 @@
  .
  You need to shut down all running instances of Evolution using the
  "evolution --force-shutdown" command before the upgrade can proceed.
+ .
+ If this command isn't sufficient, you might want to leave all desktop
+ environments before upgrading.
+
+Template: evolution/kill_processes
+Type: choices
+Choices: Abort, Kill processes and proceed
+_Description: Evolution processes still present on the system.
+ Evolution processes are still present on this system, preventing a safe
+ upgrade. 
+ .
+ You can decide to abort the upgrade to solve the situation, let the
+ upgrader kill the processes itself and proceed with the upgrade.