[Pkg-virtualbox-commits] [virtualbox] 03/03: New upstream release, 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 e32b9356a405394e8b70dfbc5a5975ce333ece01
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Apr 29 09:51:28 2016 +0200

    New upstream release, upload to unstable
---
 debian/changelog                                 |  8 ++++++++
 debian/patches/99-vboxvideo-module-version.patch | 21 ---------------------
 debian/patches/fix-guest-failure.patch           | 15 ---------------
 debian/patches/series                            |  2 --
 4 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d5537d..bb398c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox (5.0.20-dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+    - drop 99-vboxvideo-module-version.patch,
+      fix-guest-failure.patch: upstream.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 29 Apr 2016 09:49:35 +0200
+
 virtualbox (5.0.18-dfsg-3) unstable; urgency=high
 
   * d/p/fix-guest-failure.patch
diff --git a/debian/patches/99-vboxvideo-module-version.patch b/debian/patches/99-vboxvideo-module-version.patch
deleted file mode 100644
index 441900c..0000000
--- a/debian/patches/99-vboxvideo-module-version.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Add MODULE_VERSION to the vboxvideo driver, so DKMS can find it.
-Author: Adam Conrad <adconrad at ubuntu.com>
-
---- virtualbox-5.0.18-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ virtualbox-5.0.18-dfsg/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -55,6 +55,7 @@
- 
- #include <drm/drmP.h>
- #include <drm/drm_crtc_helper.h>
-+#include "version-generated.h"
- 
- int vbox_modeset = -1;
- 
-@@ -293,4 +294,7 @@ module_exit(vbox_exit);
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_LICENSE("GPL and additional rights");
-+#ifdef MODULE_VERSION
-+MODULE_VERSION(VBOX_VERSION_STRING);
-+#endif
- 
diff --git a/debian/patches/fix-guest-failure.patch b/debian/patches/fix-guest-failure.patch
deleted file mode 100644
index 1b8320e..0000000
--- a/debian/patches/fix-guest-failure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix https://www.virtualbox.org/ticket/15317
-cherry-pick from upstream: 
-https://www.virtualbox.org/changeset/60565/vbox/trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp#file0
-
---- virtualbox-5.0.18-dfsg.orig/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
-+++ virtualbox-5.0.18-dfsg/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
-@@ -3889,7 +3889,7 @@ static DECLCALLBACK(int) lsilogicR3IsaIO
-     else if (RT_FAILURE(rc))
-         AssertMsgFailed(("Writing BIOS register failed %Rrc\n", rc));
- 
--    return rc;
-+    return VINF_SUCCESS;
- }
- 
- /**
diff --git a/debian/patches/series b/debian/patches/series
index daaebd7..5b32c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,5 +14,3 @@
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
-99-vboxvideo-module-version.patch
-fix-guest-failure.patch

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