[Pkg-virtualbox-commits] [virtualbox] 04/06: Patch drop/refresh

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch experimental
in repository virtualbox.

commit 14ddcdbb83dc61451ab6b5c0e39430952ef88309
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jun 20 17:36:00 2016 +0200

    Patch drop/refresh
---
 debian/changelog                               |  2 +-
 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/gcc-5.4.patch                   | 13 -------------
 debian/patches/series                          |  1 -
 6 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30d3d72..f8baeb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-virtualbox (5.1.0~BETA1-dfsg-1) UNRELEASED; urgency=medium
+virtualbox (5.1.0~BETA3-dfsg-1) UNRELEASED; urgency=medium
 
   [ Adam Borowski ]
   * debian/patches/fix-kernel-4.7.patch (Closes: #825819)
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index ed1f922..f3436d3 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -108,7 +108,7 @@ Index: virtualbox/doc/manual/en_US/user_Introduction.xml
 ===================================================================
 --- virtualbox.orig/doc/manual/en_US/user_Introduction.xml
 +++ virtualbox/doc/manual/en_US/user_Introduction.xml
-@@ -1761,10 +1761,12 @@
+@@ -1758,10 +1758,12 @@
           used to trigger certain VM actions (see <xref
           linkend="specialcharacters"/>)</para>
        </listitem>
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 372daa9..4ed12f3 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
-@@ -5815,7 +5815,7 @@
+@@ -5838,7 +5838,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 fc7740b..d21eade 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
-@@ -2817,6 +2817,7 @@
+@@ -2823,6 +2823,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/gcc-5.4.patch b/debian/patches/gcc-5.4.patch
deleted file mode 100644
index b84ff56..0000000
--- a/debian/patches/gcc-5.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-
---- virtualbox-5.1.0~BETA1-dfsg.orig/configure
-+++ virtualbox-5.1.0~BETA1-dfsg/configure
-@@ -438,7 +438,7 @@ 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 3 \) \
-+             -o \( $cc_maj -eq 5 -a $cc_min -gt 4 \) \
-              -o \( $cc_maj -eq 6 -a $cc_min -gt 1 \) \
-              -o $cc_maj -gt 6 ]; 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, gcc 5.x with x<10 or gcc 6.x with x<2"
diff --git a/debian/patches/series b/debian/patches/series
index 825906d..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
-gcc-5.4.patch

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