diff options
Diffstat (limited to 'src/VBox/Installer/linux/debian')
| -rw-r--r-- | src/VBox/Installer/linux/debian/LocalConfig.kmk | 2 | ||||
| -rwxr-xr-x | src/VBox/Installer/linux/debian/VBox.sh | 102 | ||||
| -rw-r--r-- | src/VBox/Installer/linux/debian/control | 12 | ||||
| -rw-r--r-- | src/VBox/Installer/linux/debian/dirs | 1 | ||||
| -rw-r--r-- | src/VBox/Installer/linux/debian/lintian-override.in | 1 | ||||
| -rwxr-xr-x | src/VBox/Installer/linux/debian/postinst.in | 10 | ||||
| -rwxr-xr-x | src/VBox/Installer/linux/debian/postrm | 2 | ||||
| -rwxr-xr-x | src/VBox/Installer/linux/debian/preinst.in | 2 | ||||
| -rwxr-xr-x | src/VBox/Installer/linux/debian/prerm.in | 4 | ||||
| -rwxr-xr-x | src/VBox/Installer/linux/debian/rules | 143 |
10 files changed, 43 insertions, 236 deletions
diff --git a/src/VBox/Installer/linux/debian/LocalConfig.kmk b/src/VBox/Installer/linux/debian/LocalConfig.kmk index d25294ab..72251cb9 100644 --- a/src/VBox/Installer/linux/debian/LocalConfig.kmk +++ b/src/VBox/Installer/linux/debian/LocalConfig.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/debian/VBox.sh b/src/VBox/Installer/linux/debian/VBox.sh deleted file mode 100755 index d7c21e20..00000000 --- a/src/VBox/Installer/linux/debian/VBox.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh -# -# Oracle VM VirtualBox startup script, Linux hosts. -# -# Copyright (C) 2006-2011 Oracle Corporation -# -# This file is part of VirtualBox Open Source Edition (OSE), as -# available from http://www.virtualbox.org. This file is free software; -# you can redistribute it and/or modify it under the terms of the GNU -# General Public License (GPL) as published by the Free Software -# Foundation, in version 2 as it comes in the "COPYING" file of the -# VirtualBox OSE distribution. VirtualBox OSE is distributed in the -# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. -# - -PATH="/usr/bin:/bin:/usr/sbin:/sbin" - -# Note: This script must not fail if the module was not successfully installed -# because the user might not want to run a VM but only change VM params! - -if [ "$1" = "shutdown" ]; then - SHUTDOWN="true" -elif ! lsmod|grep -q vboxdrv; then - cat << EOF -WARNING: The vboxdrv kernel module is not loaded. Either there is no module - available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by - - sudo /etc/init.d/vboxdrv setup - - You will not be able to start VMs until this problem is fixed. -EOF -elif [ ! -c /dev/vboxdrv ]; then - cat << EOF -WARNING: The character device /dev/vboxdrv does not exist. Try - - sudo /etc/init.d/vboxdrv restart - - and if that is not successful, try to re-install the package. - - You will not be able to start VMs until this problem is fixed. -EOF -fi - -if [ -f /etc/vbox/module_not_compiled ]; then - cat << EOF -WARNING: The compilation of the vboxdrv.ko kernel module failed during the - installation for some reason. Starting a VM will not be possible. - Please consult the User Manual for build instructions. -EOF -fi - -SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'` -if [ -z "$SERVER_PID" ]; then - # Server not running yet/anymore, cleanup socket path. - # See IPC_GetDefaultSocketPath()! - if [ -n "$LOGNAME" ]; then - rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1 - else - rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1 - fi -fi - -if [ "$SHUTDOWN" = "true" ]; then - if [ -n "$SERVER_PID" ]; then - kill -TERM $SERVER_PID - sleep 2 - fi - exit 0 -fi - -INSTALL_DIR=/usr/lib/virtualbox - -APP=`basename $0` -case "$APP" in - VirtualBox|virtualbox) - exec "$INSTALL_DIR/VirtualBox" "$@" - ;; - VBoxManage|vboxmanage) - exec "$INSTALL_DIR/VBoxManage" "$@" - ;; - VBoxSDL|vboxsdl) - exec "$INSTALL_DIR/VBoxSDL" "$@" - ;; - VBoxVRDP|VBoxHeadless|vboxheadless) - exec "$INSTALL_DIR/VBoxHeadless" "$@" - ;; - VBoxBalloonCtrl|vboxballoonctrl) - exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@" - ;; - vboxwebsrv) - exec "$INSTALL_DIR/vboxwebsrv" "$@" - ;; - VBoxBFE|vboxbfe) - exec "$INSTALL_DIR/VBoxBFE" "$@" - ;; - *) - echo "Unknown application - $APP" - exit 1 - ;; -esac -exit 0 diff --git a/src/VBox/Installer/linux/debian/control b/src/VBox/Installer/linux/debian/control index 0b286c7b..457b3c88 100644 --- a/src/VBox/Installer/linux/debian/control +++ b/src/VBox/Installer/linux/debian/control @@ -1,4 +1,4 @@ -Source: virtualbox-4.2 +Source: virtualbox-4.3 Section: contrib/misc Priority: optional Maintainer: Oracle Corporation <info@virtualbox.org> @@ -13,16 +13,16 @@ Build-Depends: debhelper (>= 5), libz-dev, libssl-dev, libqt4-dev, libxext-dev, libcurl-dev, libxrandr-dev, openjdk-6-jdk | sun-java6-jdk XS-Python-Version: >= 2.4 -Package: virtualbox-4.2 +Package: virtualbox-4.3 Architecture: i386 amd64 Pre-Depends: debconf (>= 1.1) | debconf-2.0 Depends: ${shlibs:Depends}, debconf (>= 0.5) | debconf-2.0, psmisc, adduser Recommends: ${alsa}, ${pulse}, ${sdlttf}, ${dkms}, linux-headers, gcc, make, binutils, - pdf-viewer, libgl1, python-central + pdf-viewer, libgl1 Provides: virtualbox Replaces: virtualbox -Conflicts: virtualbox, virtualbox-ose +Conflicts: virtualbox, virtualbox-ose, virtualbox-guest-additions-iso Description: Oracle VM VirtualBox VirtualBox is a powerful PC virtualization solution allowing you to run a wide range of PC operating systems on your Linux system. This includes @@ -31,9 +31,9 @@ Description: Oracle VM VirtualBox software solution on the market. XB-Python-Version: ${python:Versions} -Package: virtualbox-4.2-dbg +Package: virtualbox-4.3-dbg Architecture: i386 amd64 -Depends: virtualbox-4.2 (= ${Source-Version}) +Depends: virtualbox-4.3 (= ${Source-Version}) Provides: virtualbox-dbg Replaces: virtualbox-dbg Conflicts: virtualbox-dbg, virtualbox-ose-dbg diff --git a/src/VBox/Installer/linux/debian/dirs b/src/VBox/Installer/linux/debian/dirs index 1f68187f..1549fd3a 100644 --- a/src/VBox/Installer/linux/debian/dirs +++ b/src/VBox/Installer/linux/debian/dirs @@ -2,4 +2,3 @@ /etc/vbox /etc/init.d /usr/src -/usr/lib/virtualbox diff --git a/src/VBox/Installer/linux/debian/lintian-override.in b/src/VBox/Installer/linux/debian/lintian-override.in index c23755cf..e4a9eee3 100644 --- a/src/VBox/Installer/linux/debian/lintian-override.in +++ b/src/VBox/Installer/linux/debian/lintian-override.in @@ -15,6 +15,7 @@ %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxHostChannel.so %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDragAndDropSvc.so %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxNetDHCP.so +%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxNetNAT.so %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVRDP.so %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxAuth.so %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so diff --git a/src/VBox/Installer/linux/debian/postinst.in b/src/VBox/Installer/linux/debian/postinst.in index 102ba7b1..01a16382 100755 --- a/src/VBox/Installer/linux/debian/postinst.in +++ b/src/VBox/Installer/linux/debian/postinst.in @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2006-2011 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -66,9 +66,17 @@ if [ "$1" = "configure" ]; then if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetDHCP > /dev/null 2>&1; then chmod 4511 /usr/lib/virtualbox/VBoxNetDHCP fi + if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetNAT > /dev/null 2>&1; then + chmod 4511 /usr/lib/virtualbox/VBoxNetNAT + fi if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetAdpCtl > /dev/null 2>&1; then chmod 4511 /usr/lib/virtualbox/VBoxNetAdpCtl fi + if [ -x /usr/lib/virtualbox/VBoxVolInfo ]; then + if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxVolInfo > /dev/null 2>&1; then + chmod 4511 /usr/lib/virtualbox/VBoxVolInfo + fi + fi # if INSTALL_NO_VBOXDRV is set to 1, remove all shipped modules if [ "$INSTALL_NO_VBOXDRV" = "1" ]; then diff --git a/src/VBox/Installer/linux/debian/postrm b/src/VBox/Installer/linux/debian/postrm index 60a9f6fd..799412d4 100755 --- a/src/VBox/Installer/linux/debian/postrm +++ b/src/VBox/Installer/linux/debian/postrm @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/debian/preinst.in b/src/VBox/Installer/linux/debian/preinst.in index 10861b48..d065ead9 100755 --- a/src/VBox/Installer/linux/debian/preinst.in +++ b/src/VBox/Installer/linux/debian/preinst.in @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2006-2011 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/debian/prerm.in b/src/VBox/Installer/linux/debian/prerm.in index d26ed562..496bbf8e 100755 --- a/src/VBox/Installer/linux/debian/prerm.in +++ b/src/VBox/Installer/linux/debian/prerm.in @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -19,7 +19,7 @@ # purge: (our version): purge this package # deconfigure: (our version): removing conflicting version -rm -f /etc/udev/rules.d/10-vboxdrv.rules +rm -f /etc/udev/rules.d/60-vboxdrv.rules rm -f /etc/vbox/license_agreed rm -f /etc/vbox/module_not_compiled diff --git a/src/VBox/Installer/linux/debian/rules b/src/VBox/Installer/linux/debian/rules index f987cb96..e9ea88c1 100755 --- a/src/VBox/Installer/linux/debian/rules +++ b/src/VBox/Installer/linux/debian/rules @@ -41,18 +41,18 @@ export DH_COMPAT=4 # BLEEDING_EDGE=xyz package := virtualbox -verpkg := virtualbox-4.2 +verpkg := virtualbox-4.3 current := $(shell pwd) vboxroot := $(shell cd ../../../..; pwd) pkgdir := $(if $(PKGDIR),$(PKGDIR),$(shell cd ../../../../..; pwd)) -builddir := $(current)/debian/builddir -moddir := $(current)/debian/modules +builddir := $(vboxroot)/out/debian/builddir +moddir := $(vboxroot)/out/debian/modules prefix := $(current)/debian/$(verpkg) arch := $(shell dpkg --print-architecture) verfile := $(builddir)/version-generated.mk ose := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1)) -include $(vboxroot)/SVN_REVISION -svnrev :=$(if $(svn_revision),$(svn_revision),0) +svnrev :=$(if $(svn_revision),$(svn_revision),) NOMODS ?= $(ose) NOQT ?= $(HEADLESS) @@ -94,12 +94,12 @@ endif qtstdc6 := /home/vbox/Qt-4.7.4-stdc++6-$(arch) cfg_flags := $(if $(NOQT),--disable-qt,) \ - $(if $(filter _Ubuntu_hardy _Debian_lenny,$(debrel)),--with-qt4-dir=$(qtstdc6)) \ + $(if $(filter _Debian_squeeze,$(debrel)),--build-libvpx,) \ $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \ $(if $(HEADLESS),--build-headless,) \ $(if $(DEBUG),--build-debug,) \ $(if $(NOWINE),,--setup-wine) \ - $(if $(NOWEBSVC),,--enable-webservice) \ + $(if $(NOWEBSVC),,$(if $(ose),--enable-webservice,)) \ $(if $(VNC),--enable-vnc,) \ --disable-extpack @@ -109,17 +109,15 @@ bld_flags := AUTOCFG=$(current)/debian/AutoConfig.kmk \ VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \ VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \ VBOX_DO_STRIP= \ - VBOX_DO_STRIP_MODULES= \ VBOX_WITH_MULTIVERSION_PYTHON= \ VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \ $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \ VBOX_PACKAGE_DIST=$(debdist) \ - VBOX_SVN_REV=$(svnrev) \ + $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \ $(if $(NODOCS),VBOX_WITH_DOCS= ,) \ $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \ $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \ - $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \ - $(if $(filter _Ubuntu_hardy,$(debrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1) + $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) configure: debian/configure-stamp debian/configure-stamp: @@ -139,8 +137,8 @@ debian/build-stamp $(verfile): $(if $(STAGEDISO),cp $(STAGEDISO)/VBoxGuestAdditions.iso $(builddir)/bin/additions,) . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) \ VBOX_NO_LINUX_RUN_INSTALLER=1 \ - VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86-r$(svnrev).tar.bz2 \ - VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64-r$(svnrev).tar.bz2 \ + VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \ + VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2 \ VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \ VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \ packing @@ -207,68 +205,17 @@ binary binary-arch binary-indep: build $(if $(NOMODS),,modules) dh_clean -k dh_installdirs tar -xjC $(prefix)/opt -f $(builddir)/bin/VirtualBox.tar.bz2 - install -d -g 0 -o 0 $(prefix)/usr/share/applications - install -d -g 0 -o 0 $(prefix)/usr/lib - install -d -g 0 -o 0 $(prefix)/usr/bin - install -d -g 0 -o 0 $(prefix)/usr/lib/$(package) - install -d -g 0 -o 0 $(prefix)/usr/share/$(package) + $(if $(NOQT),,mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo) + $(archdir)/scripts/install.sh --package $(package) --root $(prefix) \ + --prefix /usr $(if $(NOQT),--no-qt) $(if $(ose),--ose) \ + $(if $(HEADLESS),--headless) $(if $(NOWEBSVC),--no-web-service) \ + --install-folder /lib/$(package) --no-helpers install -d -g 0 -o 0 $(prefix)/usr/share/doc/$(verpkg) - $(if $(NOQT),,mv $(archdir)/virtualbox.desktop \ - $(prefix)/usr/share/applications/virtualbox.desktop) - install -d -g 0 -o 0 $(prefix)/usr/share/pixmaps - install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor - cp $(archdir)/icons/128x128/virtualbox.png \ - $(prefix)/usr/share/pixmaps/virtualbox.png - cd $(archdir)/icons; for i in *; do \ - if [ -f $$i/virtualbox.png ]; then \ - install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \ - mv $$i/virtualbox.png $(prefix)/usr/share/icons/hicolor/$$i/apps; \ - fi; \ - install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \ - mv $$i/* $(prefix)/usr/share/icons/hicolor/$$i/mimetypes || true; \ - rmdir $$i; \ - done - rmdir $(archdir)/icons - install -d -g 0 -o 0 $(prefix)/usr/lib/$(package)/ExtensionPacks - mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo install -d -g 0 -o 0 $(prefix)/usr/share/lintian/overrides sed \ -e 's|%VERPKG%|$(verpkg)|g' \ debian/lintian-override.in > \ $(prefix)/usr/share/lintian/overrides/$(verpkg) - mv $(archdir)/VBoxEFI32.fd $(prefix)/usr/lib/$(package) - mv $(archdir)/VBoxEFI64.fd $(prefix)/usr/lib/$(package) - mv $(archdir)/VBox.png \ - $(prefix)/usr/share/pixmaps/VBox.png - mv $(archdir)/*.gc $(prefix)/usr/lib/$(package) - mv $(archdir)/*.r0 $(prefix)/usr/lib/$(package) - mv $(archdir)/*.rel $(prefix)/usr/lib/$(package) || true - mv $(archdir)/VBoxNetDHCP $(prefix)/usr/lib/$(package) - mv $(archdir)/VBoxNetAdpCtl $(prefix)/usr/lib/$(package) - mv $(archdir)/VBoxXPCOMIPCD $(prefix)/usr/lib/$(package) - mv $(archdir)/components $(prefix)/usr/lib/$(package)/components - mv $(archdir)/*.so $(prefix)/usr/lib/$(package) - mv $(archdir)/*.so.4 $(prefix)/usr/lib/$(package) || true - $(if $(NOQT),,mv $(archdir)/VBoxTestOGL $(prefix)/usr/lib/$(package)) - $(if $(NOQT),,mv $(archdir)/nls $(prefix)/usr/share/$(package)) - mv $(archdir)/src $(prefix)/usr/share/$(package) - rm $(archdir)/VBox.sh - export VBOX_INSTALL_PATH=/usr/lib/$(package) && \ - cd ./debian/builddir/bin/sdk/installer && \ - python ./vboxapisetup.py install --root $(prefix) - rm -rf $(archdir)/sdk/installer - mv $(archdir)/vboxshell.py $(prefix)/usr/lib/$(package) - mv $(archdir)/sdk $(prefix)/usr/lib/$(package) - install -D -g 0 -o 0 -m 644 debian/VBox.sh $(prefix)/usr/bin/VBox - mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package) - mv $(archdir)/VBoxCreateUSBNode.sh $(prefix)/usr/share/$(package) - for i in VBoxManage VBoxSVC $(if $(HEADLESS),,VBoxSDL) \ - $(if $(NOQT),,VirtualBox) VBoxHeadless \ - VBoxExtPackHelperApp VBoxBalloonCtrl VBoxAutostart \ - $(if $(NOWEBSVC),,vboxwebsrv webtest); do \ - mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done - $(if $(VNC),mv $(archdir)/ExtensionPacks/VNC $(prefix)/usr/lib/$(package)/ExtensionPacks,) - mv $(archdir)/VBoxTunctl $(prefix)/usr/bin $(if $(NOMODS),,for d in $(moddir)/*; do \ if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko -a -f $$d/vboxpci.ko ]; then \ install -D -g 0 -o 0 -m 0644 \ @@ -282,44 +229,19 @@ binary binary-arch binary-indep: build $(if $(NOMODS),,modules) fi \ done) ifeq ($(ose),) - $(if $(NOQT),,mv $(archdir)/kchmviewer $(prefix)/usr/lib/$(package)) dh_installdocs \ $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \ $(addprefix $(archdir)/, LICENSE) rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm \ LICENSE) - for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \ - mv $(archdir)/$$i $(prefix)/usr/share/$(package); done - $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp $(prefix)/usr/bin) - $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp-keymaps $(prefix)/usr/share/$(package)) - if [ -d $(archdir)/accessible ]; then mv $(archdir)/accessible $(prefix)/usr/lib/virtualbox; fi else dh_installdocs \ $(archdir)/UserManual*.pdf rm $(addprefix $(archdir)/,UserManual*.pdf) - for i in additions/VBoxGuestAdditions.iso; do \ - mv $(archdir)/$$i $(prefix)/usr/share/$(package); done endif - rmdir $(archdir)/additions - $(if $(VNC),rmdir $(archdir)/ExtensionPacks) - rmdir $(archdir) + mv $(archdir) $(prefix)/usr/lib/$(package) + ln -s ../VBoxVMM.so $(prefix)/usr/lib/$(package)/components/VBoxVMM.so rmdir $(prefix)/opt - dh_link \ - $(if $(NOQT),,usr/bin/VBox usr/bin/VirtualBox) \ - $(if $(NOQT),,usr/bin/VBox usr/bin/virtualbox) \ - usr/bin/VBox usr/bin/VBoxManage \ - usr/bin/VBox usr/bin/vboxmanage \ - $(if $(HEADLESS),,usr/bin/VBox usr/bin/VBoxSDL) \ - $(if $(HEADLESS),,usr/bin/VBox usr/bin/vboxsdl) \ - $(if $(ose),,usr/bin/VBox usr/bin/VBoxVRDP) \ - usr/bin/VBox usr/bin/VBoxHeadless \ - usr/bin/VBox usr/bin/vboxheadless \ - usr/bin/VBox usr/bin/VBoxBalloonCtrl \ - usr/bin/VBox usr/bin/vboxballoonctrl \ - usr/bin/VBox usr/bin/VBoxAutostart \ - usr/bin/VBox usr/bin/vboxautostart \ - $(if $(NOWEBSVC),,usr/bin/VBox usr/bin/vboxwebsrv) \ - usr/share/virtualbox/src/vboxhost usr/src/vboxhost-$(ver) dh_desktop $(if $(NOMODS),,dh_installmodules) sed \ @@ -330,23 +252,11 @@ endif -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \ $(vboxroot)/src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init dh_installinit --name=vboxdrv --noscripts - sed \ - -e 's|%NOLSB%||g' \ - -e 's|%DEBIAN%|yes|g' \ - -e 's|%PACKAGE%|virtualbox|g' \ - $(vboxroot)/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in > debian/vboxballoonctrl-service.init + cp $(vboxroot)/src/VBox/Installer/linux/vboxballoonctrl-service.sh debian/vboxballoonctrl-service.init dh_installinit --name=vboxballoonctrl-service --noscripts - sed \ - -e 's|%NOLSB%||g' \ - -e 's|%DEBIAN%|yes|g' \ - -e 's|%PACKAGE%|virtualbox|g' \ - $(vboxroot)/src/VBox/Installer/linux/vboxautostart-service.sh.in > debian/vboxautostart-service.init + cp $(vboxroot)/src/VBox/Installer/linux/vboxautostart-service.sh debian/vboxautostart-service.init dh_installinit --name=vboxautostart-service --noscripts - sed \ - -e 's|%NOLSB%||g' \ - -e 's|%DEBIAN%|yes|g' \ - -e 's|%PACKAGE%|virtualbox|g' \ - $(vboxroot)/src/VBox/Installer/linux/vboxweb-service.sh.in > debian/vboxweb-service.init + cp $(vboxroot)/src/VBox/Installer/linux/vboxweb-service.sh debian/vboxweb-service.init dh_installinit --name=vboxweb-service --noscripts sed -e 's|%VER%|$(debver)|g' \ -e 's|%DATE%|$(shell date -R)|g' \ @@ -370,21 +280,12 @@ endif dh_link ifeq ($(DEBUG),) dh_strip --keep-debug --exclude=libQtCoreVBox.so.4 --exclude=libQtGuiVBox.so.4 --exclude=libQtNetworkVBox.so.4 --exclude=libQtOpenGLVBox.so.4 --exclude=libqtaccessiblewidgets.so - # manually strip our R0/GC modules, dh_strip cannot handle them - for f in \ - $(prefix)/usr/lib/$(package)/*.r0 $(prefix)/usr/lib/$(package)/*.gc; do \ - objcopy --only-keep-debug \ - $$f \ - $(prefix)/usr/lib/debug/usr/lib/$(package)/`basename $$f`; \ - strip -S --remove-section=.comment $$f; \ - objcopy --add-gnu-debuglink=$(prefix)/usr/lib/debug/usr/lib/$(package)/`basename $$f` $$f; \ - done endif mkdir -p $(current)/debian/$(verpkg)-dbg/usr/lib ifeq ($(DEBUG),) mv $(current)/debian/$(verpkg)/usr/lib/debug $(current)/debian/$(verpkg)-dbg/usr/lib endif - dh_pycentral + $(if $(filter _Ubuntu_hardy _Ubuntu_lucid,$(debrel)),dh_pycentral,dh_python2) dh_compress -X.pdf -X.chm -X LICENSE -X.py dh_fixperms dh_makeshlibs @@ -399,7 +300,7 @@ endif -Vdkms=$(if $(filter _Debian_lenny,$(debrel)),,dkms) dh_md5sums dh_builddeb --destdir $(pkgdir) -- \ - $(if $(filter _Ubuntu_hardy _Ubuntu_lucid,$(debrel)),,-Zxz) + $(if $(filter _Ubuntu_lucid,$(debrel)),,-Zxz) endif .PHONY: binary modules binary-arch binary-indep clean checkroot |