[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 05/06: Merge with 5.0 fixes
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Thu Feb 4 10:10:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch precise
in repository virtualbox-guest-additions-iso.
commit afadbabe4c01c2b2c2dbb0a203f4099c9ecd755e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Thu Feb 4 11:04:18 2016 +0100
Merge with 5.0 fixes
---
debian/changelog | 24 ++++++++++++++++++++---
debian/compat | 2 +-
debian/control | 35 ++++++++++++++++-----------------
debian/copyright | 9 ++++++---
debian/get-orig-source.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++++
debian/watch | 2 +-
6 files changed, 95 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 85eeae5..e199cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,27 @@
-virtualbox-guest-additions-iso (4.1.40-1+deb7u1) wheezy-security; urgency=medium
+virtualbox-guest-additions-iso (4.1.44-1) unstable; urgency=medium
+ [ Gianfranco Costamagna ]
* New upstream release.
- - Upload to wheezy-security, following up the same virtualbox upload.
+ * Conflict with upstream proprietary packages 5.0 series.
+ * Conflict with upstream proprietary packages 4.3 series.
+ * Update copyright year.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * New upstream release.
+ * Add myself to uploaders.
+ * Wrap-and-sort source tree.
+ * Fix some copyright entries.
+ * Bump compat level to 9.
+
+ [ Felix Geyer ]
+ * Remove myself from uploaders.
+ * Use canonical URIs for Vcs-* fields.
+ * Add missing Files field to debian/copyright.
+ * Switch to my @debian.org email address.
+
+ [ Ritesh Raj Sarraf ]
+ * [292a57b] Add myself to uploaders
- -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 17 Sep 2015 12:56:02 +0200
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 04 Feb 2016 11:03:30 +0100
virtualbox-guest-additions-iso (4.1.18-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 2567e03..ca41fc1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,29 @@ Source: virtualbox-guest-additions-iso
Section: non-free/misc
Priority: extra
Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
-Uploaders: Felix Geyer <debfx-pkg at fobos.de>, Michael Meskes <meskes at debian.org>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.9.3
+Uploaders: Ritesh Raj Sarraf <rrs at debian.org>,
+ Gianfranco Costamagna <locutusofborg at debian.org>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.6
Homepage: http://www.virtualbox.org/
-Vcs-Git: git://git.debian.org/pkg-virtualbox/virtualbox-guest-additions-iso.git
-Vcs-Browser: http://git.debian.org/?p=pkg-virtualbox/virtualbox-guest-additions-iso.git
+Vcs-Git: git://anonscm.debian.org/pkg-virtualbox/virtualbox-guest-additions-iso.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-virtualbox/virtualbox-guest-additions-iso.git
Package: virtualbox-guest-additions-iso
Architecture: all
Depends: ${misc:Depends}
Recommends: virtualbox (>= ${source:Upstream-Version})
-Conflicts: virtualbox-2.0, virtualbox-2.1, virtualbox-2.2,
- virtualbox-3.0, virtualbox-3.1, virtualbox-3.2, virtualbox-4.0,
- virtualbox-4.1
+Conflicts: virtualbox-2.0,
+ virtualbox-2.1,
+ virtualbox-2.2,
+ virtualbox-3.0,
+ virtualbox-3.1,
+ virtualbox-3.2,
+ virtualbox-4.0,
+ virtualbox-4.1,
+ virtualbox-4.2,
+ virtualbox-4.3,
+ virtualbox-5.0
Breaks: virtualbox-guest-additions (<< 4.0.6-1~)
Replaces: virtualbox-guest-additions (<< 4.0.6-1~)
Description: guest additions iso image for VirtualBox
@@ -27,12 +35,3 @@ Description: guest additions iso image for VirtualBox
This package provides an iso image which contains the guest additions
for Linux, Solaris and Windows to be installed on the host system. The guest
systems then can mount the iso and install the guest additions from there.
-
-Package: virtualbox-guest-additions
-Section: non-free/oldlibs
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-guest-additions-iso
-Description: transitional package for virtualbox-guest-additions-iso
- This is a dummy transitional package for virtualbox-guest-additions-iso and
- can be safely removed after the installation is complete.
diff --git a/debian/copyright b/debian/copyright
index 8244f11..e33c34c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,8 +8,9 @@ Disclaimer: This package is formally not part of the Debian GNU/Linux
only allows the redistribution of "unmodified copies of the ISO
installation medium", but not the source code.
+Files: *
Copyright: 2004-2010, Oracle Corporation
-License:
+License: Virtualbox-PUEL
VirtualBox PUEL terms and conditions
.
License version 8, April 19, 2010
@@ -159,9 +160,11 @@ License:
Agreement.
Files: debian/*
-Copyright: 2009-2010, Felix Geyer <debfx-pkg at fobos.de>
+Copyright: 2009-2014, Felix Geyer <debfx-pkg at fobos.de>
2009-2010, Michael Meskes <meskes at debian.org>
+ 2013-2014, Ritesh Raj Sarraf <rrs at debian.org>
+ 2014-2015, Gianfranco Costamagna <locutusofborg at debian.org>
License: GPL-2+
- On Debian systems the full text of the GNU General Public
+ On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
new file mode 100755
index 0000000..89784e0
--- /dev/null
+++ b/debian/get-orig-source.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+set -ex
+
+if [ $# -ne 3 ]; then
+ echo "Error: 3 parameters are required."
+ exit 1
+fi
+
+if [ "$1" != "--upstream-version" ]; then
+ echo "Error: First parameter needs to be --upstream-version."
+ exit 1
+fi
+
+UPSTREAM_VERSION=$2
+ORIG_TARBALL=$3
+
+ORGDIR=`pwd`
+
+cd `dirname $ORIG_TARBALL`
+if ! wget -O - http://download.virtualbox.org/virtualbox/$UPSTREAM_VERSION/SHA256SUMS | grep iso | sha256sum -c --strict -; then
+ echo "Error: checksum doesn't match."
+ exit 1
+fi
+cd $ORGDIR
+
+PACKAGE_NAME=`awk '/^Source: / { print $2 }' debian/control`
+
+if [ -z "$PACKAGE_NAME" ]; then
+ echo "Error: couldn't determine package name."
+ exit 1
+fi
+
+TMP=`mktemp -d`
+
+if [ -z "$TMP" ]; then
+ echo "Error: couldn't create a tmp dir."
+ exit 1
+fi
+
+trap 'rm -r $TMP' EXIT
+
+mkdir $TMP/${PACKAGE_NAME}-$UPSTREAM_VERSION
+mv $ORIG_TARBALL $TMP/${PACKAGE_NAME}-$UPSTREAM_VERSION/
+cd $TMP
+tar czf ${PACKAGE_NAME}_$UPSTREAM_VERSION.orig.tar.gz ${PACKAGE_NAME}-$UPSTREAM_VERSION
+mv ${PACKAGE_NAME}_$UPSTREAM_VERSION.orig.tar.gz $ORGDIR/../
+cd $ORGDIR
+echo "Done, now you can run gbp import-orig ../${PACKAGE_NAME}_$UPSTREAM_VERSION.orig.tar.gz"
diff --git a/debian/watch b/debian/watch
index 0a6803d..ad3c6bd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
http://download.virtualbox.org/virtualbox/([\d\.\-]+)/VBoxGuestAdditions_([\d\.\-]+).iso \
- debian debian/create-upstream-tarball
+ debian /bin/sh debian/get-orig-source.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox-guest-additions-iso.git
More information about the Pkg-virtualbox-commits
mailing list