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

[meskes at alioth.debian.org]

Author: meskes
Date: 2007-11-01 14:48:16 +0000 (Thu, 01 Nov 2007)
New Revision: 99

Modified:
   trunk/debian/changelog
   trunk/debian/patches/04-localconf-kmk.dpatch
   trunk/debian/rules
   trunk/debian/virtualbox-ose.README.Debian
   trunk/debian/virtualbox-ose.dirs
Log:
Added reference to http://wiki.debian.org/VirtualBox to README.Debian.
Moved architecture independant files from /usr/lib to /usr/share.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-10-30 10:02:15 UTC (rev 98)
+++ trunk/debian/changelog	2007-11-01 14:48:16 UTC (rev 99)
@@ -6,8 +6,10 @@
 
   [ Michael Meskes ]
   * Made sure modules postinst calls debmod before modprobe.
+  * Added reference to http://wiki.debian.org/VirtualBox to README.Debian.
+  * Moved architecture independant files from /usr/lib to /usr/share.
 
- -- Michael Meskes <meskes at debian.org>  Sat, 27 Oct 2007 12:44:54 +0200
+ -- Michael Meskes <meskes at debian.org>  Thu, 01 Nov 2007 14:47:10 +0100
 
 virtualbox-ose (1.5.2-dfsg-2) unstable; urgency=low
 

Modified: trunk/debian/patches/04-localconf-kmk.dpatch
===================================================================
--- trunk/debian/patches/04-localconf-kmk.dpatch	2007-10-30 10:02:15 UTC (rev 98)
+++ trunk/debian/patches/04-localconf-kmk.dpatch	2007-11-01 14:48:16 UTC (rev 99)
@@ -1,15 +1,16 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 04-localconf-kmk.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
+## expanded my Michael Meskes <meskes at debian.org> to set paths
 ##
 ## DP: Don't build the module for testing and don't build any guest additions
-## DP: both depends on kernel headers, which are atm not available
+## DP: both depends on kernel headers, which are not available atm
 
 @DPATCH@
 
 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,8 @@
+@@ -0,0 +1,12 @@
 +VBOX_WITH_VBOXDRV =
 +VBOX_WITH_LINUX_ONLY =
 +VBOX_ADDITIONS_LINUX_ONLY =
@@ -18,3 +19,7 @@
 +VBOX_WITH_TESTCASES =
 +VBOX_WITH_TESTSUITE =
 +VBOX_WITH_USB =
++DEFS += RTPATH_APP_DOCS=\"/usr/share/doc/virtualbox\"
++DEFS += RTPATH_APP_PRIVATE_ARCH=\"/usr/lib/virtualbox\"
++DEFS += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox\"
++DEFS += RTPATH_SHARED_LIBS=\"/usr/lib\"

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-10-30 10:02:15 UTC (rev 98)
+++ trunk/debian/rules	2007-11-01 14:48:16 UTC (rev 99)
@@ -110,6 +110,10 @@
 
 	# Installing virtualbox
 	cp -r out/linux.*/release/bin debian/$(sname)/usr/lib/virtualbox
+	# move architecture independant files to /usr/share/virtualbox instead of /usr/lib/virtualbox
+	mv debian/$(sname)/usr/lib/virtualbox/nls debian/$(sname)/usr/share/virtualbox
+	mv debian/$(sname)/usr/lib/virtualbox/sdk debian/$(sname)/usr/share/virtualbox
+
 	install -D -m 0755  debian/scripts/VBox.sh debian/$(sname)/usr/lib/virtualbox
 
 	ln -s ../lib/virtualbox/VBox.sh debian/$(sname)/usr/bin/vboxmanage

Modified: trunk/debian/virtualbox-ose.README.Debian
===================================================================
--- trunk/debian/virtualbox-ose.README.Debian	2007-10-30 10:02:15 UTC (rev 98)
+++ trunk/debian/virtualbox-ose.README.Debian	2007-11-01 14:48:16 UTC (rev 99)
@@ -40,3 +40,8 @@
 section in the xml file.
 
  -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Wed, 19 Sep 2007 23:29:32 +0200
+
+Please see also http://wiki.debian.org/VirtualBox for additinal information.
+
+ -- Michael Meskes <meskes at debian.org>  Thu, 01 Nov 2007 14:46:39 +0100
+

Modified: trunk/debian/virtualbox-ose.dirs
===================================================================
--- trunk/debian/virtualbox-ose.dirs	2007-10-30 10:02:15 UTC (rev 98)
+++ trunk/debian/virtualbox-ose.dirs	2007-11-01 14:48:16 UTC (rev 99)
@@ -1,4 +1,5 @@
 usr/bin
 usr/sbin
 usr/lib
+usr/share/virtualbox
 etc/vbox