[Pkg-virtualbox-commits] [virtualbox] 01/01: Upload to unstable, with the gcc-5.4 and gcc-6.1 build failures fixed

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to annotated tag debian/5.0.20-dfsg-3
in repository virtualbox.

commit 260abfbcbf34a376eacbee2a21b8bb2a1f896260
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jun 13 18:16:40 2016 +0200

    Upload to unstable, with the gcc-5.4 and gcc-6.1 build failures fixed
---
 debian/changelog                        |  7 ++++++-
 debian/patches/fix-detect-gcc-5.4.patch | 20 ++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3294581..99e122e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-virtualbox (5.0.20-dfsg-3) UNRELEASED; urgency=medium
+virtualbox (5.0.20-dfsg-3) unstable; urgency=medium
 
   [ Adam Borowski ]
   * debian/patches/fix-kernel-4.7.patch (Closes: #825819)
 
   [ Gianfranco Costamagna ]
   * Conflict with virtualbox-5.1
+  * Upload to unstable.
+
+  [ Mateusz Łukasik ]
+  * debian/patches/fix-detect-gcc-5.4.patch:
+    - Fix build failure with gcc-5.4 and 6.1 (Closes: #827193)
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 30 May 2016 12:30:24 +0200
 
diff --git a/debian/patches/fix-detect-gcc-5.4.patch b/debian/patches/fix-detect-gcc-5.4.patch
new file mode 100644
index 0000000..d7869ca
--- /dev/null
+++ b/debian/patches/fix-detect-gcc-5.4.patch
@@ -0,0 +1,20 @@
+Description: Fix detect version of gcc. Update to gcc 5.4 and 6.1.
+Author: Mateusz Łukasik <mati75 at linuxmint.pl>
+Bug-Debian: https://bugs.debian.org/827193
+
+--- a/configure
++++ b/configure
+@@ -430,10 +430,10 @@ 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 6 -a $cc_min -gt 0 \) \
++             -o \( $cc_maj -eq 5 -a $cc_min -gt 9 \) \
++             -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 or gcc 5.3"
++        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"
+         fail really
+       else
+         log_success "found version $cc_ver"
diff --git a/debian/patches/series b/debian/patches/series
index 0591094..360189a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 36-fix-vnc-version-string.patch
 fix-gcc-pie.patch
 fix-kernel-4.7.patch
+fix-detect-gcc-5.4.patch

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