[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, experimental, updated. debian/4.1.18-dfsg-2-18-g73d2d44

[Felix Geyer]

The following commit has been merged in the experimental branch:
commit 9b82860b90fb2000ae4b1f78f1c223a8a3810c00
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Mar 2 22:24:14 2013 +0100

    Update install files.

diff --git a/debian/changelog b/debian/changelog
index 6e45b24..853b065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ virtualbox (4.2.6-dfsg-1) UNRELEASED; urgency=low
   * Drop all virtualbox-ose transitional packages.
   * Drop the virtualbox-fuse package as vdfuse fails to build with
     virtualbox 4.2.
+  * Update install files.
 
  -- Felix Geyer <fgeyer at debian.org>  Fri, 25 Jan 2013 18:14:24 +0100
 
diff --git a/debian/rules b/debian/rules
index b96067b..a4f0c09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,6 +150,8 @@ override_dh_install:
 	dh_install -p$(sname) -X out/bin/VBoxDbg.so
 	dh_install --remaining-packages
 
+	install -m 644 -p -D out/bin/additions/vboxvideo_drv_system.so \
+	    debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
 	convert debian/$(sxname)/usr/share/icons/hicolor/32x32/apps/virtualbox.png \
 	    debian/$(sxname)/usr/share/pixmaps/virtualbox.xpm
 
diff --git a/debian/virtualbox-guest-dkms.install.in b/debian/virtualbox-guest-dkms.install.in
index 66d7061..bcae4f7 100644
--- a/debian/virtualbox-guest-dkms.install.in
+++ b/debian/virtualbox-guest-dkms.install.in
@@ -2,15 +2,12 @@ out/bin/additions/src/vboxguest/*.* /usr/src/virtualbox-guest-CVERSION/vboxguest
 out/bin/additions/src/vboxguest/common /usr/src/virtualbox-guest-CVERSION/vboxguest
 out/bin/additions/src/vboxguest/generic /usr/src/virtualbox-guest-CVERSION/vboxguest
 out/bin/additions/src/vboxguest/VBox /usr/src/virtualbox-guest-CVERSION/vboxguest
-out/bin/additions/src/vboxguest/build_in_tmp /usr/src/virtualbox-guest-CVERSION/vboxguest
 out/bin/additions/src/vboxguest/Makefile /usr/src/virtualbox-guest-CVERSION/vboxguest
 
 out/bin/additions/src/vboxsf/*.* /usr/src/virtualbox-guest-CVERSION/vboxsf
-out/bin/additions/src/vboxsf/build_in_tmp /usr/src/virtualbox-guest-CVERSION/vboxsf
 out/bin/additions/src/vboxsf/Makefile /usr/src/virtualbox-guest-CVERSION/vboxsf
 
 out/bin/additions/src/vboxvideo/*.* /usr/src/virtualbox-guest-CVERSION/vboxvideo
-out/bin/additions/src/vboxvideo/build_in_tmp /usr/src/virtualbox-guest-CVERSION/vboxvideo
 out/bin/additions/src/vboxvideo/Makefile /usr/src/virtualbox-guest-CVERSION/vboxvideo
 
 out/bin/additions/src/vboxguest/include/iprt/* /usr/src/virtualbox-guest-CVERSION/include/iprt
@@ -23,4 +20,3 @@ out/bin/additions/src/vboxsf/include/VBox/* /usr/src/virtualbox-guest-CVERSION/i
 out/bin/additions/src/vboxguest/r0drv /usr/src/virtualbox-guest-CVERSION/
 
 debian/virtualbox-guest-dkms.files/Makefile /usr/src/virtualbox-guest-CVERSION
-
diff --git a/debian/virtualbox-guest-source.install b/debian/virtualbox-guest-source.install
index 6756d12..7bfb6d0 100644
--- a/debian/virtualbox-guest-source.install
+++ b/debian/virtualbox-guest-source.install
@@ -2,15 +2,12 @@ out/bin/additions/src/vboxguest/*.* /usr/src/modules/virtualbox-guest/vboxguest
 out/bin/additions/src/vboxguest/common /usr/src/modules/virtualbox-guest/vboxguest
 out/bin/additions/src/vboxguest/generic /usr/src/modules/virtualbox-guest/vboxguest
 out/bin/additions/src/vboxguest/VBox /usr/src/modules/virtualbox-guest/vboxguest
-out/bin/additions/src/vboxguest/build_in_tmp /usr/src/modules/virtualbox-guest/vboxguest
 out/bin/additions/src/vboxguest/Makefile /usr/src/modules/virtualbox-guest/vboxguest
 
 out/bin/additions/src/vboxsf/*.* /usr/src/modules/virtualbox-guest/vboxsf
-out/bin/additions/src/vboxsf/build_in_tmp /usr/src/modules/virtualbox-guest/vboxsf
 out/bin/additions/src/vboxsf/Makefile /usr/src/modules/virtualbox-guest/vboxsf
 
 out/bin/additions/src/vboxvideo/*.* /usr/src/modules/virtualbox-guest/vboxvideo
-out/bin/additions/src/vboxvideo/build_in_tmp /usr/src/modules/virtualbox-guest/vboxvideo
 out/bin/additions/src/vboxvideo/Makefile /usr/src/modules/virtualbox-guest/vboxvideo
 
 out/bin/additions/src/vboxguest/include/iprt/* /usr/src/modules/virtualbox-guest/include/iprt
diff --git a/debian/virtualbox-guest-x11.install b/debian/virtualbox-guest-x11.install
index 3158f4e..b41e824 100644
--- a/debian/virtualbox-guest-x11.install
+++ b/debian/virtualbox-guest-x11.install
@@ -1,5 +1,4 @@
 out/bin/additions/VBoxClient /usr/bin
 src/VBox/Additions/x11/Installer/x11config.pl /usr/share/virtualbox
 src/VBox/Additions/x11/Installer/98vboxadd-xclient /etc/X11/Xsession.d
-out/bin/additions/vboxvideo_drv.so /usr/lib/xorg/modules/drivers
 out/bin/additions/VBoxOGL*.so /usr/lib
diff --git a/debian/virtualbox.install b/debian/virtualbox.install
index 48d661d..6fe748c 100644
--- a/debian/virtualbox.install
+++ b/debian/virtualbox.install
@@ -20,6 +20,7 @@ out/bin/vboxshell.py /usr/lib/virtualbox
 out/bin/vboxwebsrv /usr/lib/virtualbox
 out/bin/webtest /usr/lib/virtualbox
 out/bin/libvboxjxpcom.so /usr/lib/virtualbox
+out/obj/VBoxBalloonCtrl /usr/lib/virtualbox
 
 out/bin/sdk/bindings/xpcom/java /usr/lib/virtualbox/sdk/bindings/xpcom
 out/bin/sdk/bindings/xpcom/python /usr/lib/virtualbox/sdk/bindings/xpcom

-- 
virtualbox Debian packaging