[Pkg-virtualbox-commits] r122 - trunk/debian

[meskes at alioth.debian.org]

Author: meskes
Date: 2007-11-19 11:17:39 +0000 (Mon, 19 Nov 2007)
New Revision: 122

Added:
   trunk/debian/virtualbox-ose-guest-utils.README.Debian
Modified:
   trunk/debian/changelog
   trunk/debian/virtualbox-ose-guest-utils.init
   trunk/debian/virtualbox-ose-guest-utils.postinst
Log:
Do not change xorg.conf in postinst.
Some cosmetic changes. 
Do not change xorg.conf in postinst.
Some cosmetic changes. 



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-11-19 10:04:10 UTC (rev 121)
+++ trunk/debian/changelog	2007-11-19 11:17:39 UTC (rev 122)
@@ -13,6 +13,7 @@
   * Disabled modprobing of vboxadd because udev seems to be able to handle it.
   * Applied patch by Kel Modderman <kel at otaku42.de> improving
     guest utils init script.
+  * Do not change xorg.conf in postinst, closes: #451745
 
   [ Daniel Baumann ]
   * Removing again whitespaces at EOL.

Added: trunk/debian/virtualbox-ose-guest-utils.README.Debian
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.README.Debian	                        (rev 0)
+++ trunk/debian/virtualbox-ose-guest-utils.README.Debian	2007-11-19 11:17:39 UTC (rev 122)
@@ -0,0 +1,6 @@
+To enable guest additions in X either run /usr/lib/virtualbox/x11config.pl or
+edit your xorg.conf manually. The video driver has to be set to "vboxvideo" and
+the mouse driver to "vboxmouse". Additionally the options "alwayscore" and
+"sendcoreevents" should be removed from the mouse section.
+
+ -- Michael Meskes <meskes at debian.org>  Mon, 19 Nov 2007 11:17:46 +0100

Modified: trunk/debian/virtualbox-ose-guest-utils.init
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.init	2007-11-19 10:04:10 UTC (rev 121)
+++ trunk/debian/virtualbox-ose-guest-utils.init	2007-11-19 11:17:39 UTC (rev 122)
@@ -17,9 +17,7 @@
 in_virtual_machine()
 {
 	if [ -z "$(lspci -d 80ee:beef)" ]; then
-		log_action_begin_msg 'VirtualBox Additions Disabled';
-		log_warning_msg 'not in a Virtual Machine environemnt';
-		log_end_msg 0
+		log_warning_msg 'VirtualBox Additions Disabled, not in a Virtual Machine';
 		return 1
 	fi
 

Modified: trunk/debian/virtualbox-ose-guest-utils.postinst
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.postinst	2007-11-19 10:04:10 UTC (rev 121)
+++ trunk/debian/virtualbox-ose-guest-utils.postinst	2007-11-19 11:17:39 UTC (rev 122)
@@ -4,7 +4,9 @@
 
 case "${1}" in
 	configure)
-		/usr/lib/virtualbox/x11config.pl
+		# do not call this automatically as it might break stuff
+		# or not even work depending on the X setup
+		#/usr/lib/virtualbox/x11config.pl
 		;;
 
 	abort-upgrade|abort-deconfigure|abort-remove)