[Pkg-virtualbox-commits] [virtualbox] 01/01: Upload to unstable

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository virtualbox.

commit 8bacf3c3dc26211b79a8f9d33ad6f30383deed09
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Dec 19 10:58:16 2015 +0100

    Upload to unstable
---
 debian/changelog                           |  7 +++++++
 debian/patches/04-vboxdrv-references.patch | 10 +++++-----
 debian/patches/fix-gcc-version.patch       | 17 -----------------
 debian/patches/series                      |  1 -
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8eb5a98..92fd517 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (5.0.12-dfsg-1) unstable; urgency=medium
+
+  * New upstream release, patch refresh.
+    - drop fix-gcc-version.patch: upstream.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 19 Dec 2015 10:29:34 +0100
+
 virtualbox (5.0.10-dfsg-7) unstable; urgency=high
 
   * use "--no-enable" to not enable the service by default.
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index dc5e82a..5649c12 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -12,7 +12,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
 -                    pszError = N_("One of the kernel modules was not successfully loaded. Make sure "
 -                                  "that no kernel modules from an older version of VirtualBox exist. "
 -                                  "Then try to recompile and reload the kernel modules by executing "
--                                  "'/sbin/vboxconfig' as root");
+-                                  "'/sbin/rcvboxdrv setup' as root");
 +		    pszError = N_("Please install the virtualbox-dkms package "
 +				  "and execute 'modprobe vboxdrv' as root");
                      break;
@@ -25,7 +25,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
 -                    pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
 -                                  "was either not loaded or /dev/vboxdrv is not set up properly. "
 -                                  "Re-setup the kernel module by executing "
--                                  "'/sbin/vboxconfig' as root");
+-                                  "'/sbin/rcvboxdrv setup' as root");
 +                    pszError = N_("Please install the virtualbox-dkms package "
 +		    		  "and execute 'modprobe vboxdrv' as root");
  #else
@@ -38,7 +38,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
 -                    pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
 -                                  "was either not loaded or /dev/vboxdrv was not created for some "
 -                                  "reason. Re-setup the kernel module by executing "
--                                  "'/sbin/vboxconfig' as root");
+-                                  "'/sbin/rcvboxdrv setup' as root");
 +                    pszError = N_("Please install the virtualbox-dkms package "
 +		    		  "and execute 'modprobe vboxdrv' as root");
  #else
@@ -56,7 +56,7 @@ index 66a1200..e174ae7 100644
 +    "there is a permission problem with /dev/vboxdrv. Please install virtualbox-dkms "
 +    "package and load the kernel "
      "module by executing<br/><br/>"
--    "  <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
+-    "  <font color=blue>'/sbin/rcvboxdrv setup'</font><br/><br/>"
 +    "  <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
      "as root. If it is available in your distribution, you should install the "
      "DKMS package first. This package keeps track of Linux kernel changes and "
@@ -65,7 +65,7 @@ index 66a1200..e174ae7 100644
      "The VirtualBox kernel modules do not match this version of "
      "VirtualBox. The installation of VirtualBox was apparently not "
      "successful. Executing<br/><br/>"
--    "  <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
+-    "  <font color=blue>'/sbin/rcvboxdrv setup'</font><br/><br/>"
 +    "  <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
      "may correct this. Make sure that you do not mix the "
      "OSE version and the PUEL version of VirtualBox."
diff --git a/debian/patches/fix-gcc-version.patch b/debian/patches/fix-gcc-version.patch
deleted file mode 100644
index 9cc55ba..0000000
--- a/debian/patches/fix-gcc-version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: gcc version bumps needs changes in configure script.
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-
---- virtualbox-5.0.10-dfsg.orig/configure
-+++ virtualbox-5.0.10-dfsg/configure
-@@ -430,9 +430,9 @@ check_gcc()
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
-              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
-              -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
--             -o \( $cc_maj -eq 5 -a $cc_min -gt 2 \) \
-+             -o \( $cc_maj -eq 5 -a $cc_min -gt 3 \) \
-              -o $cc_maj -gt 5 ]; then
--        log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10 or gcc 5.2"
-+        log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10 or gcc 5.3"
-         fail really
-       else
-         log_success "found version $cc_ver"
diff --git a/debian/patches/series b/debian/patches/series
index fea5247..5b32c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
-fix-gcc-version.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git