[Pkg-virtualbox-commits] r386 - virtualbox-ose/trunk/debian

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-11-23 18:02:07 +0000 (Sun, 23 Nov 2008)
New Revision: 386

Removed:
   virtualbox-ose/trunk/debian/po/
   virtualbox-ose/trunk/debian/virtualbox-ose.preinst.in
   virtualbox-ose/trunk/debian/virtualbox-ose.templates
Modified:
   virtualbox-ose/trunk/debian/changelog
   virtualbox-ose/trunk/debian/rules
Log:
Do not warn about losing snapshots anymore.



Modified: virtualbox-ose/trunk/debian/changelog
===================================================================
--- virtualbox-ose/trunk/debian/changelog	2008-11-23 16:14:04 UTC (rev 385)
+++ virtualbox-ose/trunk/debian/changelog	2008-11-23 18:02:07 UTC (rev 386)
@@ -1,6 +1,8 @@
 virtualbox-ose (2.0.4-dfsg-1) experimental-UNRELEASED; urgency=low
 
   * New upstream version, closes: #497840  
+  * Do not warn user about losing snapshots anymore, this is supposed to be a
+    thing of the past. Closes: #500101
 
  -- Michael Meskes <meskes at debian.org>  Thu, 20 Nov 2008 14:09:54 +0100
 

Modified: virtualbox-ose/trunk/debian/rules
===================================================================
--- virtualbox-ose/trunk/debian/rules	2008-11-23 16:14:04 UTC (rev 385)
+++ virtualbox-ose/trunk/debian/rules	2008-11-23 18:02:07 UTC (rev 386)
@@ -62,7 +62,7 @@
 	# Cleaning package
 	rm -rf out
 	rm -f AutoConfig.kmk configure.log env.sh LocalConfig.kmk
-	rm -f debian/$(sname).init debian/$(sname).preinst
+	rm -f debian/$(sname).init
 	rm -f debian/virtualbox-ose.README.Debian debian/README.Debian.html
 	debconf-updatepo
 	dh_clean
@@ -101,8 +101,6 @@
 	dh_installdirs
 	# This will get installed into the package by dh_installinit
 	install -m 644 out/obj/src/VBox/Installer/linux/vboxnet.sh debian/$(sname).init
-	# We also need to build a preinst file
-	sed -e 's/UPSTREAM/"$(upstreamversion)"/' < debian/$(sname).preinst.in > debian/$(sname).preinst
 	# Install helper scripts for vbox* interfaces
 	dh_installifupdown -p$(sname)
 

Deleted: virtualbox-ose/trunk/debian/virtualbox-ose.preinst.in
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose.preinst.in	2008-11-23 16:14:04 UTC (rev 385)
+++ virtualbox-ose/trunk/debian/virtualbox-ose.preinst.in	2008-11-23 18:02:07 UTC (rev 386)
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-new=UPSTREAM
-old=`echo $2 | cut -f1 -d"-"`
-
-. /usr/share/debconf/confmodule
-
-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
-	db_go
-	db_get virtualbox-ose/upstream_version_change || true
-	if [ "$RET" = false ]; then
-		db_stop
-		exit 1
-	fi
-	db_stop
-fi
-
-#DEBHELPER#

Deleted: virtualbox-ose/trunk/debian/virtualbox-ose.templates
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose.templates	2008-11-23 16:14:04 UTC (rev 385)
+++ virtualbox-ose/trunk/debian/virtualbox-ose.templates	2008-11-23 18:02:07 UTC (rev 386)
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: virtualbox-ose/upstream_version_change
-Type: boolean
-Default: false
-_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.