[Pkg-virtualbox-commits] r263 - in trunk/debian: . patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-05-06 13:25:51 +0000 (Tue, 06 May 2008)
New Revision: 263

Modified:
   trunk/debian/changelog
   trunk/debian/patches/07-xsession.dpatch
   trunk/debian/virtualbox-ose-guest-utils.install
Log:
Use upstream provided xsession file.
xclient was renamed.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-05 08:53:26 UTC (rev 262)
+++ trunk/debian/changelog	2008-05-06 13:25:51 UTC (rev 263)
@@ -1,6 +1,6 @@
 virtualbox-ose (1.6.0-dfsg-1) unstable; urgency=low
 
-  * New upstream version, closes: #478373, #478333
+  * New upstream version, closes: #478373, #478333, #479744
   * Made virtualbox-ose-modules recommend virtualbox-ose-guest-utils.
   * Added patch by Pascal Volk <user at localhost.localdomain.org> to prevent
     init script from overwriting values, closes: #475193
@@ -15,6 +15,7 @@
   * Removed unneeded xalan build dependency.
   * Added build dependency on libxslt and libxml.
   * Fixed LocalConfig.kmk to list new variables.
+  * Use upstream provided X session file, put patch our changes in there.
 
  -- Michael Meskes <meskes at debian.org>  Fri, 02 May 2008 10:14:01 +0200
 

Modified: trunk/debian/patches/07-xsession.dpatch
===================================================================
--- trunk/debian/patches/07-xsession.dpatch	2008-05-05 08:53:26 UTC (rev 262)
+++ trunk/debian/patches/07-xsession.dpatch	2008-05-06 13:25:51 UTC (rev 263)
@@ -5,13 +5,13 @@
 
 @DPATCH@
 
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/installer/98vboxadd-xclient virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/installer/98vboxadd-xclient
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/installer/98vboxadd-xclient	1970-01-01 00:00:00.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/installer/98vboxadd-xclient	2007-12-30 06:32:40.000000000 +0000
-@@ -0,0 +1,6 @@
-+# (C) 2007
-+# Michael Meskes <meskes at debian.org>
-+# Placed under GPL
-+# I had to rewrite this simple file because of some license restrictions
-+
-+/usr/bin/vboxadd-xclient || true
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/x11/installer/98vboxadd-xclient virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/x11/installer/98vboxadd-xclient
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/x11/installer/98vboxadd-xclient	2008-05-05 13:34:31.000000000 +0200
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/x11/installer/98vboxadd-xclient	2008-05-05 13:34:49.000000000 +0200
+@@ -17,5 +17,5 @@
+ # additional information or have any questions.
+ #
+ 
+-/usr/bin/VBoxClient
++/usr/bin/VBoxClient || true
+ 

Modified: trunk/debian/virtualbox-ose-guest-utils.install
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.install	2008-05-05 08:53:26 UTC (rev 262)
+++ trunk/debian/virtualbox-ose-guest-utils.install	2008-05-06 13:25:51 UTC (rev 263)
@@ -1,4 +1,4 @@
 out/bin/additions/vboxadd-timesync /usr/sbin
-out/bin/additions/vboxadd-xclient /usr/bin
-src/VBox/Additions/linux/installer/x11config.pl /usr/share/virtualbox
-src/VBox/Additions/linux/installer/98vboxadd-xclient /etc/X11/Xsession.d
+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