[Pkg-virtualbox-commits] [virtualbox] 03/04: Update for new release

[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 44078eed58e1b21721410775d9aeb3852db7a251
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Nov 11 10:34:52 2015 +0100

    Update for new release
---
 debian/changelog                               |  8 +++++++
 debian/patches/16-no-update.patch              |  2 +-
 debian/patches/29-fix-ftbfs-as-needed.patch    |  2 +-
 debian/patches/36-fix-vnc-version-string.patch |  2 +-
 debian/patches/iasl-fix.patch                  | 33 --------------------------
 debian/patches/series                          |  1 -
 debian/watch                                   |  2 +-
 7 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ca2aad..00eee09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox (5.0.10-dfsg-1) unstable; urgency=medium
+
+  * New upstream release, patch refresh.
+  * Update watch file, thanks <mattia>!
+  * Remove iasl-fix.patch: upstream.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 11 Nov 2015 10:29:52 +0100
+
 virtualbox (5.0.8-dfsg-1) unstable; urgency=medium
 
   * New upstream release, patch refresh.
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index bfcac35..47f3c0b 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -7,7 +7,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	2015-04-02 15:44:20.879669066 +0200
 +++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	2015-04-02 15:44:20.879669066 +0200
-@@ -428,6 +428,8 @@
+@@ -433,6 +433,8 @@
  
  void UIUpdateManager::sltForceCheck()
  {
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index b10126d..4205a42 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
-@@ -5456,7 +5456,7 @@
+@@ -5460,7 +5460,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 bf81699..76f622e 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
-@@ -2620,6 +2620,7 @@
+@@ -2624,6 +2624,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/iasl-fix.patch b/debian/patches/iasl-fix.patch
deleted file mode 100644
index a170b48..0000000
--- a/debian/patches/iasl-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Alexander Eichner <alexander.eichner at oracle.com>
-diff --git a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl
-index 996a3d3..2312304 100644
---- a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl
-+++ b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl
-@@ -27,6 +27,18 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VBOX  ", "VBOXCPUT", 2)
-         Return(LEqual(CPUL, 0x01))
-     }
- 
-+    // Method to notify the VMM that a CPU is not
-+    // in use anymore and can be safely removed.
-+    // Usin the extra method here because the CPUL
-+    // register identifer clashes with the CPUL object defined
-+    // below making iasl starting with version 20150930 fail.
-+    //
-+    // Think of CPLO as "CPU Lock Open"
-+    Method(CPLO, 1)
-+    {
-+        Store (Arg0, CPUL)
-+    }
-+
-     Scope (\_SB)
-     {
- 
-@@ -73,7 +85,7 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VBOX  ", "VBOXCPUT", 2)
-             }                                                              \
-             Method(_EJ0, 1)                                                \
-             {                                                              \
--                Store(id, CPUL) /* Unlock the CPU */                       \
-+                CPLO(id) /* Unlock the CPU */                              \
-                 Return                                                     \
-             }                                                              \
-         }                                                                  \
diff --git a/debian/patches/series b/debian/patches/series
index b8d8887..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
-iasl-fix.patch
diff --git a/debian/watch b/debian/watch
index 53334cf..cb39c88 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=3
 
-opts=dversionmangle=s/-dfsg\d*$//,uversionmangle=s/-.*// \
+opts=downloadurlmangle=s/^/http:/,dversionmangle=s/-dfsg\d*$//,uversionmangle=s/-.*// \
  http://download.virtualbox.org/virtualbox/([\d\.\-]+)/VirtualBox-([\d\.\-]+).tar.bz2 \
  debian /bin/sh debian/get-orig-source.sh

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