[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, experimental, updated. debian/4.1.18-dfsg-2-18-g73d2d44

Felix Geyer fgeyer at debian.org
Sat Mar 2 21:57:49 UTC 2013 

The following commit has been merged in the experimental branch:
commit 94ebcc9f861c838ebaef6c92fe1f2ae0b63fc875
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Jan 26 17:02:43 2013 +0100

    Drop all virtualbox-ose transitional packages.

diff --git a/debian/changelog b/debian/changelog
index 483526a..7e9d016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ virtualbox (4.2.6-dfsg-1) UNRELEASED; urgency=low
   * Refresh patches.
     - Drop 36-fix-ftbfs-xserver-112.patch, cve-2012-3221.patch and
       CVE-2013-0420.patch.
+  * Drop all virtualbox-ose transitional packages.
 
  -- Felix Geyer <fgeyer at debian.org>  Fri, 25 Jan 2013 18:14:24 +0100
 
diff --git a/debian/control b/debian/control
index b6ef678..2451f0b 100644
--- a/debian/control
+++ b/debian/control
@@ -74,11 +74,8 @@ Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          virtualbox (= ${binary:Version})
-Breaks: virtualbox-ose-qt (<< 4.0.6-dfsg-1~),
-        virtualbox (<< 4.1.6-dfsg-2~)
-Replaces: virtualbox-ose-qt (<< 4.0.6-dfsg-1~),
-          virtualbox-ose (<< 2.2.0-dfsg-1~),
-          virtualbox (<< 4.1.6-dfsg-2~)
+Breaks: virtualbox (<< 4.1.6-dfsg-2~)
+Replaces: virtualbox (<< 4.1.6-dfsg-2~)
 Description: x86 virtualization solution - Qt based user interface
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -99,8 +96,6 @@ Recommends: virtualbox-dkms (= ${source:Version}) | virtualbox-source (= ${sourc
 Suggests: virtualbox-guest-additions-iso,
           vde2
 Conflicts: virtualbox-2.0, virtualbox-2.1, virtualbox-2.2, virtualbox-3.0
-Breaks: virtualbox-ose (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose (<< 4.0.6-dfsg-1~)
 Description: x86 virtualization solution - base binaries
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -118,8 +113,6 @@ Architecture: amd64 i386
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${misc:Depends},
          virtualbox (= ${binary:Version}) | virtualbox-guest-utils (= ${binary:Version})
-Breaks: virtualbox-ose-dbg (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-dbg (<< 4.0.6-dfsg-1~)
 Description: x86 virtualization solution - debugging symbols
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -132,9 +125,6 @@ Section: kernel
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${misc:Depends}, virtualbox (>= ${source:Version})
-Breaks: virtualbox-ose-dkms (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-dkms (<< 4.0.6-dfsg-1~),
-          virtualbox-ose-source (<< 3.1.0-dfsg-1~)
 Description: x86 virtualization solution - kernel module sources for dkms
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -153,8 +143,6 @@ Depends: ${misc:Depends},
          bzip2,
          kbuild
 Recommends: module-assistant
-Breaks: virtualbox-ose-source (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-source (<< 4.0.6-dfsg-1~)
 Description: x86 virtualization solution - kernel module source
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -170,9 +158,6 @@ Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${misc:Depends},
          virtualbox-guest-utils (>= ${source:Version})
-Breaks: virtualbox-ose-guest-dkms (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-guest-dkms (<< 4.0.6-dfsg-1~),
-          virtualbox-ose-guest-source (<< 3.1.0-dfsg-1~)
 XB-Modaliases: ${modaliases}
 Description: x86 virtualization solution - guest addition module source for dkms
  VirtualBox is a free x86 virtualization solution allowing a wide range
@@ -192,8 +177,6 @@ Depends: ${misc:Depends},
          bzip2,
          kbuild
 Recommends: module-assistant
-Breaks: virtualbox-ose-guest-source (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-guest-source (<< 4.0.6-dfsg-1~)
 Description: x86 virtualization solution - guest addition module source
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -213,9 +196,6 @@ Depends: ${shlibs:Depends},
          ${xserver:Depends},
          virtualbox-guest-utils (= ${binary:Version})
 Provides: ${xviddriver:Provides}
-Breaks: virtualbox-ose-guest-x11 (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-guest-x11 (<< 4.0.6-dfsg-1~),
-          virtualbox-ose-guest-utils (<< 2.2.0-dfsg-1~)
 Description: x86 virtualization solution - X11 guest utilities
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -234,8 +214,6 @@ Depends: ${shlibs:Depends},
          pciutils
 Recommends: virtualbox-guest-dkms (= ${source:Version}) | virtualbox-guest-source (= ${source:Version}),
             virtualbox-guest-x11 (= ${binary:Version})
-Breaks: virtualbox-ose-guest-utils (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-guest-utils (<< 4.0.6-dfsg-1~)
 Description: x86 virtualization solution - non-X11 guest utilities
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -252,8 +230,6 @@ Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          virtualbox (= ${binary:Version})
-Breaks: virtualbox-ose-fuse (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-fuse (<< 4.0.6-dfsg-1~)
 Description: x86 virtualization solution - virtual filesystem
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -261,103 +237,3 @@ Description: x86 virtualization solution - virtual filesystem
  .
  This package provides a FUSE-based VFS (Virtual FileSystem) to mount a
  VirtualBox disk so all partitions can be loop-mounted.
-
-Package: virtualbox-ose-qt
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox-qt
-Description: transitional package for virtualbox-qt
- This is a dummy transitional package for virtualbox-qt and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox
-Description: transitional package for virtualbox
- This is a dummy transitional package for virtualbox and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-dbg
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox-dbg
-Description: transitional package for virtualbox-dbg
- This is a dummy transitional package for virtualbox-dbg and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-dkms
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox-dkms
-Description: transitional package for virtualbox-dkms
- This is a dummy transitional package for virtualbox-dkms and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-source
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox-source
-Description: transitional package for virtualbox-source
- This is a dummy transitional package for virtualbox-source and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-guest-dkms
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox-guest-dkms
-Description: transitional package for virtualbox-guest-dkms
- This is a dummy transitional package for virtualbox-guest-dkms and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-guest-source
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox-guest-source
-Description: transitional package for virtualbox-guest-source
- This is a dummy transitional package for virtualbox-guest-source and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-guest-x11
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox-guest-x11
-Description: transitional package for virtualbox-guest-x11
- This is a dummy transitional package for virtualbox-guest-x11 and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-guest-utils
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox-guest-utils
-Description: transitional package for virtualbox-guest-utils
- This is a dummy transitional package for virtualbox-guest-utils and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-fuse
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
-         virtualbox-fuse
-Description: transitional package for virtualbox-fuse
- This is a dummy transitional package for virtualbox-fuse and can be
- safely removed after the installation is complete.
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index 6388efd..4ec6879 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -1,4 +1,4 @@
-Description: Change error messages for vboxdrv failure, according to virtualbox-ose-dkms.
+Description: Change error messages for vboxdrv failure, according to virtualbox-dkms.
 Author: Daniel Hahler <ubuntu at thequod.de>
 
 --- a/src/VBox/VMM/VMMR3/VM.cpp
diff --git a/debian/patches/13-module-mismatch.patch b/debian/patches/13-module-mismatch.patch
index 2490944..c8188e0 100644
--- a/debian/patches/13-module-mismatch.patch
+++ b/debian/patches/13-module-mismatch.patch
@@ -12,9 +12,9 @@ Author: Daniel Baumann <daniel at debian.org>
 -                                  "running instances of VirtualBox and reinstalling the software.");
 +                    pszError = N_("The version of the VirtualBox kernel modules and the version of "
 +				  "VirtualBox application are not matching. You can correct this by "
-+				  "either installing the correct virtualbox-ose-modules package "
++				  "either installing the correct virtualbox-modules package "
 +				  "(if available) through apt-get or by building it manually with: "
-+				  "module-assistant auto-install virtualbox-ose");
++				  "module-assistant auto-install virtualbox");
                      break;
                  default:
                      pszError = N_("Unknown error initializing kernel driver");
diff --git a/debian/rules b/debian/rules
index 604322a..ecef94b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ MAKE:=kmk
 
 upstreamversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p')
 
-pkgs_xzcompress = $(shell dh_listpackages | grep -v -e ose -e source)
+pkgs_xzcompress = $(shell dh_listpackages | grep -v -e source)
 
 DIST_NAME := $(shell lsb_release -si)
 DIST_RELEASE := $(DIST_NAME)/$(shell lsb_release -sc)
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 9b63346..2acde93 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,3 +1,2 @@
 virtualbox source: ancient-autotools-helper-file src/VBox/RDP/client/config.sub 2003-06-18
 virtualbox source: ancient-autotools-helper-file src/VBox/RDP/client/config.guess 2003-06-17
-virtualbox source: dbg-package-missing-depends virtualbox-ose-dbg
diff --git a/debian/virtualbox-guest-source.files/control.modules.in b/debian/virtualbox-guest-source.files/control.modules.in
index 3d866f3..005792a 100644
--- a/debian/virtualbox-guest-source.files/control.modules.in
+++ b/debian/virtualbox-guest-source.files/control.modules.in
@@ -15,9 +15,7 @@ Section: kernel
 Architecture: amd64 i386
 Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
 Recommends: virtualbox-guest-utils
-Provides: virtualbox-guest-modules, virtualbox-ose-guest-modules-_KVERS_
-Conflicts: virtualbox-ose-guest-modules-_KVERS_
-Replaces: virtualbox-ose-guest-modules-_KVERS_
+Provides: virtualbox-guest-modules
 Description: VirtualBox guest addition modules for Linux (kernel _KVERS_)
  This package contains the set of loadable kernel modules for VirtualBox Guest Additions.
  .
diff --git a/debian/virtualbox-guest-utils.preinst b/debian/virtualbox-guest-utils.preinst
deleted file mode 100644
index f50f3dd..0000000
--- a/debian/virtualbox-guest-utils.preinst
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-# Remove a no-longer used conffile
-rm_conffile() {
-	PKGNAME="$1"
-	CONFFILE="$2"
-	if [ -e "$CONFFILE" ]; then
-		md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-		old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
-		if [ "$md5sum" != "$old_md5sum" ]; then
-			echo "Obsolete conffile $CONFFILE has been modified by you."
-			echo "Saving as $CONFFILE.dpkg-bak ..."
-			mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-		else
-			echo "Removing obsolete conffile $CONFFILE ..."
-			rm -f "$CONFFILE"
-		fi
-	fi
-}
-
-if [ "$1" = install ]; then
-	# virtualbox-ose-guest-utils << 4.0.6-dfsg-1~
-	if [ -e /etc/init.d/virtualbox-ose-guest-utils ]; then
-		rm_conffile virtualbox-ose-guest-utils /etc/init.d/virtualbox-ose-guest-utils
-		update-rc.d virtualbox-ose-guest-utils remove >/dev/null
-	fi
-fi
diff --git a/debian/virtualbox-source.files/control.modules.in b/debian/virtualbox-source.files/control.modules.in
index 1cde61c..6ae6608 100644
--- a/debian/virtualbox-source.files/control.modules.in
+++ b/debian/virtualbox-source.files/control.modules.in
@@ -15,9 +15,7 @@ Section: kernel
 Architecture: amd64 i386
 Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
 Recommends: virtualbox
-Provides: virtualbox-modules, virtualbox-ose-guest-modules-_KVERS_
-Conflicts: virtualbox-ose-guest-modules-_KVERS_
-Replaces: virtualbox-ose-guest-modules-_KVERS_
+Provides: virtualbox-modules
 Description: VirtualBox modules for Linux (kernel _KVERS_)
  This package contains the set of loadable kernel modules for VirtualBox.
  .
diff --git a/debian/virtualbox.files/VBox.sh b/debian/virtualbox.files/VBox.sh
index 6a9bc60..d270279 100755
--- a/debian/virtualbox.files/VBox.sh
+++ b/debian/virtualbox.files/VBox.sh
@@ -44,7 +44,7 @@ fi
 if [ ! -c /dev/vboxdrv ]; then
     cat << EOF
 WARNING: The character device /dev/vboxdrv does not exist.
-	 Please install the virtualbox-ose-dkms package and the appropriate
+	 Please install the virtualbox-dkms package and the appropriate
 	 headers, most likely linux-headers-$(uname -r | cut -d- -f3).
 
 	 You will not be able to start VMs until this problem is fixed.
diff --git a/debian/virtualbox.postinst b/debian/virtualbox.postinst
index 8333e05..21bd162 100644
--- a/debian/virtualbox.postinst
+++ b/debian/virtualbox.postinst
@@ -4,26 +4,7 @@ set -e
 
 #DEBHELPER#
 
-mv_conffile() {
-	local OLDCONFFILE="$1"
-	local NEWCONFFILE="$2"
-
-	[ -e "$OLDCONFFILE" ] || return 0
-
-	echo "Preserving user changes to $NEWCONFFILE ..."
-	mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
-	mv -f "$OLDCONFFILE" "$NEWCONFFILE"
-}
-
 if [ "$1" = configure ]; then
-	if [ -e /etc/default/virtualbox-ose ]; then
-		mv_conffile /etc/default/virtualbox-ose /etc/default/virtualbox
-		sed -i 's/^# Defaults for virtualbox-ose initscript$/# Defaults for virtualbox initscript/g' /etc/default/virtualbox
-		sed -i 's/^# sourced by \/etc\/init\.d\/virtualbox-ose$/# sourced by \/etc\/init.d\/virtualbox/g' /etc/default/virtualbox
-		sed -i 's/^# installed at \/etc\/default\/virtualbox-ose by the maintainer scripts$/# installed at \/etc\/default\/virtualbox by the maintainer scripts/g' /etc/default/virtualbox
-		sed -i 's/^# Set this to 1 if you would like the virtualbox-ose modules to be loaded by/# Set this to 1 if you would like the virtualbox modules to be loaded by/g' /etc/default/virtualbox
-	fi
-
 	if [ -z `getent group vboxusers` ]; then
 		addgroup --system --quiet vboxusers
 	fi
diff --git a/debian/virtualbox.preinst b/debian/virtualbox.preinst
deleted file mode 100644
index 5a49bea..0000000
--- a/debian/virtualbox.preinst
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-# Remove a no-longer used conffile
-rm_conffile() {
-	PKGNAME="$1"
-	CONFFILE="$2"
-	if [ -e "$CONFFILE" ]; then
-		md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-		old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
-		if [ "$md5sum" != "$old_md5sum" ]; then
-			echo "Obsolete conffile $CONFFILE has been modified by you."
-			echo "Saving as $CONFFILE.dpkg-bak ..."
-			mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-		else
-			echo "Removing obsolete conffile $CONFFILE ..."
-			rm -f "$CONFFILE"
-		fi
-	fi
-}
-
-prep_mv_conffile() {
-	local PKGNAME="$1"
-	local CONFFILE="$2"
-
-	[ -e "$CONFFILE" ] || return 0
-
-	local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
-	local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
-		sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
-	if [ "$md5sum" = "$old_md5sum" ]; then
-		rm -f "$CONFFILE"
-	fi
-}
-
-if [ "$1" = install ]; then
-	# virtualbox-ose << 2.1.2-dfsg-1~
-	rm_conffile virtualbox-ose /etc/network/if-post-down.d/virtualbox-ose
-	rm_conffile virtualbox-ose /etc/network/if-pre-up.d/virtualbox-ose
-	rm_conffile virtualbox-ose /etc/vbox/interfaces
-
-	# virtualbox-ose << 2.2.2-dfsg-3~
-	rm_conffile virtualbox-ose /etc/vbox/vbox.cfg
-
-	# virtualbox-ose << 4.0.6-dfsg-1~
-	if [ -e /etc/init.d/virtualbox-ose ]; then
-		rm_conffile virtualbox-ose /etc/init.d/virtualbox-ose
-		update-rc.d virtualbox-ose remove >/dev/null
-	fi
-	prep_mv_conffile virtualbox-ose /etc/default/virtualbox-ose
-fi

-- 
virtualbox Debian packaging

More information about the Pkg-virtualbox-commits mailing list