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

[bengen at alioth.debian.org]

Author: bengen
Date: 2007-12-19 01:50:47 +0000 (Wed, 19 Dec 2007)
New Revision: 152

Added:
   trunk/debian/vbox.cfg
   trunk/debian/virtualbox-ose.install
Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
install vbox.cfg using dh_install


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-18 22:50:35 UTC (rev 151)
+++ trunk/debian/changelog	2007-12-19 01:50:47 UTC (rev 152)
@@ -1,10 +1,14 @@
 virtualbox-ose (1.5.2-dfsg2-7) UNRELEASED; urgency=low
 
+  [ Patrick Winnertz ]
   * Do only recommends the virtualbox-ose-modules package.. maybe someone
     would like to compile it on it's own, or not with m-a. (Closes: #456989) 
 
- -- Patrick Winnertz <winnie at debian.org>  Tue, 18 Dec 2007 23:51:34 +0100
+  [ Hilko Bengen ]
+  * install vbox.cfg using dh_install
 
+ -- Hilko Bengen <bengen at debian.org>  Wed, 19 Dec 2007 00:49:24 +0100
+
 virtualbox-ose (1.5.2-dfsg2-6) unstable; urgency=low
 
   [ Daniel Baumann ]

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-12-18 22:50:35 UTC (rev 151)
+++ trunk/debian/rules	2007-12-19 01:50:47 UTC (rev 152)
@@ -30,7 +30,7 @@
 	# Building package
 	$(MAKE) BUILD_TYPE=release
 	# make sure VBoxAddIF.sh is built, too
-	(cd src/VBox/Installer/linux; $(MAKE) `echo $(CURDIR)/out/linux.*/release/bin`/VBoxAddIF.sh)
+	$(MAKE) -C src/VBox/Installer/linux `echo $(CURDIR)/out/linux.*/release/bin`/VBoxAddIF.sh
 
 	touch build-stamp
 
@@ -93,9 +93,6 @@
 	install -D -m 644 src/VBox/Installer/linux/vboxnet.sh debian/$(sname).init
 	install -D -m 644 debian/interfaces debian/$(sname)/etc/vbox
 
-	echo "# VirtualBox installation directory" > $(CURDIR)/debian/$(sname)/etc/vbox/vbox.cfg
-	echo "INSTALL_DIR="\"/usr/lib/virtualbox\" >> $(CURDIR)/debian/$(sname)/etc/vbox/vbox.cfg
-
 	# Install virtualbox-ose-source
 	mv debian/$(sname)/usr/lib/virtualbox/src/* debian/$(psource)/usr/src/modules/$(sname)
 	rm -r debian/$(sname)/usr/lib/virtualbox/src

Added: trunk/debian/vbox.cfg
===================================================================
--- trunk/debian/vbox.cfg	                        (rev 0)
+++ trunk/debian/vbox.cfg	2007-12-19 01:50:47 UTC (rev 152)
@@ -0,0 +1,2 @@
+# VirtualBox installation directory
+INSTALL_DIR="/usr/lib/virtualbox"

Added: trunk/debian/virtualbox-ose.install
===================================================================
--- trunk/debian/virtualbox-ose.install	                        (rev 0)
+++ trunk/debian/virtualbox-ose.install	2007-12-19 01:50:47 UTC (rev 152)
@@ -0,0 +1 @@
+debian/vbox.cfg /etc/vbox