Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

1 files changed, 19 insertions, 119 deletions

diff --git a/debian/rules b/debian/rules
index 450a94b5..cfef477e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,13 +39,12 @@ verpkg   := virtualbox-ose
 current  := $(shell pwd)
 vboxroot := $(shell 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))
-svnrev   := 0
 NOMODS   ?= $(ose)
 NOQT     ?= $(HEADLESS)
 NOWEBSVC ?= $(ose)
@@ -72,12 +71,12 @@ instmod := $(if $(filter _Ubuntu_lucid _Ubuntu_maverick _Ubuntu_natty _Ubuntu_on
 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
 
@@ -87,16 +86,14 @@ 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_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:
@@ -116,8 +113,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
@@ -183,68 +180,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 $(vboxroot)/src/VBox/Installer/linux/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 \
@@ -258,44 +204,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 \
@@ -306,23 +227,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%|$(ver)|g' \
 	    debian/preinst.in > debian/preinst
@@ -341,21 +250,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