[Pkg-virtualbox-commits] r165 - in trunk/debian: . patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Sat Dec 29 16:39:56 UTC 2007
Author: meskes
Date: 2007-12-29 16:39:56 +0000 (Sat, 29 Dec 2007)
New Revision: 165
Modified:
trunk/debian/control
trunk/debian/patches/04-localconf-kmk.dpatch
trunk/debian/patches/09-no-registration.dpatch
trunk/debian/rules
trunk/debian/virtualbox-ose-guest-utils.dirs
trunk/debian/virtualbox-ose-guest-utils.install
Log:
Found another script in /usr/lib/virtualbox.
Replaced one of my patches by one done by innotek.
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2007-12-29 15:50:16 UTC (rev 164)
+++ trunk/debian/control 2007-12-29 16:39:56 UTC (rev 165)
@@ -18,7 +18,7 @@
Replaces: virtualbox
Provides: virtualbox
Description: PC virtualization solution
- VirtualBox is a free PC virtualization solution allowing you to run a wide
+ VirtualBox is a free x86 virtualization solution allowing you to run a wide
range of PC operating systems on your Linux system. This includes Windows,
Linux, FreeBSD, DOS, OpenBSD and others.
.
Modified: trunk/debian/patches/04-localconf-kmk.dpatch
===================================================================
--- trunk/debian/patches/04-localconf-kmk.dpatch 2007-12-29 15:50:16 UTC (rev 164)
+++ trunk/debian/patches/04-localconf-kmk.dpatch 2007-12-29 16:39:56 UTC (rev 165)
@@ -10,8 +10,7 @@
diff -Naurp virtualbox-ose-1.5.0-dfsg2.orig/LocalConfig.kmk virtualbox-ose-1.5.0-dfsg2/LocalConfig.kmk
--- virtualbox-ose-1.5.0-dfsg2.orig/LocalConfig.kmk 1970-01-01 00:00:00.000000000 +0000
+++ virtualbox-ose-1.5.0-dfsg2/LocalConfig.kmk 2007-10-09 12:26:59.000000000 +0000
-@@ -0,0 +1,13 @@
-+VBOX_WITH_VBOXDRV =
+@@ -0,0 +1,12 @@
+VBOX_WITH_LINUX_ONLY =
+VBOX_ADDITIONS_LINUX_ONLY =
+VBOX_WITH_INSTALLER = 1
Modified: trunk/debian/patches/09-no-registration.dpatch
===================================================================
--- trunk/debian/patches/09-no-registration.dpatch 2007-12-29 15:50:16 UTC (rev 164)
+++ trunk/debian/patches/09-no-registration.dpatch 2007-12-29 16:39:56 UTC (rev 165)
@@ -1,13 +1,44 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 09-no-registration.dpatch by Michael Meskes <meskes at debian.org>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09-no-registration.dpatch by Frank Mehnert <frank at innotek.de>
##
-## DP: Do not ask for registration
-## This is taken from SVN and can safely be removed as soon as the files in SVN are realeased.
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not ask for registration. This is taken from SVN and can safely be
+## DP: removed as soon as the files in SVN are realeased.
@DPATCH@
---- virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2007-12-29 16:33:24.000000000 +0100
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk 2007-12-29 16:34:41.000000000 +0100
+Index:virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp
+===================================================================
+---virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (revision 27037)
++++virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (working copy)
+@@ -929,7 +929,9 @@
+ mIsOpenViewFinished = true;
+ LogFlowFuncLeave();
+
++#ifdef VBOX_WITH_REGISTRATION_REQUEST
+ vboxGlobal().showRegistrationDialog (false /* aForce */);
++#endif
+ }
+
+ /**
+Index:virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp
+===================================================================
+---virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp (revision 27037)
++++virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp (working copy)
+@@ -242,7 +242,9 @@
+ {
+ a.setMainWidget (&vboxGlobal().selectorWnd());
+ vboxGlobal().selectorWnd().show();
++#ifdef VBOX_WITH_REGISTRATION_REQUEST
+ vboxGlobal().showRegistrationDialog (false /* aForce */);
++#endif
+ vboxGlobal().startEnumeratingMedia();
+ rc = a.exec();
+ }
+Index:virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk
+===================================================================
+---virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 27037)
++++virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk (working copy)
@@ -31,6 +31,9 @@
TRANSLATIONS :=
IMAGES :=
@@ -29,27 +60,13 @@
ifndef VBOX_WITH_REGISTRATION
VirtualBox_QT_UISRCS := $(filter-out ui/VBoxRegistrationDlg.ui,$(VirtualBox_QT_UISRCS))
endif
---- virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp.orig 2007-12-29 16:34:53.000000000 +0100
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp 2007-12-29 16:35:23.000000000 +0100
-@@ -929,7 +929,9 @@
- mIsOpenViewFinished = true;
- LogFlowFuncLeave();
-
-+#ifdef VBOX_WITH_REGISTRATION_REQUEST
- vboxGlobal().showRegistrationDialog (false /* aForce */);
-+#endif
- }
-
- /**
---- virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2007-12-29 16:35:28.000000000 +0100
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp 2007-12-29 16:36:05.000000000 +0100
-@@ -242,7 +242,9 @@
- {
- a.setMainWidget (&vboxGlobal().selectorWnd());
- vboxGlobal().selectorWnd().show();
-+#ifdef VBOX_WITH_REGISTRATION_REQUEST
- vboxGlobal().showRegistrationDialog (false /* aForce */);
-+#endif
- vboxGlobal().startEnumeratingMedia();
- rc = a.exec();
- }
+@@ -217,6 +216,9 @@
+ ifdef VBOX_WITH_REGISTRATION
+ VirtualBox_DEFS += VBOX_WITH_REGISTRATION
+ endif
++ifdef VBOX_WITH_REGISTRATION_REQUEST
++ VirtualBox_DEFS += VBOX_WITH_REGISTRATION_REQUEST
++endif
+ ifdef VBOX_WITH_ALSA
+ VirtualBox_DEFS += VBOX_WITH_ALSA
+ endif
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2007-12-29 15:50:16 UTC (rev 164)
+++ trunk/debian/rules 2007-12-29 16:39:56 UTC (rev 165)
@@ -88,10 +88,10 @@
dh_installdocs -a
dh_installmenu -a
dh_install -p$(sname)
- chmod 755 debian/$(sname)/usr/lib/virtualbox/VBox.sh;
+ chmod 755 debian/$(sname)/usr/share/virtualbox/VBox.sh;
if [ "`dpkg --print-architecture`" = "i386" ]; then \
dh_install -p$(uname); \
- chmod 755 debian/$(uname)/usr/lib/virtualbox/x11config.pl; \
+ chmod 755 debian/$(uname)/usr/share/virtualbox/x11config.pl; \
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; \
@@ -100,7 +100,7 @@
dh_strip -p$(sname) --dbg-package=$(sname)-dbg -X/usr/share/virtualbox/sdk/bin/xpidl
dh_link -a
dh_compress -a
- dh_fixperms -X=/usr/lib/virtualbox/VBox.sh -a
+ dh_fixperms -a
dh_installudev -a
dh_installinit -a
dh_installdeb -a
Modified: trunk/debian/virtualbox-ose-guest-utils.dirs
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.dirs 2007-12-29 15:50:16 UTC (rev 164)
+++ trunk/debian/virtualbox-ose-guest-utils.dirs 2007-12-29 16:39:56 UTC (rev 165)
@@ -1,4 +1,4 @@
-usr/lib/virtualbox
+usr/share/virtualbox
usr/lib/xorg/modules/drivers
usr/lib/xorg/modules/input
usr/sbin
Modified: trunk/debian/virtualbox-ose-guest-utils.install
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.install 2007-12-29 15:50:16 UTC (rev 164)
+++ trunk/debian/virtualbox-ose-guest-utils.install 2007-12-29 16:39:56 UTC (rev 165)
@@ -1,5 +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/x11config.pl /usr/share/virtualbox
src/VBox/Additions/linux/installer/98vboxadd-xclient /etc/X11/Xsession.d
More information about the Pkg-virtualbox-commits
mailing list