[Pkg-virtualbox-commits] [virtualbox] 01/01: Add some procps stuff, merge VBox.sh script, thanks klaus!

[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 a71be34a83dfe3963a61cb8f8feaef8b3831340b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jan 13 13:10:16 2016 +0100

    Add some procps stuff, merge VBox.sh script, thanks klaus!
---
 debian/changelog                |  3 +++
 debian/control                  |  7 ++++-
 debian/virtualbox.files/VBox.sh | 57 ++++++++++++++++++++++++-----------------
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a57088..e26fc10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 virtualbox (5.0.12-dfsg-3) UNRELEASED; urgency=medium
 
   * Rework rules file to work also when only guest packages needs to be built.
+  * Merge VBox.sh script with upstream, and add procps to runtime dependencies
+    thanks Andreas Beckmann <anbe at debian.org>
+    -cfr https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802143#26
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 08 Jan 2016 16:14:58 +0100
 
diff --git a/debian/control b/debian/control
index fa0b56c..03bd21d 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,12 @@ Description: x86 virtualization solution - Qt based user interface
 
 Package: virtualbox
 Architecture: amd64 i386
-Depends: adduser, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, virtualbox-dkms (>= ${source:Version}) | virtualbox-source (>= ${source:Version}) | virtualbox-modules
+Depends: adduser,
+         procps,
+         virtualbox-dkms (>= ${source:Version}) | virtualbox-source (>= ${source:Version}) | virtualbox-modules,
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Recommends: virtualbox-qt (= ${binary:Version}), ${shlibs:Recommends}
 Suggests: vde2, virtualbox-guest-additions-iso
 Conflicts: virtualbox-2.0,
diff --git a/debian/virtualbox.files/VBox.sh b/debian/virtualbox.files/VBox.sh
index cd2f37c..bf50578 100755
--- a/debian/virtualbox.files/VBox.sh
+++ b/debian/virtualbox.files/VBox.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
+## @file
+# Oracle VM VirtualBox startup script, Linux hosts.
 #
+
 # written by Patrick Winnertz <patrick.winnertz at skolelinux.org> and
 # Michael Meskes <meskes at debian.org>
 # and placed under GPLv2
@@ -7,7 +10,7 @@
 # this is based on a script by
 # Oracle VirtualBox
 #
-# Copyright (C) 2006-2011 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -16,6 +19,7 @@
 # Foundation, in version 2 as it comes in the "COPYING" file of the
 # VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
 
 PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 
@@ -48,28 +52,33 @@ fi
 
 APP=`basename $0`
 case "$APP" in
-  VirtualBox|virtualbox)
-    exec "$INSTALL_DIR/VirtualBox" "$@"
-  ;;
-  VBoxManage|vboxmanage)
-    exec "$INSTALL_DIR/VBoxManage" "$@"
-  ;;
-  VBoxSDL|vboxsdl)
-    exec "$INSTALL_DIR/VBoxSDL" "$@"
-  ;;
-  VBoxHeadless|vboxheadless)
-    exec "$INSTALL_DIR/VBoxHeadless" "$@"
-  ;;
-  VBoxBalloonCtrl|vboxballoonctrl)
-    exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
-  ;;
-  vboxwebsrv)
-    exec "$INSTALL_DIR/vboxwebsrv" "$@"
-  ;;
-  *)
-    echo "Unknown application - $APP"
-    exit 1
-  ;;
+    VirtualBox|virtualbox)
+        exec "$INSTALL_DIR/VirtualBox" "$@"
+        ;;
+    VBoxManage|vboxmanage)
+        exec "$INSTALL_DIR/VBoxManage" "$@"
+        ;;
+    VBoxSDL|vboxsdl)
+        exec "$INSTALL_DIR/VBoxSDL" "$@"
+        ;;
+    VBoxVRDP|VBoxHeadless|vboxheadless)
+        exec "$INSTALL_DIR/VBoxHeadless" "$@"
+        ;;
+    VBoxAutostart|vboxautostart)
+        exec "$INSTALL_DIR/VBoxAutostart" "$@"
+        ;;
+    VBoxBalloonCtrl|vboxballoonctrl)
+        exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
+        ;;
+    VBoxDTrace|vboxdtrace)
+        exec "$INSTALL_DIR/VBoxDTrace" "$@"
+        ;;
+    vboxwebsrv)
+        exec "$INSTALL_DIR/vboxwebsrv" "$@"
+        ;;
+    *)
+        echo "Unknown application - $APP"
+        exit 1
+        ;;
 esac
-
 exit 0

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