[Pkg-virtualbox-commits] [virtualbox] 01/04: Fix lintian error, fixed with the alias keyword

[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 c390a36625847073f8e15fb38d7cd1aafa32a58f
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Dec 28 17:35:10 2015 +0100

    Fix lintian error, fixed with the alias keyword
---
 debian/virtualbox-guest-x11.init        | 67 ---------------------------------
 debian/virtualbox-guest-x11.maintscript |  1 +
 debian/virtualbox-guest-x11.postinst    | 10 +++++
 3 files changed, 11 insertions(+), 67 deletions(-)

diff --git a/debian/virtualbox-guest-x11.init b/debian/virtualbox-guest-x11.init
deleted file mode 100644
index 8ce6d44..0000000
--- a/debian/virtualbox-guest-x11.init
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# (C) 2012 Felix Geyer <fgeyer at debian@org>
-
-### BEGIN INIT INFO
-# Provides:          virtualbox-guest-x11
-# Short-Description: VirtualBox Linux X11 Additions
-# Required-Start:    $remote_fs
-# Required-Stop:
-# Default-Start:     S
-# Default-Stop:
-### END INIT INFO
-
-PATH=$PATH:/bin:/sbin:/usr/sbin
-
-. /lib/lsb/init-functions
-
-test -e /usr/lib/VBoxOGL.so || exit 0
-
-in_virtual_machine()
-{
-	if [ -z "$(lspci -d 80ee:beef)" ]; then
-		log_warning_msg "VirtualBox Additions disabled, not in a Virtual Machine"
-		return 1
-	fi
-
-	return 0
-}
-
-running()
-{
-    lsmod | grep -q "$1[^_-]"
-}
-
-case "$1" in
-  start)
-	in_virtual_machine || exit 0
-	log_begin_msg "Loading VirtualBox video kernel module"
-
-	if ! running vboxvideo; then
-		if ! modprobe vboxvideo > /dev/null 2>&1; then
-			if ! find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|grep -q vboxvideo; then
-				log_failure_msg "No suitable module for running kernel found"
-			else
-				log_failure_msg "modprobe vboxvideo failed. Please use 'dmesg' to find out why"
-			fi
-			log_end_msg 1
-			exit 1
-		fi
-	fi
-
-	log_end_msg 0
-	;;
-
-  stop)
-	;;
-
-  restart|force-reload)
-	$0 start
-	;;
-
-  *)
-	echo "Usage: $0 {start|stop|restart|force-reload}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/debian/virtualbox-guest-x11.maintscript b/debian/virtualbox-guest-x11.maintscript
new file mode 100644
index 0000000..a91f4f8
--- /dev/null
+++ b/debian/virtualbox-guest-x11.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/init.d/virtualbox-guest-x11 5.0.12-dfsg-2~
diff --git a/debian/virtualbox-guest-x11.postinst b/debian/virtualbox-guest-x11.postinst
index bf1f031..748d03a 100644
--- a/debian/virtualbox-guest-x11.postinst
+++ b/debian/virtualbox-guest-x11.postinst
@@ -7,3 +7,13 @@ if [ "$1" = "configure" ]; then
 fi
 
 #DEBHELPER#
+
+# remove stale virtualbox-guest-x11 links
+case "$1" in
+  configure)
+    if dpkg --compare-versions "$2" lt "5.0.12-dfsg-2~" ; then
+      update-rc.d -f virtualbox-guest-x11 remove > /dev/null || true
+    fi
+  ;;
+esac
+

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