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

[meskes at alioth.debian.org]

Author: meskes
Date: 2007-12-20 08:19:19 +0000 (Thu, 20 Dec 2007)
New Revision: 155

Modified:
   trunk/debian/rules
   trunk/debian/virtualbox-ose-guest-source.install
   trunk/debian/virtualbox-ose-guest-utils.install
   trunk/debian/virtualbox-ose.dirs
Log:
Moved two more files to dh_install


Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-12-19 19:01:09 UTC (rev 154)
+++ trunk/debian/rules	2007-12-20 08:19:19 UTC (rev 155)
@@ -76,7 +76,7 @@
 	dh_installdirs
 
 	# Installing virtualbox
-	install -m 0755 debian/scripts/VBox.sh debian/$(sname)/usr/lib/virtualbox
+	install -m 755 debian/scripts/VBox.sh debian/$(sname)/usr/lib/virtualbox
 
 	# This will get installed into the package by dh_installinit
 	install -m 644 src/VBox/Installer/linux/vboxnet.sh debian/$(sname).init
@@ -96,13 +96,10 @@
 	install -m 755 debian/$(gsource).rules  debian/$(gsource)/usr/src/modules/$(gname)/debian/rules
 
 	# Install virtualbox guest additions
-	install -m644 out/bin/additions/vboxvideo_drv_14.so debian/$(uname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
-	install -m644 out/bin/additions/vboxmouse_drv_14.so debian/$(uname)/usr/lib/xorg/modules/input/vboxmouse_drv.so
+	install -m 644 out/bin/additions/vboxvideo_drv_14.so debian/$(uname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
+	install -m 644 out/bin/additions/vboxmouse_drv_14.so debian/$(uname)/usr/lib/xorg/modules/input/vboxmouse_drv.so
+	install -m 755 out/bin/additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf
 
-	install -m755 out/bin//additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf
-	install -m 755 src/VBox/Additions/linux/installer/x11config.pl debian/$(uname)/usr/lib/virtualbox/
-	install -m 644 src/VBox/Additions/linux/installer/98vboxadd-xclient debian/$(uname)/etc/X11/Xsession.d
-
 	dh_install
 
 	# Create .tar.bz2 for virtualbox*source

Modified: trunk/debian/virtualbox-ose-guest-source.install
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.install	2007-12-19 19:01:09 UTC (rev 154)
+++ trunk/debian/virtualbox-ose-guest-source.install	2007-12-20 08:19:19 UTC (rev 155)
@@ -1,2 +1,2 @@
 out/bin/additions/src/vboxadd /usr/src/modules/virtualbox-ose-guest
-out/bin//additions/src/vboxvfs /usr/src/modules/virtualbox-ose-guest
+out/bin/additions/src/vboxvfs /usr/src/modules/virtualbox-ose-guest

Modified: trunk/debian/virtualbox-ose-guest-utils.install
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.install	2007-12-19 19:01:09 UTC (rev 154)
+++ trunk/debian/virtualbox-ose-guest-utils.install	2007-12-20 08:19:19 UTC (rev 155)
@@ -1,2 +1,5 @@
 out/bin/additions/vboxadd-timesync /usr/sbin
 out/bin/additions/vboxadd-xclient /usr/bin
+src/VBox/Additions/linux/installer/x11config.pl /usr/lib/virtualbox
+src/VBox/Additions/linux/installer/98vboxadd-xclient /etc/X11/Xsession.d
+

Modified: trunk/debian/virtualbox-ose.dirs
===================================================================
--- trunk/debian/virtualbox-ose.dirs	2007-12-19 19:01:09 UTC (rev 154)
+++ trunk/debian/virtualbox-ose.dirs	2007-12-20 08:19:19 UTC (rev 155)
@@ -1,5 +1,4 @@
 usr/bin
-usr/lib
 usr/lib/virtualbox
 usr/share/virtualbox
 usr/share/icons