[Pkg-virtualbox-commits] r183 - in trunk/debian: . patches po virtualbox-ose.files

Tue Jan 8 09:42:28 UTC 2008

Author: meskes
Date: 2008-01-08 09:42:28 +0000 (Tue, 08 Jan 2008)
New Revision: 183

Added:
   trunk/debian/po/
   trunk/debian/po/POTFILES.in
   trunk/debian/po/de.po
   trunk/debian/po/templates.pot
   trunk/debian/virtualbox-ose.preinst.in
   trunk/debian/virtualbox-ose.templates
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/05-vboxdrv-references.dpatch
   trunk/debian/rules
   trunk/debian/virtualbox-ose.files/VBox.sh
Log:
* Added debconf support.
* Tell the user about losing snapshots and ask via debconf whether to proceed, closes: #458842.
 Clarified error message coming up if module is not loaded, closes: #459440.




Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2008-01-07 08:36:36 UTC (rev 182)
+++ trunk/debian/changelog	2008-01-08 09:42:28 UTC (rev 183)
@@ -12,8 +12,12 @@
     were only needed for amd64.
   * Install VBoxAddIF.sh which was lost during transition, closes: #458991.
   * Added a recommend to libhal, see #448347 for details.
+  * Added debconf support.
+  * Tell the user about losing snapshots and ask via debconf whether to
+    proceed, closes: #458842.
+  * Clarified error message coming up if module is not loaded, closes: #459440.
 
- -- Michael Meskes <meskes at debian.org>  Fri, 04 Jan 2008 10:51:03 +0100
+ -- Michael Meskes <meskes at debian.org>  Mon, 07 Jan 2008 17:41:32 +0100
 
 virtualbox-ose (1.5.4-dfsg-1) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-01-07 08:36:36 UTC (rev 182)
+++ trunk/debian/control	2008-01-08 09:42:28 UTC (rev 183)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Virtualbox Team  <pkg-virtualbox-devel at lists.alioth.debian.org>
 Uploaders: Philipp Hug <debian at hug.cx>, Marvin Stark <marv at der-marv.de>, Michael Meskes <meskes at debian.org>, Patrick Winnertz <winnie at debian.org>, Daniel Baumann <daniel at debian.org>, Hilko Bengen <bengen at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, bcc, bzip2, g++-multilib [amd64], iasl, kbuild, libacl1-dev, libasound-dev, libhal-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, uuid-dev, xalan, xsltproc, yasm, libpulse-dev
+Build-Depends: debhelper (>= 5), dpatch, bcc, bzip2, g++-multilib [amd64], iasl, kbuild, libacl1-dev, libasound-dev, libhal-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, uuid-dev, xalan, xsltproc, yasm, libpulse-dev, po-debconf (>= 0.5.0)
 Standards-Version: 3.7.3
 Homepage: http://www.virtualbox.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk
@@ -12,7 +12,7 @@
 Package: virtualbox-ose
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Recommends: virtualbox-ose-modules, libhal1
+Recommends: virtualbox-ose-modules
 Suggests: virtualbox-ose-source
 Conflicts: virtualbox
 Replaces: virtualbox

Modified: trunk/debian/patches/05-vboxdrv-references.dpatch
===================================================================
--- trunk/debian/patches/05-vboxdrv-references.dpatch	2008-01-07 08:36:36 UTC (rev 182)
+++ trunk/debian/patches/05-vboxdrv-references.dpatch	2008-01-08 09:42:28 UTC (rev 183)
@@ -16,7 +16,8 @@
 -			      "Re-setup the kernel module by executing "
 -			      "'/etc/init.d/vboxdrv setup' as root");
 +                              "Please install the virtualbox-ose-modules package for your "
-+                              "kernel and execute '/etc/init.d/vboxdrv start' as root");
++                              "kernel and execute 'modprobe vboxdrv' as root");
+
  #else
                  pszError = N_("VirtualBox kernel driver not loaded.");
  #endif
@@ -28,7 +29,7 @@
 -			      "'/etc/init.d/vboxdrv setup' as root");
 +			      "reason. "
 +                              "Please install the virtualbox-ose-modules package for your "
-+                              "kernel and execute '/etc/init.d/vboxdrv start' as root");
++                              "kernel and execute 'modprobe vboxdrv' as root");
  #else
                  pszError = N_("VirtualBox kernel driver not installed");
  #endif

Added: trunk/debian/po/POTFILES.in
===================================================================
--- trunk/debian/po/POTFILES.in	                        (rev 0)
+++ trunk/debian/po/POTFILES.in	2008-01-08 09:42:28 UTC (rev 183)
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] virtualbox-ose.templates
+

Added: trunk/debian/po/de.po
===================================================================
--- trunk/debian/po/de.po	                        (rev 0)
+++ trunk/debian/po/de.po	2008-01-08 09:42:28 UTC (rev 183)
@@ -0,0 +1,34 @@
+# German translation of virtualbox-ose templates.
+# Copyright (C) 2008 Michael Meskes <meskes at debian.org>
+# This file is distributed under the same license as the virtualbox-ose package.
+#
+msgid ""
+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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../virtualbox-ose.templates:1001
+msgid "Proceed with virtualbox-ose upgrade despite losing snapshots?"
+msgstr "Mit der Aktualisierung fortfahren obwohl alle Snapshots verloren gehen?"
+
+#. Type: boolean
+#. Description
+#: ../virtualbox-ose.templates:1001
+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."
+msgstr ""
+"Sie aktualisieren virtualbox-ose gerade auf eine neue Entwicklerversion. "
+"Alle Snapshots werden durch diese Aktualisierung unbrauchbar, da Snapshots "
+"versionsabhängig sind."
+

Added: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot	                        (rev 0)
+++ trunk/debian/po/templates.pot	2008-01-08 09:42:28 UTC (rev 183)
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../virtualbox-ose.templates:1001
+msgid "Proceed with virtualbox-ose upgrade despite losing snapshots?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../virtualbox-ose.templates:1001
+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."
+msgstr ""

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-01-07 08:36:36 UTC (rev 182)
+++ trunk/debian/rules	2008-01-08 09:42:28 UTC (rev 183)
@@ -18,6 +18,8 @@
 
 MAKE:=kmk
 
+upstreamversion=$(shell dpkg-parsechangelog | grep Version | cut -d" " -f2 | cut -d"-" -f1)
+
 env.sh: patch-stamp
 	dh_testdir
 	./configure --with-linux="/usr" --disable-kmods
@@ -42,8 +44,11 @@
 
 	# Cleaning package
 	rm -rf out
-	rm -f AutoConfig.kmk configure.log env.sh debian/$(sname).init
+	rm -f AutoConfig.kmk configure.log env.sh
+	rm -f debian/$(sname).init debian/$(sname).preinst
 
+	debconf-updatepo
+
 	dh_clean
 
 #Rebuild the orig.tar.gz
@@ -68,8 +73,8 @@
 	rm -rf ./src/VBox/Additions/linux/selinux-fedora
 	rm -rf ./debian/
 	find . -type d -name '.svn' | xargs rm -rf;
-	cd .. && mv VirtualBox-1.5.4_OSE virtualbox-ose-1.5.4-dfsg && \
-		tar cfz virtualbox-ose_1.5.4-dfsg.orig.tar.gz virtualbox-ose-1.5.4-dfsg
+	cd .. && mv VirtualBox-$(upstreamversion)_OSE virtualbox-ose-$(upstreamversion)-dfsg && \
+		tar cfz virtualbox-ose_$(upstreamversion)-dfsg.orig.tar.gz virtualbox-ose-$(upstreamversion)-dfsg
 
 # install: DH_OPTIONS=
 install: build
@@ -81,6 +86,9 @@
 	# This will get installed into the package by dh_installinit
 	install -m 644 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
+
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
@@ -102,6 +110,7 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_installudev -a
+	dh_installdebconf -a
 	dh_installinit -a
 	dh_installdeb -a
 	dh_shlibdeps -a

Modified: trunk/debian/virtualbox-ose.files/VBox.sh
===================================================================
--- trunk/debian/virtualbox-ose.files/VBox.sh	2008-01-07 08:36:36 UTC (rev 182)
+++ trunk/debian/virtualbox-ose.files/VBox.sh	2008-01-08 09:42:28 UTC (rev 183)
@@ -45,7 +45,8 @@
 if [ ! -c /dev/vboxdrv ]; then
     cat << EOF
 WARNING: The character device /dev/vboxdrv does not exist.
-	 Please install the virtualbox-ose-modules package for your kernel.
+	 Please install the virtualbox-ose-modules package for your kernel and
+	 load the module named vboxdrv into your system.
 
 	 You will not be able to start VMs until this problem is fixed.
 EOF

Added: trunk/debian/virtualbox-ose.preinst.in
===================================================================
--- trunk/debian/virtualbox-ose.preinst.in	                        (rev 0)
+++ trunk/debian/virtualbox-ose.preinst.in	2008-01-08 09:42:28 UTC (rev 183)
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+new=UPSTREAM
+old=`echo $2 | cut -f1 -d"-"`
+
+. /usr/share/debconf/confmodule
+
+if [ $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#
+

Added: trunk/debian/virtualbox-ose.templates
===================================================================
--- trunk/debian/virtualbox-ose.templates	                        (rev 0)
+++ trunk/debian/virtualbox-ose.templates	2008-01-08 09:42:28 UTC (rev 183)
@@ -0,0 +1,8 @@
+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.
+


