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

meskes at alioth.debian.org meskes at alioth.debian.org
Fri Nov 2 16:31:16 UTC 2007 

Author: meskes
Date: 2007-11-02 16:31:16 +0000 (Fri, 02 Nov 2007)
New Revision: 100

Removed:
   trunk/debian/TODO
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/copyright
   trunk/debian/patches/04-localconf-kmk.dpatch
   trunk/debian/rules
   trunk/debian/scripts/VBox.sh
   trunk/debian/virtualbox-ose.README.Debian
Log:
Moved architecture independant files from /usr/lib to /usr/share, closes: #448951
Checked license of linux installer and additions.
Repackaged dfsg orig tarball accordingly.
Added linux installer, closes: #448749
Provide programs with upstream upper/lower case mix as used by upstream.
Started working on linux additions. The new packages are not funtional yet.



Deleted: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2007-11-01 14:48:16 UTC (rev 99)
+++ trunk/debian/TODO	2007-11-02 16:31:16 UTC (rev 100)
@@ -1,2 +0,0 @@
-- check license statements in ./src/VBox/Additions/*
-  and add them to the debian/copyright and add those additions to the package

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-11-01 14:48:16 UTC (rev 99)
+++ trunk/debian/changelog	2007-11-02 16:31:16 UTC (rev 100)
@@ -1,4 +1,4 @@
-virtualbox-ose (1.5.2-dfsg-3) UNRELEASED; urgency=low
+virtualbox-ose (1.5.2-dfsg2-1) unstable; urgency=low
 
   [ Daniel Baumann ]
   * Added debug package.
@@ -7,7 +7,12 @@
   [ 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.
+  * Moved architecture independant files from /usr/lib to /usr/share, closes: #448951
+  * Checked license of linux installer and additions.
+  * Repackaged dfsg orig tarball accordingly.
+  * Added linux installer, closes: #448749
+  * Added linux additions, closes: #440517
+  * Provide programs with upstream upper/lower case mix as used by upstream.
 
  -- Michael Meskes <meskes at debian.org>  Thu, 01 Nov 2007 14:47:10 +0100
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-11-01 14:48:16 UTC (rev 99)
+++ trunk/debian/control	2007-11-02 16:31:16 UTC (rev 100)
@@ -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 <patrick.winnertz at skolelinux.org>, Daniel Baumann <daniel at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, 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, libxerces27-dev, libxcursor-dev, uuid-dev, xalan, xsltproc, yasm, zlib1g-dev
+Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, 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, libxerces27-dev, libxcursor-dev, uuid-dev, xalan, xsltproc, yasm, zlib1g-dev
 Standards-Version: 3.7.2
 Homepage: http://www.virtualbox.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk
@@ -43,10 +43,36 @@
 Replaces: virtualbox-source
 Provides: virtualbox-source
 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.
+ This package provides the source code for the virtualbox kernel module.
+ The virtualbox-ose package is also required in order to make use of these
+ modules. Kernel source or headers are required to compile this module.
  .
  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.
+
+Package: virtualbox-ose-guest-source
+Architecture: all
+Depends: debhelper (>= 5), dpatch, module-assistant, bzip2, kbuild
+Description: Source for the VirtualBox Guest Addition module
+ This package provides the source code for the virtualbox guest addition kernel
+ modules.  The virtualbox-ose-guest 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.
+
+Package: virtualbox-ose-guest-utils
+Architecture: amd64 i386
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: virtualbox-ose-guest-modules, virtualbox-ose-guest-source
+Description: PC virtualization solution - guest utils
+ 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.
+ .
+ This packages contains the guest utilities of the Open Source Edition of
+ VirtualBox. These utilities are supposed to be run inside the virtual machine.
+

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2007-11-01 14:48:16 UTC (rev 99)
+++ trunk/debian/copyright	2007-11-02 16:31:16 UTC (rev 100)
@@ -22,6 +22,9 @@
 
 The following files are licensed under GPLv2:
 
+./src/VBox/Installer/linux/tunctl.c
+	Copyright 2002 Jeff Dike
+
 ./src/VBox/HostDrivers/VBoxTAP/
         Copyright (C) Damion K. Wilson, 2003
 
@@ -237,7 +240,13 @@
 A copy of this license is appended below.
 
 -------------------------------------------------------------------------------
+The complete subtree ./src/VBox/Additions/Linux/x11include is taken from the X
+sources and still carries the original license. Some work under
+./src/VBox/Additions/Linux was derived from the X sources and carries both, the
+original X license and the innotek GPL license.
 
+-------------------------------------------------------------------------------
+
 Due to license issues, parts of the Guest Additions have to be removed from the
 sourcecode. Some of the files were (c) Microsoft with an license which have to be
 considered non-free.

Modified: trunk/debian/patches/04-localconf-kmk.dpatch
===================================================================
--- trunk/debian/patches/04-localconf-kmk.dpatch	2007-11-01 14:48:16 UTC (rev 99)
+++ trunk/debian/patches/04-localconf-kmk.dpatch	2007-11-02 16:31:16 UTC (rev 100)
@@ -14,12 +14,12 @@
 +VBOX_WITH_VBOXDRV =
 +VBOX_WITH_LINUX_ONLY =
 +VBOX_ADDITIONS_LINUX_ONLY =
-+VBOX_WITH_INSTALLER =
-+VBOX_WITH_LINUX_ADDITIONS =
++VBOX_WITH_INSTALLER = 1
++VBOX_WITH_LINUX_ADDITIONS = 1
 +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\"
++DEFS += RTPATH_SHARED_LIBS=\"/usr/lib/virtualbox\"

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-11-01 14:48:16 UTC (rev 99)
+++ trunk/debian/rules	2007-11-02 16:31:16 UTC (rev 100)
@@ -13,43 +13,9 @@
 
 # The short upstream name, used for the module source directory
 sname:=virtualbox-ose
-
+gname:=virtualbox-ose-guest
 uname:=virtualbox-ose-guest-utils
 
-### KERNEL SETUP
-### Setup the stuff needed for making kernel module packages
-### taken from /usr/share/kernel-package/sample.module.rules
-
-# prefix of the target package name
-PACKAGE=virtualbox-ose-modules
-# modifieable for experiments or debugging m-a
-MA_DIR ?= /usr/share/modass
-# load generic variable handling
--include $(MA_DIR)/include/generic.make
-# load default rules, including kdist, kdist_image, ...
--include $(MA_DIR)/include/common-rules.make
-
-# module assistant calculates all needed things for us and sets
-# following variables:
-# KSRC (kernel source directory), KVERS (kernel version string), KDREV
-# (revision of the Debian kernel-image package), CC (the correct
-# compiler), VERSION (the final package version string), PKGNAME (full
-# package name with KVERS included), DEB_DESTDIR (path to store DEBs)
-
-# The kdist_configure target is called by make-kpkg modules_config and
-# by kdist* rules by dependency. It should configure the module so it is
-# ready for compilation (mostly useful for calling configure).
-# prep-deb-files from module-assistant creates the neccessary debian/ files
-kdist_configure: prep-deb-files
-
-# the kdist_clean target is called by make-kpkg modules_clean and from
-# kdist* rules. It is responsible for cleaning up any changes that have
-# been made by the other kdist_commands (except for the .deb files created)
-kdist_clean: clean
-	$(MAKE) $(MFLAGS) -f debian/rules clean
-#
-### end  KERNEL SETUP
-
 MAKE:=kmk
 
 config.status: patch configure
@@ -62,6 +28,8 @@
 
 	# Building package
 	$(MAKE) BUILD_TYPE=release
+	# make sure VBoxAddIF.sh is build too
+	(cd src/VBox/Installer/linux; $(MAKE) `echo $(CURDIR)/out/linux.*/release/bin`/VBoxAddIF.sh)
 
 	touch build-stamp
 
@@ -84,10 +52,10 @@
 dfsg-free:
 	rm -rf ./kBuild
 	rm -rf ./tools
-	rm -rf ./src/VBox/Additions
+	rm -rf ./src/VBox/Additions/os2
+	rm -rf ./src/VBox/Additions/WINNT
 	rm -f ./src/VBox/HostDrivers/VBoxTAP/VBoxTAP.rc
 	rm -f ./src/VBox/HostDrivers/Support/darwin/load.sh
-	rm -rf ./src/VBox/Installer/
 	rm -f ./include/VBox/VBoxGuest.inc
 	rm -f ./include/VBox/VBoxGuest16.h
 	rm -f ./include/VBox/VBoxGuest.mac
@@ -95,8 +63,8 @@
 	rm -f ./src/libs/xpcom18a4/xpcom/MoreFiles/FSCopyObject.h
 	rm -rf ./debian/
 	find . -type d -name '.svn' | xargs rm -rf;
-	cd .. && mv VirtualBox-1.5.2_OSE virtualbox-ose-1.5.2-dfsg && \
-		tar cfz virtualbox-ose_1.5.2-dfsg.orig.tar.gz virtualbox-ose-1.5.2-dfsg
+	cd .. && mv VirtualBox-1.5.2_OSE virtualbox-ose-1.5.2-dfsg2 && \
+		tar cfz virtualbox-ose_1.5.2-dfsg2.orig.tar.gz virtualbox-ose-1.5.2-dfsg2
 
 install: DH_OPTIONS=
 install: build
@@ -115,10 +83,17 @@
 	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
+	mv debian/$(sname)/usr/lib/virtualbox/VBoxTunctl debian/$(sname)/usr/bin/
+	mv debian/$(sname)/usr/lib/virtualbox/VBoxAddIF.sh debian/$(sname)/usr/bin/VBoxTAP
 
 	ln -s ../lib/virtualbox/VBox.sh debian/$(sname)/usr/bin/vboxmanage
 	ln -s ../lib/virtualbox/VBox.sh debian/$(sname)/usr/bin/vboxsdl
 	ln -s ../lib/virtualbox/VBox.sh debian/$(sname)/usr/bin/virtualbox
+	ln -s ../lib/virtualbox/VBox.sh debian/$(sname)/usr/bin/VBoxManage
+	ln -s ../lib/virtualbox/VBox.sh debian/$(sname)/usr/bin/VBoxSDL
+	ln -s ../lib/virtualbox/VBox.sh debian/$(sname)/usr/bin/VirtualBox
+	ln -s VBoxTAP debian/$(sname)/usr/bin/VBoxAddIF
+	ln -s VBoxTAP debian/$(sname)/usr/bin/VBoxDeleteIF
 
 	install -D -m 0644 debian/desktop/virtualbox-ose.desktop debian/$(sname)/usr/share/applications/virtualbox-ose.desktop
 	install -D -m 0644 src/VBox/Frontends/VirtualBox/images/ico32x01.png debian/$(sname)/usr/share/icons/virtualbox.png
@@ -127,39 +102,33 @@
 	echo "# VirtualBox installation directory" > $(CURDIR)/debian/$(sname)/etc/vbox/vbox.cfg
 	echo "INSTALL_DIR="\"/usr/lib/virtualbox\" >> $(CURDIR)/debian/$(sname)/etc/vbox/vbox.cfg
 
-	# Installing virtualbox-ose-source
-	mkdir -p debian/$(psource)/usr/src/modules
+	# Install virtualbox-ose-source
+	mkdir -p debian/$(psource)/usr/src/modules/
 	mv debian/$(sname)/usr/lib/virtualbox/src debian/$(psource)/usr/src/modules/$(sname)
 
+	# Install virtualbox-ose-guest-source
+	mkdir -p debian/$(gsource)/usr/src/modules/$(gname)
+	mv debian/$(sname)/usr/lib/virtualbox/additions/src/vboxadd debian/$(gsource)/usr/src/modules/$(gname)
+	mv debian/$(sname)/usr/lib/virtualbox/additions/src/vboxvfs debian/$(gsource)/usr/src/modules/$(gname)
+	rm -r debian/$(sname)/usr/lib/virtualbox/additions/src
 
 	mkdir -p debian/$(psource)/usr/src/modules/$(sname)/debian
-	cp debian/*.modules.in* debian/control debian/rules debian/changelog debian/copyright debian/compat  debian/$(psource)/usr/src/modules/$(sname)/debian
+	cp debian/*.modules.in* debian/control debian/changelog debian/copyright debian/compat  debian/$(psource)/usr/src/modules/$(sname)/debian
+	cp debian/$(psource).rules  debian/$(psource)/usr/src/modules/$(sname)/debian/rules
 
+	mkdir -p debian/$(gsource)/usr/src/modules/$(gname)/debian
+	cp debian/*.modules.in* debian/control debian/changelog debian/copyright debian/compat  debian/$(gsource)/usr/src/modules/$(gname)/debian
+	cp debian/$(gsource).rules  debian/$(gsource)/usr/src/modules/$(gname)/debian/rules
+
 	cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules
+	cd debian/$(gsource)/usr/src && tar c modules | bzip2 -9 > $(gname).tar.bz2 && rm -rf modules
 
+	# Install virtualbox guest additions
+	mkdir -p debian/$(uname)/usr/lib/virtualbox
+	mv debian/$(sname)/usr/lib/virtualbox/additions debian/$(uname)/usr/lib/virtualbox
+
 	dh_install
 
-binary-modules: prep-deb-files
-	dh_testroot
-	dh_clean -k
-
-	# Build the module
-	$(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC)
-
-	# Install the module
-	dh_install vboxdrv.ko /lib/modules/$(KVERS)/misc/
-
-	dh_installdocs
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installmodules
-	dh_installdeb
-	dh_gencontrol -- -v$(VERSION)
-	dh_md5sums
-	dh_builddeb --destdir=$(DEB_DESTDIR)
-	dh_clean -k
-
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
@@ -168,7 +137,9 @@
 	dh_install -a
 	dh_installmenu -a
 	dh_link -a
-	dh_strip -a --dbg-package=virtualbox-ose-dbg
+	dh_strip -a --dbg-package=$(sname)-dbg
+	# remove debug symbols belonging to libs that get installed inside the virtual machine
+	rm -r debian/$(sname)-dbg/usr/lib/debug/usr/lib/virtualbox/additions
 	dh_compress -a
 	dh_fixperms -X=/usr/lib/virtualbox/VBox.sh -a
 	dh_installudev -a

Modified: trunk/debian/scripts/VBox.sh
===================================================================
--- trunk/debian/scripts/VBox.sh	2007-11-01 14:48:16 UTC (rev 99)
+++ trunk/debian/scripts/VBox.sh	2007-11-02 16:31:16 UTC (rev 100)
@@ -76,12 +76,21 @@
   virtualbox)
     exec "$INSTALL_DIR/VirtualBox" "$@"
   ;;
+  VirtualBox)
+    exec "$INSTALL_DIR/VirtualBox" "$@"
+  ;;
   vboxmanage)
     exec "$INSTALL_DIR/VBoxManage" "$@"
   ;;
+  VBoxManage)
+    exec "$INSTALL_DIR/VBoxManage" "$@"
+  ;;
   vboxsdl)
     exec "$INSTALL_DIR/VBoxSDL" "$@"
   ;;
+  VBoxSDL)
+    exec "$INSTALL_DIR/VBoxSDL" "$@"
+  ;;
   *)
     echo "Unknown application - $APP"
   ;;

Modified: trunk/debian/virtualbox-ose.README.Debian
===================================================================
--- trunk/debian/virtualbox-ose.README.Debian	2007-11-01 14:48:16 UTC (rev 99)
+++ trunk/debian/virtualbox-ose.README.Debian	2007-11-02 16:31:16 UTC (rev 100)
@@ -41,7 +41,7 @@
 
  -- 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.
+Please see also http://wiki.debian.org/VirtualBox for additional information.
 
  -- Michael Meskes <meskes at debian.org>  Thu, 01 Nov 2007 14:46:39 +0100

More information about the Pkg-virtualbox-commits mailing list