[Pkg-virtualbox-commits] [virtualbox] 03/05: New upstream release.

[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.2-dfsg-1
in repository virtualbox.

commit 2b105b61334da97d5fe0210c610acb532f22b0ee
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Aug 14 15:43:53 2015 +0200

    New upstream release.
---
 debian/changelog                               |  7 +++++--
 debian/patches/29-fix-ftbfs-as-needed.patch    |  2 +-
 debian/patches/36-fix-vnc-version-string.patch |  2 +-
 debian/patches/fix-gcc-5.2.patch               | 15 +++++++++++++++
 debian/patches/series                          |  1 +
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8ecf7c..f71081a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-virtualbox (5.0.0-dfsg-2) UNRELEASED; urgency=medium
+virtualbox (5.0.2-dfsg-1) UNRELEASED; urgency=medium
 
+  * New upstream release. (Closes: #795424)
+  * Patch refresh.
   * Update my uid.
+  * d/p/fix-gcc-5.2.patch: allow building with gcc-5.2
 
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Sun, 26 Jul 2015 15:44:00 +0200
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 14 Aug 2015 15:43:08 +0200
 
 virtualbox (5.0.0-dfsg-1) experimental; urgency=medium
 
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index e3ea081..92ba6ad 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
-@@ -5389,7 +5389,7 @@
+@@ -5400,7 +5400,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 61c273a..df252e5 100644
--- a/debian/patches/36-fix-vnc-version-string.patch
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -2,7 +2,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
-@@ -2591,6 +2591,7 @@
+@@ -2614,6 +2614,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/fix-gcc-5.2.patch b/debian/patches/fix-gcc-5.2.patch
new file mode 100644
index 0000000..e6ccfb5
--- /dev/null
+++ b/debian/patches/fix-gcc-5.2.patch
@@ -0,0 +1,15 @@
+Description: Allow gcc-5.2 during build
+--- virtualbox-5.0.2-dfsg.orig/configure
++++ virtualbox-5.0.2-dfsg/configure
+@@ -417,9 +417,9 @@ 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 1 \) \
++             -o \( $cc_maj -eq 5 -a $cc_min -gt 2 \) \
+              -o $cc_maj -gt 5 ]; 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.1"
++        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.x with 0<x<3"
+         fail really
+       else
+         log_success "found version $cc_ver"
diff --git a/debian/patches/series b/debian/patches/series
index 5b32c83..532d5e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
+fix-gcc-5.2.patch

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