[Pkg-virtualbox-commits] [virtualbox] 03/03: New upstream release, patch refresh
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Oct 14 13:59:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository virtualbox.
commit 4f04ab75c218d529e725f664d54997000103c857
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Oct 14 15:59:31 2014 +0200
New upstream release, patch refresh
---
debian/changelog | 7 ++-
debian/control | 59 ++++++++++++--------------
debian/copyright | 2 +-
debian/patches/29-fix-ftbfs-as-needed.patch | 2 +-
debian/patches/36-fix-vnc-version-string.patch | 2 +-
5 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5a38acb..1b051b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-virtualbox (4.3.16-dfsg-1) UNRELEASED; urgency=medium
+virtualbox (4.3.18-dfsg-1) UNRELEASED; urgency=medium
[ Gianfranco Costamagna ]
- * Imported Upstream version 4.3.16-dfsg
+ * Imported Upstream release.
+ * Add myself to uploaders.
* Patch refresh.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Wrap-and-sort control file.
[ Felix Geyer ]
* Remove myself from uploaders.
diff --git a/debian/control b/debian/control
index 378a783..157c41e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: contrib/misc
Priority: optional
Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
Uploaders: Michael Meskes <meskes at debian.org>,
- Ritesh Raj Sarraf <rrs at debian.org>
+ Ritesh Raj Sarraf <rrs at debian.org>,
+ Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Build-Depends: bzip2,
debhelper (>= 9),
default-jdk,
@@ -67,7 +68,7 @@ Build-Depends: bzip2,
yasm (>= 0.7.0),
zlib1g-dev
X-Python-Version: >= 2.5
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.virtualbox.org/
Vcs-Git: git://anonscm.debian.org/pkg-virtualbox/virtualbox.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-virtualbox/virtualbox.git
@@ -75,9 +76,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-virtualbox/virtualbox.git
Package: virtualbox-qt
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- virtualbox (= ${binary:Version})
+Depends: virtualbox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: virtualbox (<< 4.1.6-dfsg-2~)
Replaces: virtualbox (<< 4.1.6-dfsg-2~)
Description: x86 virtualization solution - Qt based user interface
@@ -90,16 +89,16 @@ Description: x86 virtualization solution - Qt based user interface
Package: virtualbox
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${python:Depends},
- adduser
+Depends: adduser, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
Recommends: virtualbox-dkms (= ${source:Version}) | virtualbox-source (= ${source:Version}),
virtualbox-qt (= ${binary:Version}),
${shlibs:Recommends}
-Suggests: virtualbox-guest-additions-iso,
- vde2
-Conflicts: virtualbox-2.0, virtualbox-2.1, virtualbox-2.2, virtualbox-3.0, virtualbox-4.2
+Suggests: vde2, virtualbox-guest-additions-iso
+Conflicts: virtualbox-2.0,
+ virtualbox-2.1,
+ virtualbox-2.2,
+ virtualbox-3.0,
+ virtualbox-4.2
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
@@ -115,8 +114,8 @@ Section: contrib/debug
Priority: extra
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends},
- virtualbox (= ${binary:Version}) | virtualbox-guest-utils (= ${binary:Version})
+Depends: virtualbox (= ${binary:Version}) | virtualbox-guest-utils (= ${binary:Version}),
+ ${misc:Depends}
Description: x86 virtualization solution - debugging symbols
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
@@ -128,7 +127,7 @@ Package: virtualbox-dkms
Section: contrib/kernel
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, virtualbox (>= ${source:Version})
+Depends: virtualbox (>= ${source:Version}), ${misc:Depends}
Description: x86 virtualization solution - kernel module sources for dkms
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
@@ -141,12 +140,12 @@ Description: x86 virtualization solution - kernel module sources for dkms
Package: virtualbox-source
Section: contrib/kernel
Architecture: all
-Depends: ${misc:Depends},
- build-essential,
- debhelper (>= 9),
+Depends: build-essential,
bzip2,
+ debhelper (>= 9),
kbuild,
- module-assistant
+ module-assistant,
+ ${misc:Depends}
Description: x86 virtualization solution - kernel module source
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
@@ -160,8 +159,7 @@ Package: virtualbox-guest-dkms
Section: contrib/kernel
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends},
- virtualbox-guest-utils (>= ${source:Version})
+Depends: virtualbox-guest-utils (>= ${source:Version}), ${misc:Depends}
XB-Modaliases: ${modaliases}
Description: x86 virtualization solution - guest addition module source for dkms
VirtualBox is a free x86 virtualization solution allowing a wide range
@@ -175,12 +173,12 @@ Description: x86 virtualization solution - guest addition module source for dkms
Package: virtualbox-guest-source
Section: contrib/kernel
Architecture: all
-Depends: ${misc:Depends},
- build-essential,
- debhelper (>= 9),
+Depends: build-essential,
bzip2,
+ debhelper (>= 9),
kbuild,
- module-assistant
+ module-assistant,
+ ${misc:Depends}
Description: x86 virtualization solution - guest addition module source
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
@@ -195,10 +193,10 @@ Package: virtualbox-guest-x11
Section: contrib/x11
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
+Depends: virtualbox-guest-utils (= ${binary:Version}),
${misc:Depends},
- ${xserver:Depends},
- virtualbox-guest-utils (= ${binary:Version})
+ ${shlibs:Depends},
+ ${xserver:Depends}
Provides: xorg-driver-video
Description: x86 virtualization solution - X11 guest utilities
VirtualBox is a free x86 virtualization solution allowing a wide range
@@ -212,10 +210,7 @@ Description: x86 virtualization solution - X11 guest utilities
Package: virtualbox-guest-utils
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- adduser,
- pciutils
+Depends: adduser, pciutils, ${misc:Depends}, ${shlibs:Depends}
Recommends: virtualbox-guest-dkms (= ${source:Version}) | virtualbox-guest-source (= ${source:Version}),
virtualbox-guest-x11 (= ${binary:Version})
Description: x86 virtualization solution - non-X11 guest utilities
diff --git a/debian/copyright b/debian/copyright
index 869aa1f..8badc6d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -102,7 +102,7 @@ Copyright:
VirtualBox may contain x86 SIMD extension for IJG JPEG library which is governed by the
license in the section called "x86 SIMD extension for IJG JPEG library license" and
Copyright 2009 Pierre Ossman <ossman at cendio.se> for Cendio AB;
- Copyright 2010 D. R. Commander; Copyright (C) 1999-2006, MIYASAKA Masaru.
+ Copyright 2010 D. R. Commander; Copyright (C) 1999-2006, MIYASAKA Masaru.
License:
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index b2bb792..54c8c09 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
-@@ -5005,7 +5005,7 @@
+@@ -5013,7 +5013,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 4c977a8..a43e64f 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
-@@ -2489,6 +2489,7 @@
+@@ -2493,6 +2493,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' \
--
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