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

pwinnertz-guest at alioth.debian.org pwinnertz-guest at alioth.debian.org
Mon Jun 18 06:34:37 UTC 2007


Author: pwinnertz-guest
Date: 2007-06-18 06:34:37 +0000 (Mon, 18 Jun 2007)
New Revision: 7

Added:
   dists/trunk/virtualbox/debian/README.Debian
   dists/trunk/virtualbox/debian/README.rebuild
   dists/trunk/virtualbox/debian/control.new
   dists/trunk/virtualbox/debian/dirs
   dists/trunk/virtualbox/debian/docs
   dists/trunk/virtualbox/debian/patches/configure.dpatch
   dists/trunk/virtualbox/debian/patches/yasm-path-correction.dpatch
Modified:
   dists/trunk/virtualbox/debian/TODO
   dists/trunk/virtualbox/debian/changelog
   dists/trunk/virtualbox/debian/control
   dists/trunk/virtualbox/debian/control.modules.in
   dists/trunk/virtualbox/debian/copyright
   dists/trunk/virtualbox/debian/patches/00list
   dists/trunk/virtualbox/debian/rules
   dists/trunk/virtualbox/debian/virtualbox-source.README.Debian
   dists/trunk/virtualbox/debian/virtualbox.menu
Log:
Added my changes


Added: dists/trunk/virtualbox/debian/README.Debian
===================================================================
--- dists/trunk/virtualbox/debian/README.Debian	                        (rev 0)
+++ dists/trunk/virtualbox/debian/README.Debian	2007-06-18 06:34:37 UTC (rev 7)
@@ -0,0 +1,6 @@
+vbox-ose for Debian
+-------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Tue, 29 May 2007 13:33:46 +0200

Added: dists/trunk/virtualbox/debian/README.rebuild
===================================================================
--- dists/trunk/virtualbox/debian/README.rebuild	                        (rev 0)
+++ dists/trunk/virtualbox/debian/README.rebuild	2007-06-18 06:34:37 UTC (rev 7)
@@ -0,0 +1,9 @@
+Here is a small readme how you can rebuild the current .orig.tar.gz:
+
+
+Unpack the tar.bz2 from upstream and rename the created dir to: virtualbox-<version>
+Then remove the complete ./kBuild and ./tools dirs and remove the complete ./src/recompiler/precomiled dir. 
+Now repack it with tar cfvz virtualbox_<version>.dfsg.orig.tar.gz
+
+Now you should be able to build the package with the tools coming with debian.
+

Modified: dists/trunk/virtualbox/debian/TODO
===================================================================
--- dists/trunk/virtualbox/debian/TODO	2007-06-18 01:59:01 UTC (rev 6)
+++ dists/trunk/virtualbox/debian/TODO	2007-06-18 06:34:37 UTC (rev 7)
@@ -1,44 +1,4 @@
-stripping sources - see SOURCE CLEANUP
-
-
+libs compile with -fPIC
 check copyright
 check trademark
-
-virtualbox: check install:, maybe to much binaries installed?
-virtualbox-source: device creation needed?
-
-
-SOURCE CLEANUP
-**************
-
-* removed tools
-* removed kBuild
-
-the following file looked suspicous:
-
-./src/recompiler/tests/pi_10.com:                                                             data
-* PI calculator by Betram Felgenhauer
-  * taken from qemu
-
-  ./src/libs/xpcom18a4/xpcom/typelib/xpidl/macplugin/compiler.rsrc:                             AppleSingle encoded Macintosh file
-  ./src/libs/xpcom18a4/xpcom/typelib/xpidl/macplugin/linker.rsrc:                               AppleSingle encoded Macintosh file
-  ./src/libs/xpcom18a4/xpcom/typelib/xpidl/macplugin/version.rsrc:                              AppleSingle encoded Macintosh file
-  ./src/libs/xpcom18a4/xpcom/typelib/xpidl/macplugin/panel.rsrc:                                AppleSingle encoded Macintosh file
-  ./src/VBox/Frontends/VirtualBox/src/darwin/VM-PkgInfo:                                        Macintosh Application (data): PLVBVM
-  ./src/VBox/Frontends/VirtualBox/src/darwin/PkgInfo:                                           Macintosh Application (data): PLVBOX
-  * various MAC resource files
-
-  ./src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/StringTest.mcp:                         data
-
-
-  ./src/VBox/Frontends/VirtualBox/images/ico64x01.icns:                                         data
-  ./src/VBox/Frontends/VirtualBox/images/VirtualBox.icns:                                       data
-  * OSX Icon Files
-
-
-  ./src/VBox/Devices/PC/Etherboot-src/pcnet32.zrom:                                               BIOS (ia32) ROM Ext. (40*512)
-  * source code available in same directory
-
-  ./src/VBox/VMM/testcase/dev.tar.gz:                                                             gzip compressed data, from Unix, last modified: Wed Aug  4 02:31:06 2004
-  * contains a bunch of device files
-
+dpatch for Config.kmk

Modified: dists/trunk/virtualbox/debian/changelog
===================================================================
--- dists/trunk/virtualbox/debian/changelog	2007-06-18 01:59:01 UTC (rev 6)
+++ dists/trunk/virtualbox/debian/changelog	2007-06-18 06:34:37 UTC (rev 7)
@@ -1,16 +1,6 @@
-virtualbox (1.4.0-1) experimental; urgency=low
+virtualbox (1.3.8-1) unstable; urgency=low
 
-  * New upstream version.
-  * Stripped kbuild and yasm from source tarball
-  * Use Debian's kbuild and yasm instead
-  * Added myself as uploader
-  * Build target for module is now all instead of module
-  * Build against correct kernel source
+  * Initial release (Closes: #406992) 
 
- -- Philipp Hug <debian at hug.cx>  Sun, 17 Jun 2007 18:13:25 +0100
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Tue, 29 May 2007 13:33:46 +0200
 
-virtualbox (1.3.0.20070221+debian-1) unstable; urgency=low
-
-  * Initial release (Closes: #406992, #407001, #409711).
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 21 Feb 2007 16:31:00 +0100

Modified: dists/trunk/virtualbox/debian/control
===================================================================
--- dists/trunk/virtualbox/debian/control	2007-06-18 01:59:01 UTC (rev 6)
+++ dists/trunk/virtualbox/debian/control	2007-06-18 06:34:37 UTC (rev 7)
@@ -2,8 +2,8 @@
 Section: misc
 Priority: optional
 Maintainer: Daniel Baumann <daniel at debian.org>
-Uploaders: Patrick Winnertz <patrick.winnertz at skolelinux.org>, Philipp Hug <debian at hug.cx>
-Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, bzip2, gcc-3.4, g++-3.4, iasl, libacl1-dev, libasound-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, libxerces27-dev, libxcursor-dev, linux-headers-2.6-amd64 [amd64], linux-headers-2.6-486 [i386], uuid-dev, xalan, xsltproc, zlib1g-dev, libstdc++5, yasm, kbuild
+Uploaders: Patrick Winnertz <patrick.winnertz at skolelinux.org>
+Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, bzip2, gcc-3.4, g++-3.4, iasl, libacl1-dev, libasound-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, libxerces27-dev, libxcursor-dev, linux-headers-2.6.21.1-amd64 [amd64], linux-headers-2.6.21-1-486 [i386], uuid-dev, xalan, xsltproc, zlib1g-dev, libstdc++5, kbuild, yasm
 Standards-Version: 3.7.2
 
 Package: virtualbox

Modified: dists/trunk/virtualbox/debian/control.modules.in
===================================================================
--- dists/trunk/virtualbox/debian/control.modules.in	2007-06-18 01:59:01 UTC (rev 6)
+++ dists/trunk/virtualbox/debian/control.modules.in	2007-06-18 06:34:37 UTC (rev 7)
@@ -2,7 +2,6 @@
 Section: misc
 Priority: optional
 Maintainer: Daniel Baumann <daniel at debian.org>
-Uploaders: Philipp Hug <debian at hug.cx>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 

Added: dists/trunk/virtualbox/debian/control.new
===================================================================
--- dists/trunk/virtualbox/debian/control.new	                        (rev 0)
+++ dists/trunk/virtualbox/debian/control.new	2007-06-18 06:34:37 UTC (rev 7)
@@ -0,0 +1,40 @@
+Source: virtualbox
+Section: misc
+Priority: optional
+Maintainer: Daniel Baumann <daniel at debian.org>
+Uploaders: Patrick Winnertz <patrick.winnertz at skolelinux.org>
+Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, bzip2, gcc-3.4, g++-3.4, iasl, libacl1-dev, libasound-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, libxerces27-dev, libxcursor-dev, linux-headers-2.6.21.1-amd64 [amd64], linux-headers-2.6.21-1-486 [i386], uuid-dev, xalan, xsltproc, zlib1g-dev, libstdc++5, kbuild, yasm
+Standards-Version: 3.7.2
+
+Package: virtualbox
+Architecture: amd64 i386
+Depends: ${shlibs:Depends}, ${misc:Depends}, virtualbox-modules
+Description: PC virtualization solution
+ VirtualBox is a free PC 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.
+ .
+  Homepage: <http://www.virtualbox.org/>
+
+Package: virtualbox-source
+Architecture: all
+Depends: debhelper (>= 5), dpatch, module-assistant, bzip2, make
+Description: Source for the VirtualBox module
+ This package provides the source code for the virtualbox kernel modules.
+ The virtualbox package is also required in order to make use of these
+ modules. Kernel source or headers are required to compile these modules.
+ .
+ VirtualBox is a free PC 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.
+ .
+  Homepage: <http://www.virtualbox.org/>
+
+Package: virtualbox-dev
+Architecture: all
+Depends: virtualbox
+Description: Header files for a Virtualbox Control API
+ This package provied the header files for the virtualbox control api. You
+ are able with this headers to write your own management tool. 
+ .
+  Homepage: <http://www.virtualbox.org/>

Modified: dists/trunk/virtualbox/debian/copyright
===================================================================
--- dists/trunk/virtualbox/debian/copyright	2007-06-18 01:59:01 UTC (rev 6)
+++ dists/trunk/virtualbox/debian/copyright	2007-06-18 06:34:37 UTC (rev 7)
@@ -1,30 +1,35 @@
-This package was debianized by Daniel Baumann <daniel at debian.org> on
-Mon, 15 Jan 2007 14:33:00 +0100.
+This package was debianized by Patrick Winnertz <patrick.winnertz at skolelinux.org> on
+Tue, 29 May 2007 13:33:46 +0200.
 
-It was downloaded from <http://www.virtualbox.org/>.
+It was downloaded from <www.virtualbox.org>
 
-Upstream Author: InnoTek Systemberatung GmbH <info at innotek.de>
+Upstream Author: 
 
+    Innotek Systemberatung GmbH <info at innotek.de>
+
+Copyright: 
+
+    <Copyright (C) 2004-2007 InnoTek Systemberatung GmbH <info at innotek.de>
+
 License:
 
-	Copyright (C) 2004-2006 InnoTek Systemberatung GmbH <info at innotek.de>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL file.
 
-The Debian packaging is (C) 2007, Daniel Baumann <daniel at debian.org> and
+The Debian packaging is (C) 2007, Patrick Winnertz <patrick.winnertz at skolelinux.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+

Added: dists/trunk/virtualbox/debian/dirs
===================================================================
--- dists/trunk/virtualbox/debian/dirs	                        (rev 0)
+++ dists/trunk/virtualbox/debian/dirs	2007-06-18 06:34:37 UTC (rev 7)
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin

Added: dists/trunk/virtualbox/debian/docs
===================================================================

Modified: dists/trunk/virtualbox/debian/patches/00list
===================================================================
--- dists/trunk/virtualbox/debian/patches/00list	2007-06-18 01:59:01 UTC (rev 6)
+++ dists/trunk/virtualbox/debian/patches/00list	2007-06-18 06:34:37 UTC (rev 7)
@@ -1,3 +1,2 @@
-02-kernel.dpatch
-03-configure.dpatch
-04-host-module.dpatch
+configure
+yasm-path-correction

Added: dists/trunk/virtualbox/debian/patches/configure.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/configure.dpatch	                        (rev 0)
+++ dists/trunk/virtualbox/debian/patches/configure.dpatch	2007-06-18 06:34:37 UTC (rev 7)
@@ -0,0 +1,76 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## configure.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
+##
+## DP: Set compiler to gcc-3.4/g++-3.4.
+
+ at DPATCH@
+--- virtualbox-1.3.8/configure	2007-05-29 21:34:08.000000000 +0200
++++ virtualbox-1.3.8/configure	2007-05-29 21:06:57.000000000 +0200
+@@ -28,8 +28,8 @@
+ WITH_XPCOM=1
+ WITH_LIBIDL=1
+ WITH_QT=1
+-CC="gcc"
+-CXX="g++"
++CC="gcc-3.4"
++CXX="g++-3.4"
+ BCC="bcc"
+ YASM="yasm"
+ IASL="iasl"
+@@ -56,6 +56,7 @@
+ QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3"
+ KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
+ DEVDIR="`cd $(dirname $0); pwd`/tools"
++KBUILDDIR_BIN="/usr/bin"
+ if [ -d /lib/modules/`uname -r`/build ]; then
+  LINUX="/lib/modules/`uname -r`/build"
+ else
+@@ -223,7 +224,6 @@
+       ;;
+   esac
+   DEVDIR_BIN="$DEVDIR/$OS.$MACHINE/bin"
+-  KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.$MACHINE"
+   log_success "Determined $OS.$MACHINE"
+ 
+   # Automatically disable XPCOM on darwin.
+@@ -967,32 +967,6 @@
+ }
+ 
+ #
+-# Check for the kBuild tools, we don't support GNU make
+-#
+-function check_kbuild()
+-{
+-  test_header kBuild
+-  if check_avail "$KBUILDDIR_BIN/kmk" KBUILDDIR really; then
+-    log_success "found"
+-    echo "export BUILD_PLATFORM=\"$OS\"" >> $ENV
+-    echo "export BUILD_PLATFORM_ARCH=\"$MACHINE\"" >> $ENV
+-    echo "export BUILD_TARGET=\"$OS\"" >> $ENV
+-    echo "export BUILD_TARGET_ARCH=\"$MACHINE\"" >> $ENV
+-    echo "export BUILD_TARGET_CPU=\"$CPU\"" >> $ENV
+-    echo "export BUILD_TYPE=\"$BUILD_TYPE\"" >> $ENV
+-    echo "export PATH_KBUILD=\"`cd $KBUILDDIR ; pwd`\"" >> $ENV
+-    echo "export PATH_DEVTOOLS=\"$DEVDIR\"" >> $ENV
+-    echo "path_kbuild_bin=\"\$PATH_KBUILD/bin/\$BUILD_TARGET.\$BUILD_PLATFORM_ARCH\"" >> $ENV
+-    echo "path_dev_bin=\"\$PATH_DEVTOOLS/\$BUILD_TARGET.\$BUILD_PLATFORM_ARCH\"/bin" >> $ENV
+-    echo "echo \"\$PATH\" | grep -q \"\$path_kbuild_bin\" || PATH=\"\$path_kbuild_bin:\$PATH\"" >> $ENV
+-    echo "echo \"\$PATH\" | grep -q \"\$path_dev_bin\" || PATH=\"\$path_dev_bin:\$PATH\"" >> $ENV
+-    echo "export PATH" >> $ENV
+-    echo "unset path_kbuild_bin path_dev_bin" >> $ENV
+-  fi
+-}
+-
+-
+-#
+ # Check for compiler.h
+ # Some Linux distributions include "compiler.h" in their libc linux 
+ # headers package, some don't.  Most don't need it, building might (!) 
+@@ -1156,7 +1130,6 @@
+ 
+ # first determine our environment
+ check_environment
+-check_kbuild
+ 
+ # some things are not available in for OSE
+ if (($OSE)); then


Property changes on: dists/trunk/virtualbox/debian/patches/configure.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: dists/trunk/virtualbox/debian/patches/yasm-path-correction.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/yasm-path-correction.dpatch	                        (rev 0)
+++ dists/trunk/virtualbox/debian/patches/yasm-path-correction.dpatch	2007-06-18 06:34:37 UTC (rev 7)
@@ -0,0 +1,16 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## yasm-path-correction.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
+##
+
+ at DPATCH@
+--- virtualbox-1.3.8/Config.kmk	2007-06-01 10:31:23.000000000 +0200
++++ virtualbox-1.3.8/Config.kmk	2007-06-01 10:32:27.000000000 +0200
+@@ -697,7 +697,7 @@
+ # We need to export YASM for OSE, but since it was converted to .zip we need to
+ # allow for the location used by the zip to be properly cleaned up first.
+ ifeq ($(filter-out win.x86 linux.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
+- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
++ PATH_TOOL_YASM ?= /usr/bin
+ endif
+ 
+ # XPCOM setup for all but win32.


Property changes on: dists/trunk/virtualbox/debian/patches/yasm-path-correction.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: dists/trunk/virtualbox/debian/rules
===================================================================
--- dists/trunk/virtualbox/debian/rules	2007-06-18 01:59:01 UTC (rev 6)
+++ dists/trunk/virtualbox/debian/rules	2007-06-18 06:34:37 UTC (rev 7)
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
 include /usr/share/dpatch/dpatch.make
 
 # some default definitions, important!
@@ -47,35 +45,18 @@
 #
 ### end  KERNEL SETUP
 
-upstream:
-	# Needs svn
-	DATE=$(shell date +%Y%m%d)
+MAKE:=kmk
 
-	# Getting sources
-	cd .. && \
-	svn co http://virtualbox.org/svn/vbox/trunk vbox && \
-	mv vbox virtualbox-$(DATE)
-
-	# Removing unused files
-	find ../virtualbox-$(DATE) -type d -name .svn -exec rm -rf {} \; || exit 0
-
-	# Stripping sources
-	#rm -rf ../virtualbox-$(DATE)/kBuild/bin
-	#rm -rf ../virtualbox-$(DATE)/tools
-
-	# Creating tarball
-	tar cfz ../virtualbox_$(DATE)+debian.orig.tar.gz ../virtualbox-$(DATE)
-
-config.status: patch configure
+config.status: patch-stamp configure
 	dh_testdir
 
 	# Configuring package
 	if [ "`dpkg-architecture -qDEB_BUILD_ARCH`" = "amd64" ]; \
 	then \
-		./configure --with-linux=/usr/src/linux-headers-2.6.18-4-amd64 || exit 1; \
+		./configure --with-linux=/usr/src/linux-headers-2.6.21-1-amd64 || exit 1; \
 	elif [ "`dpkg-architecture -qDEB_BUILD_ARCH`" = "i386" ]; \
 	then \
-		./configure --with-linux=/usr/src/linux-headers-2.6.18-4-486 || exit 1; \
+		./configure --with-linux=/usr/src/linux-headers-2.6.21-1-486  || exit 1; \
 	fi
 
 build: build-stamp
@@ -83,7 +64,7 @@
 	dh_testdir
 
 	# Building package
-	kmk BUILD_TYPE=release
+	$(MAKE) BUILD_TYPE=release
 
 	touch build-stamp
 
@@ -91,6 +72,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
+	rm -f AutoConfig.kmk configure.log env.sh
 
 	# Cleaning package
 	rm -rf out
@@ -105,9 +87,10 @@
 	dh_installdirs
 
 	# Installing virtualbox
+	mkdir -p debian/virtualbox/usr/lib
 	cp -r out/linux.*/release/bin debian/virtualbox/usr/lib/virtualbox
-	cp $(CURDIR)/debian/VBox.sh $(CURDIR)/debian/virtualbox/usr/lib/virtualbox
 
+	mkdir -p debian/virtualbox/usr/bin
 	ln -s ../lib/virtualbox/VBox.sh debian/virtualbox/usr/bin/VBoxManage
 	ln -s ../lib/virtualbox/VBox.sh debian/virtualbox/usr/bin/VBoxSDL
 	ln -s ../lib/virtualbox/VBox.sh debian/virtualbox/usr/bin/VirtualBox
@@ -116,6 +99,18 @@
 	install -D -m 0644 src/VBox/Frontends/VirtualBox/images/ico32x01.png debian/virtualbox/usr/share/icons/virtualbox.png
 	install -D -m 0644 debian/pixmap/virtualbox.xpm debian/virtualbox/usr/share/pixmaps/virtualbox.xpm
 
+    #strip some files manually since dh_strip doesn't recognise them:
+    
+	strip debian/virtualbox/usr/lib/virtualbox/testcase/tstLdrObj.gc
+	strip debian/virtualbox/usr/lib/virtualbox/VMMGC.gc
+	strip debian/virtualbox/usr/lib/virtualbox/VMMR0.r0
+	strip debian/virtualbox/usr/lib/virtualbox/tstMicroGC.gc
+	strip debian/virtualbox/usr/lib/virtualbox/VBoxDDGC.gc
+	strip debian/virtualbox/usr/lib/virtualbox/VBoxDD2GC.gc
+	strip debian/virtualbox/usr/lib/virtualbox/VBoxDDR0.r0
+	strip debian/virtualbox/usr/lib/virtualbox/VBoxDD2R0.r0
+
+
 	# Installing virtualbox-source
 	mkdir -p debian/virtualbox-source/usr/src/modules
 	mv debian/virtualbox/usr/lib/virtualbox/src debian/virtualbox-source/usr/src/modules/virtualbox-source
@@ -132,10 +127,10 @@
 	dh_clean -k
 
 	# Build the module
-	$(MAKE) all KSRC=$(KSRC) KVER=$(KVERS)
+	$(MAKE) modules KSRC=$(KSRC) KVER=$(KVERS)
 
 	# Install the module
-	dh_install vboxdrv.ko /lib/modules/$(KVERS)/misc/
+	install -D -m 0644 vboxdrv.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/misc/vboxdrv.ko
 
 	dh_installdocs
 	dh_installchangelogs
@@ -155,6 +150,7 @@
 	dh_installdocs
 	dh_install
 	dh_link
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb

Modified: dists/trunk/virtualbox/debian/virtualbox-source.README.Debian
===================================================================
--- dists/trunk/virtualbox/debian/virtualbox-source.README.Debian	2007-06-18 01:59:01 UTC (rev 6)
+++ dists/trunk/virtualbox/debian/virtualbox-source.README.Debian	2007-06-18 06:34:37 UTC (rev 7)
@@ -1,17 +1 @@
-virtualbox for Debian
----------------------
-
-The Debian virtualbox-source package can be used in several ways,
-
- - Using module-assistant(1) commands provided by the module-assistant Debian
-   package:
-
-	# module-assistant prepare virtualbox
-	# module-assistant auto-install virtualbox
-
- - Using the make-kpkg(1) command provided by the kernel-package Debian
-   package. See the "modules_image" section of the make-kpkg(1) man page.
-
- - Unpacking /usr/src/virtualbox-*.tar.bz2 and installing the module on your own.
-
- -- Daniel Baumann <daniel at debian.org>  Fri, 17 Nov 2006 08:29:00 +0100
+/usr/share/modass/packages/default.sh	/usr/share/modass/overrides/virtualbox-source

Modified: dists/trunk/virtualbox/debian/virtualbox.menu
===================================================================
--- dists/trunk/virtualbox/debian/virtualbox.menu	2007-06-18 01:59:01 UTC (rev 6)
+++ dists/trunk/virtualbox/debian/virtualbox.menu	2007-06-18 06:34:37 UTC (rev 7)
@@ -1,4 +1,4 @@
 ?package(virtualbox):needs="X11" section="Apps/Programming"\
   title="VirtualBox" longtitle="PC virtualization solution"\
   description="Run several virtual systems on a single host computer"\
-  command="/usr/bin/virtualbox" icon="/usr/share/pixmaps/virtualbox.xpm"
+  command="/usr/bin/VirtualBox" icon="/usr/share/pixmaps/virtualbox.xpm"




More information about the Pkg-virtualbox-commits mailing list