[Pkg-virtualbox-commits] [virtualbox] 01/05: Update packaging with experimental fixes
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Jul 14 15:37:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository virtualbox.
commit 1019af195ac1bab5fd09b72e7767d163205d4a80
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Jul 14 15:17:04 2015 +0200
Update packaging with experimental fixes
---
debian/changelog | 22 +++++++++++++++++++++-
debian/control | 10 +++++-----
debian/copyright | 2 +-
debian/get-orig-source.sh | 1 +
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/rules | 11 +++++------
debian/virtualbox.install | 2 +-
debian/virtualbox.lintian-overrides | 8 +++++---
10 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5a3dd84..211f9b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,26 @@
-virtualbox (4.3.28-dfsg-2) UNRELEASED; urgency=medium
+virtualbox (4.3.30-dfsg-1) UNRELEASED; urgency=medium
+ [ Ritesh Raj Sarraf ]
+ * Imported upstream release.
+ [ Gianfranco Costamagna ]
* Readd again some removed lintian overrides.
+ * virtualbox 4.3.30 builds fine with gcc 5.1, removing the
+ gcc-4.9 workaround (d/{rules,control})
+ * Update copyright file.
+ * Patch refresh.
+ * remove obsolete lintian overrides.
+ * add some wrongly removed lintian overrides.
+ * Add VBoxDTrace not linked against libc lintian override.
+ It seems to really not use libc symbols.
+ * d/rules: remove VBoxDTraceR0.debug and strip VBoxDTraceR0.r0
+ files.
+ * d/rules: sed .gc to .rc (following upstream rename change)
+ * update d/source.lintian-overrides file.
+ * Remove some more windows prebuilt files.
+ * Add libnotify-bin as runtime-dependency for the x11 package
+ (used for notify-send command) (Closes: #792292)
+ - Thanks Torquil Macdonald Sørensen for the useful and complete
+ bug report.
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 03 Jun 2015 07:03:36 +0200
diff --git a/debian/control b/debian/control
index 3329a66..2307870 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,7 @@ Build-Depends: bzip2,
docbook-xml,
docbook-xsl,
dpkg-dev (>= 1.15.6~),
- g++-4.9,
- g++-multilib ( << 4:5-0 ) [amd64],
- gcc-4.9,
+ g++-multilib,
genisoimage,
gsoap (>= 2.8.16),
iasl,
@@ -104,7 +102,8 @@ Conflicts: virtualbox-2.0,
virtualbox-4.0,
virtualbox-4.1,
virtualbox-4.2,
- virtualbox-4.3
+ virtualbox-4.3,
+ virtualbox-5.0
Description: x86 virtualization solution - base binaries
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -200,7 +199,8 @@ Package: virtualbox-guest-x11
Section: contrib/x11
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: virtualbox-guest-utils (= ${binary:Version}),
+Depends: libnotify-bin,
+ virtualbox-guest-utils (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
${xserver:Depends}
diff --git a/debian/copyright b/debian/copyright
index 3f49247..68f54b4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,7 @@ Upstream Author: Oracle Corporation
Copyright:
- Copyright (C) 2004-2011 Oracle Corporation
+ Copyright (C) 2004-2015 Oracle Corporation
VirtualBox contains portions of QEMU which is governed by the licenses in and and
Copyright (C) 2003-2005 Fabrice Bellard; Copyright (C) 2004-2005 Vassili Karpov (malc);
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index c09cd40..d78c7a0 100755
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -44,6 +44,7 @@ rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/FatBinPkg/EnhancedFatDx
rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/StdLib/LibC/Main/Ia32/ftol2.obj
rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Python/UPT/Dll/sqlite3.dll
rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Main/webservice/jaxlibs/*.jar
+rm -rf ${ORIG_TARBALL_DIR}/src/VBox/HostDrivers/Support/win/winstub.com
tar --exclude .svn --exclude '.git*' --exclude debian --directory ${WORKING_DIR} -cJf ${DEST_TARBALL_NAME} ${ORIG_TARBALL_DIR_STRIP} || exit 1
rm -rf ${ORIG_TARBALL_DIR}
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 35411d0..96fd48b 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -44,7 +44,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2013-11-19 03:42:12.725479132 -0500
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2013-11-19 04:34:19.701624365 -0500
-@@ -1331,12 +1331,6 @@
+@@ -1332,12 +1332,6 @@
pMenu->addSeparator();
m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
pMenu->addAction(m_pNetworkAccessManager);
@@ -57,7 +57,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
#ifndef Q_WS_MAC
pMenu->addSeparator();
-@@ -1473,7 +1467,6 @@
+@@ -1474,7 +1468,6 @@
connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index c247625..27338ce 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 2013-12-03 07:11:18.165655881 -0500
+++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp 2013-12-03 07:12:44.373659885 -0500
-@@ -3616,34 +3616,12 @@
+@@ -3620,34 +3620,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 2d49681..2f4ba25 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 2013-11-19 04:39:48.053639615 -0500
+++ virtualbox/Config.kmk 2013-11-19 04:39:48.049639615 -0500
-@@ -5043,7 +5043,7 @@
+@@ -5049,7 +5049,7 @@
TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64
TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/rules b/debian/rules
index 1b7fa4d..83fbae7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,9 +51,7 @@ endif
--disable-kmods \
--enable-webservice \
--enable-vde \
- --enable-vnc \
- --with-gcc=gcc-4.9 \
- --with-g++=g++-4.9
+ --enable-vnc
override_dh_auto_build:
# Building package
@@ -134,7 +132,7 @@ override_dh_fixperms:
chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetAdpCtl
chmod +s debian/$(sxname)$(INSTALL_PATH)/VirtualBox
- chmod 644 debian/$(sname)$(INSTALL_PATH)/*.gc
+ chmod 644 debian/$(sname)$(INSTALL_PATH)/*.rc
chmod 644 debian/$(sname)$(INSTALL_PATH)/*.r0
chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/*.py
@@ -175,13 +173,14 @@ override_dh_strip:
# strip files not handled by dh_strip
ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
- set -e && for file in debian/$(sname)/usr/lib/virtualbox/*.gc debian/$(sname)/usr/lib/virtualbox/*.r0; do \
+ set -e && for file in debian/$(sname)/usr/lib/virtualbox/*.rc debian/$(sname)/usr/lib/virtualbox/*.r0 debian/$(sname)/usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/*.r0; do \
strip --strip-debug --remove-section=.comment --remove-section=.note $${file}; \
done
endif
# I don't see a reason to have these. If any user complains, we can try ship it.
- rm -f debian/$(sname)/usr/lib/virtualbox/VMMGC.debug
+ rm -f debian/$(sname)/usr/lib/virtualbox/VMMRC.debug
rm -f debian/$(sname)/usr/lib/virtualbox/VMMR0.debug
+ rm -f debian/$(sname)/usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/VBoxDTraceR0.debug
override_dh_shlibdeps:
dh_shlibdeps -p$(sname) -X debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -- \
diff --git a/debian/virtualbox.install b/debian/virtualbox.install
index 1612e66..7eee01c 100644
--- a/debian/virtualbox.install
+++ b/debian/virtualbox.install
@@ -4,7 +4,7 @@ out/bin/components /usr/lib/virtualbox
out/bin/ExtensionPacks /usr/lib/virtualbox
out/bin/VBoxREM.so /usr/lib/virtualbox
out/bin/VBox*.so /usr/lib/virtualbox
-out/bin/VBox*.gc /usr/lib/virtualbox
+out/bin/VBox*.rc /usr/lib/virtualbox
out/bin/VBox*.r0 /usr/lib/virtualbox
out/bin/VBoxAutostart /usr/lib/virtualbox
out/bin/VBoxBalloonCtrl /usr/lib/virtualbox
diff --git a/debian/virtualbox.lintian-overrides b/debian/virtualbox.lintian-overrides
index 95bd216..e2e14a8 100644
--- a/debian/virtualbox.lintian-overrides
+++ b/debian/virtualbox.lintian-overrides
@@ -6,15 +6,17 @@ virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxRT.so
virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVMM.so
virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so
virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so
-virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2GC.gc
+virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2RC.rc
virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2R0.r0
-virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDGC.gc
+virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDRC.rc
virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDR0.r0
-virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VMMGC.gc
+virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VMMRC.rc
virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VMMR0.r0
+virtualbox: unstripped-binary-or-object usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/VBoxDTraceR0.r0
virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxHeadless 6755 root/root
virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxNetAdpCtl 6755 root/root
virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxNetDHCP 6755 root/root
virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxSDL 6755 root/root
virtualbox: jar-not-in-usr-share usr/lib/virtualbox/sdk/bindings/xpcom/java/vboxjxpcom.jar
virtualbox: embedded-library usr/lib/virtualbox/VBoxXPCOM.so: nspr
+virtualbox: library-not-linked-against-libc usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/VBoxDTraceMain.so
--
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