[Pkg-virtualbox-commits] [virtualbox] 03/03: Patch refresh, bump std-version and watch version, upload to unstable
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Sat Mar 5 10:01:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository virtualbox.
commit d9acb65d6b32ee1dc2d4e92e46c8514b187b4368
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sat Mar 5 10:55:15 2016 +0100
Patch refresh, bump std-version and watch version, upload to unstable
---
debian/changelog | 8 ++++++++
debian/control | 2 +-
debian/patches/02-gsoap-build-fix.patch | 2 +-
debian/patches/16-no-update.patch | 4 ++--
debian/patches/27-hide-host-cache-warning.patch | 2 +-
debian/patches/29-fix-ftbfs-as-needed.patch | 2 +-
debian/watch | 2 +-
7 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3bd6b8b..2717004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox (5.0.16-dfsg-1) unstable; urgency=medium
+
+ * New upstream release, patch refresh.
+ * Bump std-version to 3.9.7, no changes required.
+ * Bump watch file version to 4.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Sat, 05 Mar 2016 10:54:36 +0100
+
virtualbox (5.0.14-dfsg-2) unstable; urgency=medium
[ Michael Biebl ]
diff --git a/debian/control b/debian/control
index 03bd21d..e0f722b 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Build-Depends: bzip2,
yasm (>= 0.7.0),
zlib1g-dev
X-Python-Version: >= 2.5
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Homepage: http://www.virtualbox.org/
Vcs-Git: git://anonscm.debian.org/pkg-virtualbox/virtualbox.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-virtualbox/virtualbox.git
diff --git a/debian/patches/02-gsoap-build-fix.patch b/debian/patches/02-gsoap-build-fix.patch
index 459f454..7e396b8 100644
--- a/debian/patches/02-gsoap-build-fix.patch
+++ b/debian/patches/02-gsoap-build-fix.patch
@@ -3,7 +3,7 @@ Index: virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- virtualbox-git-orig.orig/src/VBox/Main/webservice/Makefile.kmk 2013-12-02 12:32:51.211124975 -0500
+++ virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk 2013-12-02 12:36:04.531133954 -0500
-@@ -685,7 +685,7 @@
+@@ -687,7 +687,7 @@
: $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 47f3c0b..80cd567 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -79,7 +79,7 @@ diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp b/s
index 752afd4..0438cef 100644
--- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1235,8 +1235,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1239,8 +1239,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
/* 'About' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -88,7 +88,7 @@ index 752afd4..0438cef 100644
/* 'Network Access Manager' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1279,8 +1277,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1283,8 +1281,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* 'Network Access Manager' action goes to 'File' menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index b8ab21b..ec2e683 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp 2015-04-02 15:46:54.415740583 +0200
+++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp 2015-04-02 15:46:54.411740580 +0200
-@@ -3977,34 +3977,12 @@
+@@ -3843,34 +3843,12 @@
if ( enmFsTypeFile == RTFSTYPE_EXT4
|| enmFsTypeFile == RTFSTYPE_XFS)
{
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 34f73b6..f0a6e2e 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
-@@ -5464,7 +5464,7 @@
+@@ -5530,7 +5530,7 @@
TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64
TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/watch b/debian/watch
index cb39c88..ca8372f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
-version=3
+version=4
opts=downloadurlmangle=s/^/http:/,dversionmangle=s/-dfsg\d*$//,uversionmangle=s/-.*// \
http://download.virtualbox.org/virtualbox/([\d\.\-]+)/VirtualBox-([\d\.\-]+).tar.bz2 \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git
More information about the Pkg-virtualbox-commits
mailing list