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

Gianfranco Costamagna locutusofborg at moszumanska.debian.org
Fri Nov 24 18:36:23 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 c3d4740a0e07c015a6eade38fbc063d7062c4f6e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Nov 24 19:34:08 2017 +0100

    Upload to unstable
---
 debian/changelog                               |  3 +-
 debian/patches/02-gsoap-build-fix.patch        |  2 +-
 debian/patches/12-make-module.patch            |  2 +-
 debian/patches/16-no-update.patch              |  6 +--
 debian/patches/29-fix-ftbfs-as-needed.patch    |  2 +-
 debian/patches/36-fix-vnc-version-string.patch |  2 +-
 debian/patches/69143.patch                     | 66 --------------------------
 debian/patches/69524.patch                     | 13 -----
 debian/patches/fix-build.patch                 | 16 -------
 debian/patches/series                          |  4 --
 debian/patches/try-to-build-vboxvideo.patch    | 15 ------
 11 files changed, 9 insertions(+), 122 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 150525d..5ee90ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-virtualbox (5.2.0-dfsg-6) UNRELEASED; urgency=medium
+virtualbox (5.2.2-dfsg-1) unstable; urgency=medium
 
   * New upstream release (Closes: #880068)
+  * Drop patches, they should be all addressed upstream
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 14 Nov 2017 12:48:20 +0100
 
diff --git a/debian/patches/02-gsoap-build-fix.patch b/debian/patches/02-gsoap-build-fix.patch
index e979005..ced3d54 100644
--- a/debian/patches/02-gsoap-build-fix.patch
+++ b/debian/patches/02-gsoap-build-fix.patch
@@ -3,7 +3,7 @@ Index: virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk
 ===================================================================
 --- virtualbox-git-orig.orig/src/VBox/Main/webservice/Makefile.kmk	2013-12-02 12:32:51.211124975 -0500
 +++ virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk	2013-12-02 12:36:04.531133954 -0500
-@@ -758,7 +758,7 @@
+@@ -767,7 +767,7 @@
  		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
  	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
  	$(RM) -f $@
diff --git a/debian/patches/12-make-module.patch b/debian/patches/12-make-module.patch
index aebce27..de4812d 100644
--- a/debian/patches/12-make-module.patch
+++ b/debian/patches/12-make-module.patch
@@ -3,7 +3,7 @@ Author: Michael Meskes <meskes at debian.org>, Gianfranco Costamagna <locutusofborg
 
 --- a/src/VBox/Installer/linux/Makefile.include.header
 +++ b/src/VBox/Installer/linux/Makefile.include.header
-@@ -43,7 +43,7 @@
+@@ -46,7 +46,7 @@
  # (We have to support basic cross building (ARCH=i386|x86_64).)
  # While at it, warn about BUILD_* vars found to help with user problems.
  #
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 5c0acd9..ef24341 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -77,7 +77,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
 ===================================================================
 --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 +++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1436,8 +1436,6 @@
+@@ -1441,8 +1441,6 @@
      /* 'About' action goes to Application menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
  # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -86,7 +86,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
      /* 'Network Access Manager' action goes to Application menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
  # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1480,7 +1478,7 @@
+@@ -1485,7 +1483,7 @@
      addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
  #  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
@@ -95,7 +95,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
  #  endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
      addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-@@ -1507,9 +1505,6 @@
+@@ -1512,9 +1510,6 @@
  # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      /* 'Network Access Manager' action goes to 'File' menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 268f293..1b84851 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
-@@ -6237,7 +6237,7 @@
+@@ -6288,7 +6288,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 7b829c9..1d70b68 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
-@@ -3053,6 +3053,7 @@
+@@ -3073,6 +3073,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/69143.patch b/debian/patches/69143.patch
deleted file mode 100644
index f066b8d..0000000
--- a/debian/patches/69143.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Origin: https://www.virtualbox.org/log/vbox/trunk/src?rev=69146
-Index: src/VBox/Additions/linux/drm/vbox_fb.c
-===================================================================
---- a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -338,22 +338,7 @@ static int vboxfb_create(struct drm_fb_helper *helper,
- 	return 0;
- }
- 
--static void vbox_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
--			      u16 blue, int regno)
--{
--}
--
--static void vbox_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
--			      u16 *blue, int regno)
--{
--	*red = regno;
--	*green = regno;
--	*blue = regno;
--}
--
- static struct drm_fb_helper_funcs vbox_fb_helper_funcs = {
--	.gamma_set = vbox_fb_gamma_set,
--	.gamma_get = vbox_fb_gamma_get,
- 	.fb_probe = vboxfb_create,
- };
- 
-Index: src/VBox/Additions/linux/drm/vbox_drv.c
-===================================================================
---- a/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ b/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -272,7 +272,9 @@ static struct drm_driver driver = {
- 	.master_set = vbox_master_set,
- 	.master_drop = vbox_master_drop,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- 	.set_busid = drm_pci_set_busid,
-+# endif
- #endif
- 
- 	.fops = &vbox_fops,
-@@ -307,7 +309,7 @@ static struct drm_driver driver = {
- 
- static int __init vbox_init(void)
- {
--#ifdef CONFIG_VGA_CONSOLE
-+#ifdef CONFIG_VGA_CONSOLE || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- 	if (vgacon_text_force() && vbox_modeset == -1)
- 		return -EINVAL;
- #endif
-@@ -315,12 +317,12 @@ static int __init vbox_init(void)
- 	if (vbox_modeset == 0)
- 		return -EINVAL;
- 
--	return drm_pci_init(&driver, &vbox_pci_driver);
-+	return pci_register_driver(&vbox_pci_driver);
- }
- 
- static void __exit vbox_exit(void)
- {
--	drm_pci_exit(&driver, &vbox_pci_driver);
-+	pci_unregister_driver(&vbox_pci_driver);
- }
- 
- module_init(vbox_init);
diff --git a/debian/patches/69524.patch b/debian/patches/69524.patch
deleted file mode 100644
index 31759e5..0000000
--- a/debian/patches/69524.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: virtualbox/src/VBox/Additions/linux/drm/vbox_drv.c
-===================================================================
---- virtualbox.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ virtualbox/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -309,7 +309,7 @@
- 
- static int __init vbox_init(void)
- {
--#ifdef CONFIG_VGA_CONSOLE || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+#if defined(CONFIG_VGA_CONSOLE) || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- 	if (vgacon_text_force() && vbox_modeset == -1)
- 		return -EINVAL;
- #endif
diff --git a/debian/patches/fix-build.patch b/debian/patches/fix-build.patch
deleted file mode 100644
index b7af2f6..0000000
--- a/debian/patches/fix-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description:   * Tentatively fix virtualbox-dkms
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-
-Last-Update: 2017-10-27
-
---- virtualbox-5.2.0-dfsg.orig/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-+++ virtualbox-5.2.0-dfsg/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-@@ -32,7 +32,7 @@
- #include <iprt/string.h>
- #include <iprt/mem.h>
- 
--#include "VBoxPciInternal.h"
-+#include "../VBoxPciInternal.h"
- 
- #ifdef VBOX_WITH_IOMMU
- # include <linux/dmar.h>
diff --git a/debian/patches/series b/debian/patches/series
index 2b3136c..b9151bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,7 +15,3 @@
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
 37-python-3.6-support.patch
-69143.patch
-fix-build.patch
-try-to-build-vboxvideo.patch
-69524.patch
diff --git a/debian/patches/try-to-build-vboxvideo.patch b/debian/patches/try-to-build-vboxvideo.patch
deleted file mode 100644
index 4b24fbb..0000000
--- a/debian/patches/try-to-build-vboxvideo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-Bug-Debian: https://bugs.debian.org/879940
-Last-Update: 2017-10-27
-
---- virtualbox-5.2.0-dfsg.orig/src/VBox/Additions/linux/drm/Makefile.module.kms
-+++ virtualbox-5.2.0-dfsg/src/VBox/Additions/linux/drm/Makefile.module.kms
-@@ -26,7 +26,7 @@ BUILD = 1
- # We want to build on Linux 3.11 and later, plus the 3.10 EL 7.3 and later
- # kernels.  This file was added in 3.11 and back-ported to the EL 7.3 kernel.
- ifeq ($(wildcard $(KERN_INCL)/drm/drm_rect.h),)
-- BUILD =
-+ #BUILD =
- endif
- 
- # And we do not want to build on EL6, regardless of what may have been

-- 
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