[Pkg-virtualbox-commits] [virtualbox] 02/02: New upstream release, patch refresh, drop fix-ftbfs-with-gcc4.9.patch

[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 9135bf68b15e33b1de3283f875c6587877577450
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jul 18 18:02:56 2014 +0200

    New upstream release, patch refresh, drop fix-ftbfs-with-gcc4.9.patch
---
 debian/changelog                               |  6 +++---
 debian/patches/16-no-update.patch              |  2 +-
 debian/patches/29-fix-ftbfs-as-needed.patch    | 14 +++++++-------
 debian/patches/36-fix-vnc-version-string.patch |  2 +-
 debian/patches/fix-ftbfs-with-gcc4.9.patch     | 18 ------------------
 debian/patches/series                          |  1 -
 6 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21a6ad2..2b224db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-virtualbox (4.3.12-dfsg-2) UNRELEASED; urgency=medium
+virtualbox (4.3.14-dfsg-1) UNRELEASED; urgency=medium
 
   [ Gianfranco Costamagna ]
+  * New upstream release (Closes: #754220)
+    thanks Mateusz Łukasik for the patch.
   * Add get-orig-source rules target, to fully comply with
     debian policy. (Closes: #699141), thanks Dmitry!
   * Removing some binary files from the source tarball,
     spotted by lintian.
-  [ Mateusz Łukasik ]
-  * Add fix-ftbfs-with-gcc4.9.patch. (Closes: #754220)
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 02 Jul 2014 12:44:15 +0200
 
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 31f6f28..35411d0 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -20,7 +20,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	2013-11-19 03:42:12.725479132 -0500
 +++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	2013-11-19 03:42:12.721479132 -0500
-@@ -653,7 +653,6 @@
+@@ -658,7 +658,6 @@
      m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 17ac91f..e8920d5 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -5,12 +5,12 @@ Index: virtualbox/Config.kmk
 ===================================================================
 --- virtualbox.orig/Config.kmk	2013-11-19 04:39:48.053639615 -0500
 +++ virtualbox/Config.kmk	2013-11-19 04:39:48.049639615 -0500
-@@ -4836,7 +4836,7 @@
- TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64       = -m64
- TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc64     = -m64
+@@ -4988,7 +4988,7 @@
+ TEMPLATE_VBoxBldProg_LDFLAGS.amd64       = -m64
+ TEMPLATE_VBoxBldProg_LDFLAGS.sparc64     = -m64
   ifeq ($(KBUILD_HOST),linux)
--TEMPLATE_VBOXBLDPROG_LIBS                = pthread m rt dl
-+TEMPLATE_VBOXBLDPROG_LIBS                = pthread m rt dl crypt
+-TEMPLATE_VBoxBldProg_LIBS                = pthread m rt dl
++TEMPLATE_VBoxBldProg_LIBS                = pthread m rt dl crypt
   else ifeq ($(KBUILD_HOST),os2)
- TEMPLATE_VBOXBLDPROG_TOOL                = GXX3OMF
- TEMPLATE_VBOXBLDPROG_LIBS                = socket iconv
+ TEMPLATE_VBoxBldProg_TOOL                = GXX3OMF
+ TEMPLATE_VBoxBldProg_LIBS                = socket iconv
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 58e0903..bd3dc4a 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	2013-11-19 04:41:16.173643708 -0500
 +++ virtualbox/Config.kmk	2013-11-19 04:41:16.169643708 -0500
-@@ -2466,6 +2466,7 @@
+@@ -2487,6 +2487,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-ftbfs-with-gcc4.9.patch b/debian/patches/fix-ftbfs-with-gcc4.9.patch
deleted file mode 100644
index 1d45f06..0000000
--- a/debian/patches/fix-ftbfs-with-gcc4.9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix FTBFS with gcc-4.9
-Author: Mateusz Łukasik <mati75 at linuxmint.pl>
-Bug-Debian: http://bugs.debian.org/754220
-
---- a/configure
-+++ b/configure
-@@ -415,9 +415,9 @@ check_gcc()
-       elif [ $cc_maj -lt 3 \
-              -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 8 \) \
-+             -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
-              -o $cc_maj -gt 4 ]; then
--        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
-+        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<9"
-         fail really
-       else
-         log_success "found version $cc_ver"
diff --git a/debian/patches/series b/debian/patches/series
index 2066813..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
-fix-ftbfs-with-gcc4.9.patch

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