[Pkg-virtualbox-commits] [virtualbox] 03/03: New release, upload to unstable

Gianfranco Costamagna locutusofborg at moszumanska.debian.org
Wed Mar 8 23:17:24 UTC 2017


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

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit e18669dc30b2edd2e6ee8d431299879a87fe4638
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Mar 9 00:15:57 2017 +0100

    New release, upload to unstable
---
 debian/changelog                                          |  6 +++++-
 debian/patches/27-hide-host-cache-warning.patch           |  2 +-
 debian/patches/29-fix-ftbfs-as-needed.patch               |  2 +-
 debian/patches/36-fix-vnc-version-string.patch            |  2 +-
 debian/patches/add-prime-to-vbox-video.patch              |  2 +-
 debian/patches/linux-4.10-dont-use-generic-readlink.patch | 14 --------------
 debian/patches/series                                     |  1 -
 7 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2d6128..16dcb6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-virtualbox (5.1.14-dfsg-4) UNRELEASED; urgency=medium
+virtualbox (5.1.16-dfsg-1) unstable; urgency=medium
 
   [ David Baumann ]
   * Fix desktop file (LP: #1507324)
 
+  [ Gianfranco Costamagna ]
+  * New upstream release, patch refresh.
+  * Drop upstream patch for linux 4.10
+
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 06 Mar 2017 15:09:23 +0100
 
 virtualbox (5.1.14-dfsg-3) unstable; urgency=medium
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 346f37d..8669fb1 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp	2015-04-02 15:46:54.415740583 +0200
 +++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp	2015-04-02 15:46:54.411740580 +0200
-@@ -4115,34 +4115,12 @@ int Console::i_configMediumAttachment(const char *pcszDevice,
+@@ -4112,34 +4112,12 @@ int Console::i_configMediumAttachment(const char *pcszDevice,
                      if (   enmFsTypeFile == RTFSTYPE_EXT4
                          || enmFsTypeFile == RTFSTYPE_XFS)
                      {
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index f2f5a25..9ba9b27 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -5,7 +5,7 @@ Index: virtualbox/Config.kmk
 ===================================================================
 --- virtualbox.orig/Config.kmk	2015-04-02 15:46:59.611743003 +0200
 +++ virtualbox/Config.kmk	2015-04-02 15:46:59.611743003 +0200
-@@ -6207,7 +6207,7 @@
+@@ -6198,7 +6198,7 @@
  TEMPLATE_VBoxBldProg_LDFLAGS.amd64       = -m64
  TEMPLATE_VBoxBldProg_LDFLAGS.sparc64     = -m64
   ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 0077bcc..295e810 100644
--- a/debian/patches/36-fix-vnc-version-string.patch
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -3,7 +3,7 @@ Index: virtualbox/Config.kmk
 ===================================================================
 --- virtualbox.orig/Config.kmk	2015-04-02 15:47:04.439745251 +0200
 +++ virtualbox/Config.kmk	2015-04-02 15:47:04.435745250 +0200
-@@ -2963,6 +2963,7 @@
+@@ -2954,6 +2954,7 @@
  	-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
  	-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
  	-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
diff --git a/debian/patches/add-prime-to-vbox-video.patch b/debian/patches/add-prime-to-vbox-video.patch
index 2f77a34..01eed25 100644
--- a/debian/patches/add-prime-to-vbox-video.patch
+++ b/debian/patches/add-prime-to-vbox-video.patch
@@ -52,7 +52,7 @@ Description: fix unity9
  
 --- virtualbox-5.1.14-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h
 +++ virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -313,6 +313,18 @@ void vbox_ttm_placement(struct vbox_bo *
+@@ -320,6 +320,18 @@ void vbox_ttm_placement(struct vbox_bo *
  int vbox_bo_push_sysram(struct vbox_bo *bo);
  int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
  
diff --git a/debian/patches/linux-4.10-dont-use-generic-readlink.patch b/debian/patches/linux-4.10-dont-use-generic-readlink.patch
deleted file mode 100644
index 52c4f19..0000000
--- a/debian/patches/linux-4.10-dont-use-generic-readlink.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/sharedfolders/lnkops.c
-===================================================================
---- virtualbox-5.1.14-dfsg.orig/src/VBox/Additions/linux/sharedfolders/lnkops.c
-+++ virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/sharedfolders/lnkops.c
-@@ -90,7 +90,9 @@ static const char *sf_get_link(struct de
- 
- struct inode_operations sf_lnk_iops =
- {
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
-     .readlink       = generic_readlink,
-+# endif
- # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
-     .get_link       = sf_get_link
- # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
diff --git a/debian/patches/series b/debian/patches/series
index bc9fb75..af60944 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,4 @@
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
 new-xorg-1.19.patch
-linux-4.10-dont-use-generic-readlink.patch
 add-prime-to-vbox-video.patch

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



More information about the Pkg-virtualbox-commits mailing list