[Pkg-virtualbox-commits] r188 - in trunk/debian: . po

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-01-11 10:03:38 +0000 (Fri, 11 Jan 2008)
New Revision: 188

Modified:
   trunk/debian/changelog
   trunk/debian/po/de.po
   trunk/debian/po/templates.pot
   trunk/debian/virtualbox-ose.preinst.in
   trunk/debian/virtualbox-ose.templates
Log:
Tweaked debconf text.
Check for upgrade in preinst.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-10 14:42:55 UTC (rev 187)
+++ trunk/debian/changelog	2008-01-11 10:03:38 UTC (rev 188)
@@ -2,6 +2,8 @@
 
   * Added patch from SVN send by Frank Mehnert <frank at innotek.de> to fix
     runtime assertions.
+  * Improved debconf text.
+  * Check for package upgrade in preinst.
 
  -- Michael Meskes <meskes at debian.org>  Thu, 10 Jan 2008 15:14:26 +0100
 

Modified: trunk/debian/po/de.po
===================================================================
--- trunk/debian/po/de.po	2008-01-10 14:42:55 UTC (rev 187)
+++ trunk/debian/po/de.po	2008-01-11 10:03:38 UTC (rev 188)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: virtualbox-ose-1.5.4-dfsg-2\n"
 "Report-Msgid-Bugs-To: virtualbox-ose at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-07 17:01+0100\n"
+"POT-Creation-Date: 2008-01-11 10:53+0100\n"
 "PO-Revision-Date: 2008-01-07 17:16+0100\n"
 "Last-Translator: Michael Meskes <meskes at debian.org>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -18,7 +18,8 @@
 #. Description
 #: ../virtualbox-ose.templates:1001
 msgid "Proceed with virtualbox-ose upgrade despite losing snapshots?"
-msgstr "Mit der Aktualisierung fortfahren obwohl alle Snapshots verloren gehen?"
+msgstr ""
+"Mit der Aktualisierung fortfahren obwohl alle Snapshots verloren gehen?"
 
 #. Type: boolean
 #. Description
@@ -26,9 +27,10 @@
 msgid ""
 "You are currently upgrading virtualbox-ose to a new upstream version. All "
 "snapshots will be discarded by this upgrade, because snapshots are version "
-"specific."
+"specific. Please select 'no' if you want to merge snapshot data into the "
+"base image first."
 msgstr ""
 "Sie aktualisieren virtualbox-ose gerade auf eine neue Entwicklerversion. "
 "Alle Snapshots werden durch diese Aktualisierung unbrauchbar, da Snapshots "
-"versionsabhängig sind."
-
+"versionsabhängig sind. Bitte wählen Sie 'Nein', um die Snapshots in das Basis "
+"Image zu überführen. "

Modified: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot	2008-01-10 14:42:55 UTC (rev 187)
+++ trunk/debian/po/templates.pot	2008-01-11 10:03:38 UTC (rev 188)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: virtualbox-ose at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-07 17:01+0100\n"
+"POT-Creation-Date: 2008-01-11 10:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -28,5 +28,6 @@
 msgid ""
 "You are currently upgrading virtualbox-ose to a new upstream version. All "
 "snapshots will be discarded by this upgrade, because snapshots are version "
-"specific."
+"specific. Please select 'no' if you want to merge snapshot data into the "
+"base image first."
 msgstr ""

Modified: trunk/debian/virtualbox-ose.preinst.in
===================================================================
--- trunk/debian/virtualbox-ose.preinst.in	2008-01-10 14:42:55 UTC (rev 187)
+++ trunk/debian/virtualbox-ose.preinst.in	2008-01-11 10:03:38 UTC (rev 188)
@@ -5,7 +5,7 @@
 
 . /usr/share/debconf/confmodule
 
-if [ "$new" != "$old" ]; then
+if [ "$1" = "upgrade" -a "$new" != "$old" ]; then
 	db_title Upgrading virtualbox-ose
 	db_fset virtualbox-ose/upstream_version_change seen false
 	db_input high virtualbox-ose/upstream_version_change || true

Modified: trunk/debian/virtualbox-ose.templates
===================================================================
--- trunk/debian/virtualbox-ose.templates	2008-01-10 14:42:55 UTC (rev 187)
+++ trunk/debian/virtualbox-ose.templates	2008-01-11 10:03:38 UTC (rev 188)
@@ -4,5 +4,5 @@
 _Description: Proceed with virtualbox-ose upgrade despite losing snapshots?
  You are currently upgrading virtualbox-ose to a new upstream version. All
  snapshots will be discarded by this upgrade, because snapshots are version
- specific.
+ specific. Please select 'no' if you want to merge snapshot data into the base image first.