[Pkg-virtualbox-commits] r9 - dists/trunk/virtualbox/debian
hug at alioth.debian.org
hug at alioth.debian.org
Mon Jun 18 16:06:01 UTC 2007
Author: hug
Date: 2007-06-18 16:06:00 +0000 (Mon, 18 Jun 2007)
New Revision: 9
Added:
dists/trunk/virtualbox/debian/README.rebuild
dists/trunk/virtualbox/debian/control.new
Modified:
dists/trunk/virtualbox/debian/TODO
dists/trunk/virtualbox/debian/changelog
dists/trunk/virtualbox/debian/rules
dists/trunk/virtualbox/debian/virtualbox.dirs
Log:
* Merged Patrick's changes correctly
Copied: dists/trunk/virtualbox/debian/README.rebuild (from rev 7, dists/trunk/virtualbox/debian/README.rebuild)
===================================================================
--- dists/trunk/virtualbox/debian/README.rebuild (rev 0)
+++ dists/trunk/virtualbox/debian/README.rebuild 2007-06-18 16:06:00 UTC (rev 9)
@@ -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 15:46:11 UTC (rev 8)
+++ dists/trunk/virtualbox/debian/TODO 2007-06-18 16:06:00 UTC (rev 9)
@@ -1,6 +1,9 @@
stripping sources - see SOURCE CLEANUP
+libs compile with -fPIC
+dpatch for Config.kmk
+
check copyright
check trademark
Modified: dists/trunk/virtualbox/debian/changelog
===================================================================
--- dists/trunk/virtualbox/debian/changelog 2007-06-18 15:46:11 UTC (rev 8)
+++ dists/trunk/virtualbox/debian/changelog 2007-06-18 16:06:00 UTC (rev 9)
@@ -6,6 +6,7 @@
* Added myself as uploader
* Build target for module is now all instead of module
* Build against correct kernel source
+ * Integrated changes by Patrick Winnertz
-- Philipp Hug <debian at hug.cx> Sun, 17 Jun 2007 18:13:25 +0100
Added: dists/trunk/virtualbox/debian/control.new
===================================================================
--- dists/trunk/virtualbox/debian/control.new (rev 0)
+++ dists/trunk/virtualbox/debian/control.new 2007-06-18 16:06:00 UTC (rev 9)
@@ -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>, 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
+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/rules
===================================================================
--- dists/trunk/virtualbox/debian/rules 2007-06-18 15:46:11 UTC (rev 8)
+++ dists/trunk/virtualbox/debian/rules 2007-06-18 16:06:00 UTC (rev 9)
@@ -47,43 +47,17 @@
#
### 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
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; \
- elif [ "`dpkg-architecture -qDEB_BUILD_ARCH`" = "i386" ]; \
- then \
- ./configure --with-linux=/usr/src/linux-headers-2.6.18-4-486 || exit 1; \
- fi
-
build: build-stamp
build-stamp: config.status
dh_testdir
# Building package
- kmk BUILD_TYPE=release
+ $(MAKE) BUILD_TYPE=release
touch build-stamp
@@ -91,6 +65,7 @@
dh_testdir
dh_testroot
rm -f build-stamp
+ rm -f AutoConfig.kmk configure.log env.sh
# Cleaning package
rm -rf out
@@ -116,6 +91,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
@@ -155,6 +142,7 @@
dh_installdocs
dh_install
dh_link
+ dh_strip
dh_compress
dh_fixperms
dh_installdeb
Modified: dists/trunk/virtualbox/debian/virtualbox.dirs
===================================================================
--- dists/trunk/virtualbox/debian/virtualbox.dirs 2007-06-18 15:46:11 UTC (rev 8)
+++ dists/trunk/virtualbox/debian/virtualbox.dirs 2007-06-18 16:06:00 UTC (rev 9)
@@ -1,2 +1,3 @@
usr/bin
+usr/sbin
usr/lib
More information about the Pkg-virtualbox-commits
mailing list