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

[meskes at alioth.debian.org]

Author: meskes
Date: 2007-11-04 17:29:50 +0000 (Sun, 04 Nov 2007)
New Revision: 102

Added:
   trunk/debian/virtualbox-ose-guest-utils.dirs
   trunk/debian/virtualbox-ose-guest-utils.postinst
Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
guest utils package gets some functionality
see changelog for open TODOs before release



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-11-04 16:38:56 UTC (rev 101)
+++ trunk/debian/changelog	2007-11-04 17:29:50 UTC (rev 102)
@@ -13,6 +13,11 @@
   * Added linux installer, closes: #448749
   * Provide programs with upstream upper/lower case mix as used by upstream.
   * Added linux additions in two seperate packages, closes: #440517
+    TODO:	- guests-utils need an init script
+    		- device creation in guest-modules postinst is a hack and
+		  won't last over a reboot the way it is now
+		- get guest additions to work, my first try resulted in no
+		  mouse pointer at all
 
  -- Michael Meskes <meskes at debian.org>  Thu, 01 Nov 2007 14:47:10 +0100
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-11-04 16:38:56 UTC (rev 101)
+++ trunk/debian/rules	2007-11-04 17:29:50 UTC (rev 102)
@@ -130,7 +130,13 @@
 
 	# Install virtualbox guest additions
 	mkdir -p debian/$(uname)/usr/lib/virtualbox
-	mv debian/$(sname)/usr/lib/virtualbox/additions debian/$(uname)/usr/lib/virtualbox
+	mv debian/$(sname)/usr/lib/virtualbox/additions/vboxvideo_drv_14.so debian/$(uname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
+	mv debian/$(sname)/usr/lib/virtualbox/additions/vboxmouse_drv_14.so debian/$(uname)/usr/lib/xorg/modules/mouse/vboxmouse_drv.so
+	mv debian/$(sname)/usr/lib/virtualbox/additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf
+	mv debian/$(sname)/usr/lib/virtualbox/additions/vboxadd-timesync debian/$(uname)/usr/sbin/vboxadd-timesync
+	mv debian/$(sname)/usr/lib/virtualbox/additions/vboxadd-xclient debian/$(uname)/usr/sbin/vboxadd-xclient
+	install -m 755 src/VBox/Additions/linux/installer/x11config.pl debian/$(uname)/usr/lib/virtualbox/
+	rm -r debian/$(sname)/usr/lib/virtualbox/additions
 	
 	dh_install
 
@@ -143,8 +149,6 @@
 	dh_installmenu -a
 	dh_link -a
 	dh_strip -a --dbg-package=$(sname)-dbg
-	# remove debug symbols belonging to libs that get installed inside the virtual machine
-	rm -r debian/$(sname)-dbg/usr/lib/debug/usr/lib/virtualbox/additions
 	dh_compress -a
 	dh_fixperms -X=/usr/lib/virtualbox/VBox.sh -a
 	dh_installudev -a

Added: trunk/debian/virtualbox-ose-guest-utils.dirs
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.dirs	                        (rev 0)
+++ trunk/debian/virtualbox-ose-guest-utils.dirs	2007-11-04 17:29:50 UTC (rev 102)
@@ -0,0 +1,5 @@
+/usr/lib/xorg/modules/drivers
+/usr/lib/xorg/modules/mouse
+/usr/sbin
+/sbin
+

Added: trunk/debian/virtualbox-ose-guest-utils.postinst
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.postinst	                        (rev 0)
+++ trunk/debian/virtualbox-ose-guest-utils.postinst	2007-11-04 17:29:50 UTC (rev 102)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	configure)
+		/usr/lib/virtualbox/x11config.pl
+		;;
+
+	abort-upgrade|abort-deconfigure|abort-remove)
+
+		;;
+
+	*)
+		echo "${0} called with unknown argument \`${1}'" 1>&2
+		exit 1
+		;;
+esac
+
+exit 0