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

Sun Dec 23 15:03:24 UTC 2007

Author: meskes
Date: 2007-12-23 15:03:24 +0000 (Sun, 23 Dec 2007)
New Revision: 160

Added:
   trunk/debian/patches/13-no-64bit-guest.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/00list
   trunk/debian/rules
Log:
* Do not build guest-utils on amd64 because 64bit guests are nor support yet.
* Removed build time dependency on i32-libs that is not really needed.



Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2007-12-21 11:42:20 UTC (rev 159)
+++ trunk/debian/changelog	2007-12-23 15:03:24 UTC (rev 160)
@@ -1,3 +1,11 @@
+virtualbox-ose (1.5.2-dfsg2-8) UNRELEASED; urgency=low
+
+  * Do not build guest-utils on amd64 because 64bit guests are nor support
+    yet.
+  * Removed build time dependency on i32-libs that is not really needed.
+
+ -- Michael Meskes <meskes at debian.org>  Sun, 23 Dec 2007 14:12:44 +0100
+
 virtualbox-ose (1.5.2-dfsg2-7) unstable; urgency=low
 
   [ Patrick Winnertz ]

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-12-21 11:42:20 UTC (rev 159)
+++ trunk/debian/control	2007-12-23 15:03:24 UTC (rev 160)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Virtualbox Team  <pkg-virtualbox-devel at lists.alioth.debian.org>
 Uploaders: Philipp Hug <debian at hug.cx>, Marvin Stark <marv at der-marv.de>, Michael Meskes <meskes at debian.org>, Patrick Winnertz <winnie at debian.org>, Daniel Baumann <daniel at debian.org>, Hilko Bengen <bengen at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, bcc, bzip2, g++-multilib [amd64], ia32-libs [amd64], iasl, kbuild, libacl1-dev, libasound-dev, libc6-dev-i386 [amd64], libhal-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, uuid-dev, xalan, xsltproc, yasm
+Build-Depends: debhelper (>= 5), dpatch, bcc, bzip2, g++-multilib [amd64], iasl, kbuild, libacl1-dev, libasound-dev, libc6-dev-i386 [amd64], libhal-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, uuid-dev, xalan, xsltproc, yasm
 Standards-Version: 3.7.3
 Homepage: http://www.virtualbox.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk
@@ -66,7 +66,7 @@
  Linux, FreeBSD, DOS, OpenBSD and others.
 
 Package: virtualbox-ose-guest-utils
-Architecture: amd64 i386
+Architecture: i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, pciutils
 Recommends: virtualbox-ose-guest-modules
 Suggests: virtualbox-ose-guest-source

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2007-12-21 11:42:20 UTC (rev 159)
+++ trunk/debian/patches/00list	2007-12-23 15:03:24 UTC (rev 160)
@@ -10,3 +10,4 @@
 10-no-registration.dpatch
 11-module-build.dpatch
 12-kcompat-2.6.24.dpatch
+13-no-64bit-guest.dpatch

Added: trunk/debian/patches/13-no-64bit-guest.dpatch
===================================================================
--- trunk/debian/patches/13-no-64bit-guest.dpatch	                        (rev 0)
+++ trunk/debian/patches/13-no-64bit-guest.dpatch	2007-12-23 15:03:24 UTC (rev 160)
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13-no-64bit-guest.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not build guest utils on 64 bit architectures
+
+ at DPATCH@
+
+--- virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/Makefile.kmk.orig	2007-10-18 13:07:28.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/Makefile.kmk	2007-12-23 13:49:48.000000000 +0100
+@@ -22,10 +22,13 @@
+ ifeq ($(filter-out linux l4, $(BUILD_TARGET)),)
+ SUBDIRS += \
+ 	module \
++	sharedfolders
++endif
++ifeq ($(filter-out x86, $(BUILD_TARGET_ARCH)),)
++SUBDIRS += \
+ 	daemon \
+ 	xgraphics \
+ 	xmouse \
+-	sharedfolders \
+ 	xclient
+ endif
+ 
+--- virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk.orig	2007-08-30 17:16:27.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk	2007-12-23 13:50:36.000000000 +0100
+@@ -20,7 +20,10 @@
+ ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
+ SYSMODS  = vboxvfs
+ endif
+-PROGRAMS = mountvboxsf
++PROGRAMS =
++ifeq ($(filter-out x86, $(BUILD_TARGET_ARCH)),)
++PROGRAMS += mountvboxsf
++endif
+ INSTALLS = vboxvfs-bin vboxvfs-sh
+ 
+ #
+--- virtualbox-ose-1.5.2-dfsg2/configure.orig	2007-12-23 15:15:43.000000000 +0100
++++ virtualbox-ose-1.5.2-dfsg2/configure	2007-12-23 15:16:44.000000000 +0100
+@@ -230,7 +230,7 @@
+ check_environment()
+ {
+   test_header environment
+-  BUILD_CPU=`uname -m`
++  BUILD_CPU=`dpkg --print-architecture`
+   case "$BUILD_CPU" in
+     i[3456789]86|x86|i86pc)
+       BUILD_MACHINE='x86'

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-12-21 11:42:20 UTC (rev 159)
+++ trunk/debian/rules	2007-12-23 15:03:24 UTC (rev 160)
@@ -7,11 +7,11 @@
 
 # some default definitions, important!
 #
-# Name of the source package
+# Name of the source packages
 psource:=virtualbox-ose-source
 gsource:=virtualbox-ose-guest-source
 
-# The short upstream name, used for the module source directory
+# The short upstream name
 sname:=virtualbox-ose
 gname:=virtualbox-ose-guest
 uname:=virtualbox-ose-guest-utils
@@ -78,51 +78,54 @@
 	# This will get installed into the package by dh_installinit
 	install -m 644 src/VBox/Installer/linux/vboxnet.sh debian/$(sname).init
 
-	# Install virtualbox guest additions
-	install -m 644 out/bin/additions/vboxvideo_drv_14.so debian/$(uname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
-	install -m 644 out/bin/additions/vboxmouse_drv_14.so debian/$(uname)/usr/lib/xorg/modules/input/vboxmouse_drv.so
-	install -m 755 out/bin/additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf
-
-	dh_install
-
-	# These files have incorrect permissions, fixing it.
-	chmod 755 debian/$(uname)/usr/lib/virtualbox/x11config.pl
-	chmod 755 debian/$(sname)/usr/lib/virtualbox/VBox.sh
-	chmod 755 debian/$(psource)/usr/src/modules/$(sname)/debian/rules
-	chmod 755 debian/$(gsource)/usr/src/modules/$(gname)/debian/rules
-
-	# Create .tar.bz2 for virtualbox*source
-	cd debian/$(psource)/usr/src && \
-		tar -cjf $(sname).tar.bz2 modules && \
-		rm -rf modules
-	cd debian/$(gsource)/usr/src && \
-		tar -cjf $(gname).tar.bz2 modules && \
-		rm -rf modules
-
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
 	dh_installchangelogs -a
 	dh_installdocs -a
 	dh_installmenu -a
+	dh_install -p$(sname)
+	chmod 755 debian/$(sname)/usr/lib/virtualbox/VBox.sh; 
+	if [ "`dpkg --print-architecture`" = "i386" ]; then \
+		dh_install -p$(uname); \
+		chmod 755 debian/$(uname)/usr/lib/virtualbox/x11config.pl; \
+		install -m 644 out/bin/additions/vboxvideo_drv_14.so debian/$(uname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so; \
+		install -m 644 out/bin/additions/vboxmouse_drv_14.so debian/$(uname)/usr/lib/xorg/modules/input/vboxmouse_drv.so; \
+		install -m 755 out/bin/additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf; \
+		dh_strip -p$(uname); \
+	fi
+	dh_strip -p$(sname) --dbg-package=$(sname)-dbg
 	dh_link -a
-	dh_strip -a --dbg-package=$(sname)-dbg
-	rm -r debian/$(sname)-dbg/usr/lib/debug/usr/sbin debian/$(sname)-dbg/usr/lib/debug/sbin debian/$(sname)-dbg/usr/lib/debug/usr/lib/xorg
 	dh_compress -a
 	dh_fixperms -X=/usr/lib/virtualbox/VBox.sh -a
 	dh_installudev -a
 	dh_installinit -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	dh_gencontrol -a
+	dh_gencontrol -p$(sname)
+	dh_gencontrol -p$(sname)-dbg
+	if [ "`dpkg --print-architecture`" = "i386" ]; then dh_gencontrol -p$(uname); fi
 	dh_md5sums -a
-	dh_builddeb -a
+	dh_builddeb -p$(sname)
+	dh_builddeb -p$(sname)-dbg
+	if [ "`dpkg --print-architecture`" = "i386" ]; then dh_builddeb -p$(uname); fi
 
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs -i
 	dh_installdocs -i
+	dh_install -i
+	# These files have incorrect permissions, fixing it.
+	chmod 755 debian/$(psource)/usr/src/modules/$(sname)/debian/rules
+	chmod 755 debian/$(gsource)/usr/src/modules/$(gname)/debian/rules
+	# Create .tar.bz2 for virtualbox*source
+	cd debian/$(psource)/usr/src && \
+		tar -cjf $(sname).tar.bz2 modules && \
+		rm -rf modules
+	cd debian/$(gsource)/usr/src && \
+		tar -cjf $(gname).tar.bz2 modules && \
+		rm -rf modules
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i


