Changeset 6802 for pkg/vinnie


Ignore:
Timestamp:
07/12/10 05:06:54 (3 years ago)
Author:
alanbach-guest
Message:
  • Sync'd with Debian 3.2.6-dfsg-2
Location:
pkg/vinnie/main/virtualbox-ose/trunk/debian
Files:
15 added
25 deleted
23 edited

Legend:

Unmodified
Added
Removed

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/LocalConfig.kmk

    r6547 r6802  
    1111VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox 
    1212VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS) 
     13VBOX_WITH_VNC := 1 
     14VBOX_WITH_VBOXBFE := 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/README.source

    r6547 r6802  
    22=================== 
    33 
    4 This package uses dpatch to manage all modifications to the upstream 
    5 source. Changes are stored in the source package as diffs in 
     4This package uses quilt to manage all modifications to the upstream 
     5source.  Changes are stored in the source package as diffs in 
    66debian/patches and applied during the build. 
    77 
    8 See /usr/share/doc/dpatch/README.source.gz for a detailed explanation. 
     8See /usr/share/doc/quilt/README.source for a detailed explanation. 
    99 
    1010 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/changelog

    r6547 r6802  
    1 virtualbox-ose (3.1.6-dfsg-parsix1) unstable; urgency=low 
    2  
    3   * Sync'd with Debian 3.1.6-dfsg-2 
    4  
    5  -- Alan Baghumian <alan@technotux.org>  Sat, 10 Apr 2010 16:13:32 -0700 
     1virtualbox-ose (3.2.6-dfsg-parsix1) unstable; urgency=low 
     2 
     3  * Sync'd with Debian 3.2.6-dfsg-2 
     4 
     5 -- Alan Baghumian <alan@technotux.org>  Sun, 11 Jul 2010 20:05:55 -0700 
     6 
     7virtualbox-ose (3.2.6-dfsg-2) unstable; urgency=low 
     8 
     9  * Added patch taken from FreeBSD to make DSDT files compile with 
     10    latest versions of iasl. (Closes: #587609) 
     11  * Bump Standards-Version to 3.9.0, no changes needed. 
     12 
     13 -- Michael Meskes <meskes@debian.org>  Fri, 02 Jul 2010 15:24:21 +0200 
     14 
     15virtualbox-ose (3.2.6-dfsg-1) unstable; urgency=low 
     16 
     17  [ Michael Meskes ] 
     18  * Do not use standard compiler optimization for vdfuse. (Closes: 
     19    #586265) 
     20 
     21  [ Felix Geyer ] 
     22  * New upstream release. 
     23  * virtualbox-ose-dkms and virtualbox-ose-guest-dkms break each other 
     24    instead of conflicting. 
     25 
     26 -- Felix Geyer <debfx-pkg@fobos.de>  Sat, 26 Jun 2010 01:26:22 +0200 
     27 
     28virtualbox-ose (3.2.4-dfsg-1) unstable; urgency=low 
     29 
     30  * New upstream release. 
     31 
     32 -- Felix Geyer <debfx-pkg@fobos.de>  Wed, 09 Jun 2010 15:31:05 +0200 
     33 
     34virtualbox-ose (3.2.2-dfsg-1) unstable; urgency=low 
     35 
     36  * Imported Upstream version 3.2.2-dfsg (Closes: #584488, #585003) 
     37  * Fixed dh_install usage in rules file for backports. - thanks to 
     38    Corey Wright <undefined@pobox.com> 
     39 
     40 -- Michael Meskes <meskes@debian.org>  Tue, 08 Jun 2010 11:50:51 +0200 
     41 
     42virtualbox-ose (3.2.0-dfsg-1) unstable; urgency=low 
     43 
     44  [ Felix Geyer ] 
     45  * New upstream release. 
     46  * Add 23-remove-invalid-chars-check.patch to remove a check for invalid 
     47    characters in the build path since kBuild is now able to handle those. 
     48  * Fix FTBFS when building without arch-all packages. 
     49 
     50  [ Michael Meskes ] 
     51  * Changed order of some commands to make sure links are created inside 
     52    the source tarball not outside. 
     53 
     54 -- Michael Meskes <meskes@debian.org>  Sun, 23 May 2010 11:39:11 +0200 
     55 
     56virtualbox-ose (3.1.53-dfsg-1) experimental; urgency=low 
     57 
     58  * New upstream release 3.2.0 Beta 3. 
     59  * Add build-dependencies required by new upstream version. 
     60  * Adapt 18-system-xorg.dpatch to new upstream version. 
     61  * Update to new upstream release of vdfuse. 
     62  * Build vdfuse with -Wl,--as-needed. 
     63  * Install vbox PAM module. 
     64  * Drop 17-disable-help-contents.dpatch and 20-hide-help-buttons.dpatch 
     65    as VirtualBox can download the manual. 
     66  * Enable VDE networking. 
     67  * Enable VNC server in VBoxHeadless. 
     68  * Don't build VBoxBFE as it's not installed anyway. 
     69  * Hide the update menu item and settings page instead of disabling them. 
     70  * Make both dkms packages conflict with each other as the kernel modules 
     71    export the same symbol. (LP: #571574) 
     72  * Switch from dpatch to quilt patching system. 
     73  * Convert debian/rules to dh7. 
     74  * Use dkms debhelper script. 
     75 
     76 -- Felix Geyer <debfx-pkg@fobos.de>  Thu, 13 May 2010 18:20:43 +0200 
     77 
     78virtualbox-ose (3.1.8-dfsg-1) unstable; urgency=low 
     79 
     80  * New upstream version (LP: #578723). 
     81    - Fixes vboxsf file systems not being mounted while booting on Ubuntu. 
     82      (LP: #530179) 
     83  * Adapt 18-system-xorg.dpatch and 06-xsession.dpatch to new upstream version. 
     84  * Use upstream 50-vboxmouse.conf instead of our own. 
     85  * Add libxrandr-dev to build-dependencies. 
     86  * Don't load the kernel modules in the guest utils init script as they are 
     87    loaded automatically. 
     88  * Drop 15-wined3d-guest-addition.dpatch as the Windows guest additions 
     89    provide Direct3D acceleration. 
     90 
     91 -- Felix Geyer <debfx-pkg@fobos.de>  Tue, 11 May 2010 18:06:04 +0200 
     92 
     93virtualbox-ose (3.1.6-dfsg-3) unstable; urgency=low 
     94 
     95  * Move 10-vboxmouse.conf to 50-vboxmouse.conf and install it in 
     96    /usr/share/X11/xorg.conf.d. 
     97  * Use substvar from new xsfbs.mk. 
     98 
     99 -- Felix Geyer <debfx-pkg@fobos.de>  Sun, 18 Apr 2010 18:56:10 +0200 
    6100 
    7101virtualbox-ose (3.1.6-dfsg-2) unstable; urgency=low 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/compat

    r6547 r6802  
    1 5 
     17 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/control

    r6547 r6802  
    77Build-Depends: bcc, 
    88               bzip2, 
    9                chrpath, 
    10                debhelper (>= 6.0.7~), 
     9               debhelper (>= 7.2.7~), 
     10               dkms (>= 2.1.1.1), 
    1111               docbook-xml, 
    1212               docbook-xsl, 
    13                dpatch, 
    1413               g++-multilib [amd64], 
    1514               gsoap, 
    … …  
    2423               libglu1-mesa-dev, 
    2524               libidl-dev, 
     25               libpam0g-dev, 
    2626               libpixman-1-dev, 
    2727               libpng12-dev, 
    … …  
    3131               libsdl1.2-dev, 
    3232               libssl-dev, 
     33               libvncserver-dev, 
    3334               libx11-dev, 
    3435               libxcomposite-dev, 
    … …  
    3738               libxext-dev, 
    3839               libxi-dev, 
     40               libxinerama-dev, 
    3941               libxmu-dev, 
     42               libxrandr-dev, 
    4043               libxrender-dev, 
    4144               libxslt1-dev, 
    4245               lynx-cur, 
    43                python-central, 
     46               python-central (>= 0.6.7~), 
    4447               python-dev (>= 2.4), 
     48               quilt (>= 0.46-7~), 
    4549               uuid-dev, 
    4650               x11proto-gl-dev, 
    … …  
    5155               zlib1g-dev 
    5256XS-Python-Version: >= 2.4 
    53 Standards-Version: 3.8.4 
     57Standards-Version: 3.9.0 
    5458Homepage: http://www.virtualbox.org/ 
    5559Vcs-Git: git://git.debian.org/git/pkg-virtualbox/virtualbox-ose.git 
    … …  
    8084            ${shlibs:Recommends} 
    8185Suggests: virtualbox-guest-additions, 
    82           libasound2, libpulse0 
     86          libasound2, libpulse0, 
     87          vde2 
    8388Conflicts: virtualbox, virtualbox-2.0, virtualbox-2.1, virtualbox-2.2, virtualbox-3.0 
    8489XB-Python-Version: ${python:Versions} 
    … …  
    110115Package: virtualbox-ose-dkms 
    111116Replaces: virtualbox-ose-source (<< 3.1.0-dfsg-1) 
    112 Section: kernel 
    113 Architecture: all 
    114 Depends: ${misc:Depends}, dkms (>= 2.1.0.1) 
     117Breaks: virtualbox-ose-guest-dkms 
     118Section: kernel 
     119Architecture: all 
     120Depends: ${misc:Depends} 
    115121Description: x86 virtualization solution - kernel module sources for dkms 
    116122 VirtualBox is a free x86 virtualization solution allowing a wide range 
    … …  
    143149Package: virtualbox-ose-guest-dkms 
    144150Replaces: virtualbox-ose-guest-source (<< 3.1.0-dfsg-1) 
    145 Section: kernel 
    146 Architecture: all 
    147 Depends: ${misc:Depends}, dkms (>= 2.1.0.1) 
     151Breaks: virtualbox-ose-dkms 
     152Section: kernel 
     153Architecture: all 
     154Depends: ${misc:Depends} 
    148155Description: x86 virtualization solution - guest addition module source for dkms 
    149156 VirtualBox is a free x86 virtualization solution allowing a wide range 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/rules

    r6547 r6802  
    11#!/usr/bin/make -f 
    2  
    3 include /usr/share/dpatch/dpatch.make 
    42 
    53# Name of the source packages 
    … …  
    1816 
    1917INSTALL_PATH:=/usr/lib/virtualbox 
    20  
    21 # Some defines needed for X 
    22 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) 
    23 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) 
    24 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) 
    25 SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) 
    26 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) 
    27 INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) 
     18MAKE:=kmk 
     19 
     20upstreamversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p') 
     21 
     22X11_BACKPORT =  
     23 
    2824XSERVER_VERSION = 17 
    29  
    30 MAKE:=kmk 
    31  
    32 upstreamversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p') 
    33  
    34 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) 
    35  
    36 # Generate README.Debian as text/html ... 
    37 debian/README.Debian.html: debian/virtualbox-ose.files/README.Debian.xml 
    38         xsltproc --nonet --stringparam section.autolabel 1 \ 
    39             -o $@ \ 
    40             /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl \ 
    41             $< 
    42  
    43 # ... and text/plain 
    44 debian/virtualbox-ose.README.Debian: debian/README.Debian.html 
    45         chmod 755 debian/lynx-dump-postprocess 
    46         export LC_ALL=C; lynx -force_html -dump $< | ./debian/lynx-dump-postprocess > $@.tmp 
    47         mv $@.tmp $@ 
    48  
    49 out/env.sh: patch-stamp 
    50         dh_testdir 
     25INSTALL_X11_PCI_ID = 0 
     26INSTALL_X11_HAL = 0 
     27INSTALL_X11_UDEV = 1 
     28INSTALL_XORGCONFD = new 
     29XORG_PKG_ABI = new 
     30 
     31ifeq ($(X11_BACKPORT),lenny) 
     32        XSERVER_VERSION = 14 
     33        INSTALL_X11_PCI_ID = 1 
     34        INSTALL_X11_HAL = 1 
     35        INSTALL_X11_UDEV = 0 
     36        INSTALL_XORGCONFD = no 
     37        XORG_PKG_ABI = old 
     38else ifeq ($(X11_BACKPORT),lucid) 
     39        INSTALL_XORGCONFD = old 
     40        XORG_PKG_ABI = old 
     41endif 
     42 
     43 
     44ifeq ($(XORG_PKG_ABI),new) 
     45        # Some defines needed for X 
     46        VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) 
     47        INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) 
     48        # these two can be removed post-squeeze 
     49        VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) 
     50        INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) 
     51        VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) 
     52        INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) 
     53else 
     54        # Some defines needed for X 
     55        SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) 
     56        VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) 
     57        INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) 
     58        SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) 
     59        VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) 
     60        INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) 
     61endif 
     62 
     63 
     64 
     65%: 
     66        dh --with quilt,python_central,dkms $@ 
     67 
     68override_dh_auto_configure: 
    5169        mkdir -p out 
    5270        ./configure \ 
    … …  
    5573            --with-linux="/usr" \ 
    5674            --disable-kmods \ 
    57             --enable-webservice 
    58  
    59 build: build-stamp 
    60 build-stamp: out/env.sh 
    61         dh_testdir 
     75            --enable-webservice \ 
     76            --enable-vde 
     77 
     78override_dh_auto_build: 
    6279        # Building package 
    6380        . out/env.sh && $(MAKE) \ 
    … …  
    7087            VBOX_WITH_UPDATE_REQUEST= \ 
    7188            $(if $(DH_VERBOSE),KBUILD_VERBOSE=2,) 
    72         gcc debian/vdfuse/vdfuse.c -o debian/vdfuse/vdfuse -pipe -Wl,--rpath,$(INSTALL_PATH) -Wall $(CFLAGS) $(LDFLAGS) \ 
    73             $(shell pkg-config --cflags --libs fuse) -Iinclude out/bin/VBoxDD.so out/bin/VBoxDD2.so out/bin/VBoxDDU.so \ 
    74             out/bin/VBoxVMM.so out/bin/VBoxREM.so out/bin/VBoxRT.so 
    75         touch $@ 
    76  
    77 clean: unpatch 
    78         dh_testdir 
    79         dh_testroot 
     89 
     90        mkdir -p out/vdfuse 
     91        gcc debian/vdfuse/vdfuse.c -o out/vdfuse/vdfuse -pipe -Wl,--as-needed -Wl,--rpath,$(INSTALL_PATH) -Wall \ 
     92            $(shell pkg-config --cflags --libs fuse) -Iinclude $(addprefix out/bin/, \ 
     93            VBoxDD.so VBoxDD2.so VBoxDDU.so VBoxVMM.so VBoxREM.so VBoxRT.so) 
     94 
     95        xsltproc --nonet --stringparam section.autolabel 1 \ 
     96            -o debian/README.Debian.html \ 
     97            /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl \ 
     98            debian/virtualbox-ose.files/README.Debian.xml 
     99 
     100        chmod 755 debian/lynx-dump-postprocess 
     101        export LC_ALL=C; lynx -force_html -dump debian/README.Debian.html | \ 
     102            ./debian/lynx-dump-postprocess > debian/virtualbox-ose.README.Debian.tmp 
     103        mv debian/virtualbox-ose.README.Debian.tmp debian/virtualbox-ose.README.Debian 
     104 
     105override_dh_auto_install: 
     106        dh_auto_install 
     107 
     108        export VBOX_INSTALL_PATH=$(INSTALL_PATH) && \ 
     109            cd out/bin/sdk/installer && \ 
     110            python ./vboxapisetup.py install --root $(CURDIR)/debian/$(sname) 
     111 
     112        sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).links.in > debian/$(gdkms).links 
     113        sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(pdkms).links.in > debian/$(pdkms).links 
     114 
     115        # Build install files for the dkms'ified sources 
     116        sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(pdkms).install.in > debian/$(pdkms).install 
     117        sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).install.in > debian/$(gdkms).install 
     118 
     119ifeq ($(XORG_PKG_ABI),new) 
     120 
     121ifeq ($(VIDEODEP),) 
     122        @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' 
     123        @exit 1 
     124else 
     125        echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(uxname).substvars 
     126        echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(uxname).substvars 
     127        # the following is there for compatibility... 
     128        echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(uxname).substvars 
     129        echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(uxname).substvars 
     130        echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(uxname).substvars 
     131endif 
     132 
     133else # ifeq ($(XORG_PKG_ABI),new) 
     134 
     135ifeq ($(SERVERMINVERS),) 
     136        @echo error: xserver-xorg-dev needs to be installed 
     137        @exit 1 
     138else 
     139        echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(uxname).substvars 
     140        echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(uxname).substvars 
     141        echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(uxname).substvars 
     142endif 
     143 
     144endif # ifeq ($(XORG_PKG_ABI),new) 
     145 
     146 
     147override_dh_install: 
     148        dh_install 
     149 
     150ifeq ($(INSTALL_X11_PCI_ID),1) 
     151        dh_install -p$(uxname) --ignore debian/$(uxname).install \ 
     152            src/VBox/Additions/x11/Installer/vboxvideo.ids \ 
     153            /usr/share/xserver-xorg/pci 
     154endif 
     155 
     156ifeq ($(INSTALL_X11_HAL),1) 
     157        dh_install -p$(uxname) --ignore debian/$(uxname).install \ 
     158            src/VBox/Additions/linux/installer/90-vboxguest.fdi \ 
     159            /usr/share/hal/fdi/policy/20thirdparty 
     160endif 
     161 
     162ifeq ($(INSTALL_XORGCONFD),new) 
     163        dh_install -p$(uxname) --ignore debian/$(uxname).install \ 
     164            src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ 
     165            /usr/share/X11/xorg.conf.d 
     166else ifeq ($(INSTALL_XORGCONFD),old) 
     167        dh_install -p$(uxname) --ignore debian/$(uxname).install \ 
     168            src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ 
     169            /usr/lib/X11/xorg.conf.d 
     170endif 
     171 
     172override_dh_fixperms: 
     173        dh_fixperms 
     174 
     175        chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxSDL 
     176        chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxHeadless 
     177        chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetDHCP 
     178        chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetAdpCtl 
     179        chmod +s debian/$(sxname)$(INSTALL_PATH)/VirtualBox 
     180 
     181        chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/*.py 
     182        chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/server/*.py 
     183        chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/client/*.py 
     184 
     185        chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config.pl 
     186        chmod 755 debian/$(sname)/usr/share/virtualbox/VBox.sh 
     187 
     188# check if arch-all packages are being built 
     189ifneq (,$(filter $(psource), $(shell dh_listpackages))) 
     190        # These files have incorrect permissions, fixing it. 
     191        chmod 755 debian/$(psource)/usr/src/modules/$(sname)/debian/rules 
     192        chmod 755 debian/$(gsource)/usr/src/modules/$(gname)/debian/rules 
     193 
     194        # this needs all prior work to be finished 
     195        cd debian/$(psource)/usr/src && \ 
     196            tar -cjf $(sname).tar.bz2 modules && \ 
     197            rm -rf modules 
     198        cd debian/$(gsource)/usr/src && \ 
     199            tar -cjf $(gname).tar.bz2 modules && \ 
     200            rm -rf modules 
     201endif 
     202 
     203override_dh_installudev: 
     204ifeq ($(INSTALL_X11_UDEV),1) 
     205        dh_installudev -p$(uxname) --priority=69 
     206        dh_installudev --remaining-packages 
     207else 
     208        dh_installudev -N$(uxname) 
     209endif 
     210 
     211override_dh_installinit: 
     212        dh_installinit --no-start 
     213 
     214override_dh_dkms: 
     215        dh_dkms -V $(upstreamversion) 
     216 
     217override_dh_strip: 
     218        dh_strip --dbg-package=$(sname)-dbg 
     219 
     220override_dh_shlibdeps: 
     221        dh_shlibdeps -p$(sname) -X debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -- \ 
     222            -dRecommends debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -dDepends 
     223        dh_shlibdeps --remaining-packages 
     224 
     225override_dh_auto_clean: 
     226        dh_auto_clean 
     227 
    80228        # Cleaning package 
    81229        rm -rf out 
    … …  
    84232        rm -f debian/$(pdkms).install 
    85233        rm -f debian/$(gdkms).install 
    86         rm -f debian/$(pdkms).dirs 
    87         rm -f debian/$(gdkms).dirs 
    88234        rm -f debian/$(pdkms).links 
    89235        rm -f debian/$(gdkms).links 
    90         rm -f debian/vdfuse/vdfuse 
    91236 
    92237        find . -name "*.pyc" -exec rm -f {} \; 
    93         dh_clean 
    94238 
    95239#Rebuild the orig.tar.gz 
    … …  
    111255        rm -rf ./src/VBox/Additions/linux/selinux-fedora 
    112256        find src/VBox/Additions/x11/x11include -mindepth 1 -maxdepth 1 \ 
    113                 -type d -not -name '*mesa-*' | xargs rm -rf 
     257            -type d ! -name '*mesa-*' ! -name '1.4' -exec rm -rf {} \; 
     258        # x11include/1.4/xorg/Pci.h is required for lenny backports 
     259        find src/VBox/Additions/x11/x11include/1.4 -mindepth 1 \ 
     260            -type f ! -wholename '*/xorg/Pci.h' -exec rm -rf {} \; 
     261        find src/VBox/Additions/x11/x11include/1.4 -mindepth 1 \ 
     262            -depth -type d -empty -exec rmdir {} \; 
    114263        cd ..; mv $(CURDIR) virtualbox-ose-$(upstreamversion)-dfsg; \ 
    115264            tar --exclude .svn --exclude '.git*' --exclude debian \ 
    116265                -czf virtualbox-ose_$(upstreamversion)-dfsg.orig.tar.gz \ 
    117266                virtualbox-ose-$(upstreamversion)-dfsg 
    118  
    119 # install: DH_OPTIONS= 
    120 install: build debian/virtualbox-ose.README.Debian debian/README.Debian.html 
    121         dh_testdir 
    122         dh_testroot 
    123         dh_clean -k 
    124  
    125         sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).dirs.in > debian/$(gdkms).dirs 
    126         sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(pdkms).dirs.in > debian/$(pdkms).dirs 
    127         sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).links.in > debian/$(gdkms).links 
    128         sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(pdkms).links.in > debian/$(pdkms).links 
    129  
    130         dh_installdirs 
    131  
    132         # Create DKMS control files 
    133         sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(pdkms).files/dkms.conf.in > debian/$(pdkms)/usr/src/virtualbox-ose-$(upstreamversion)/dkms.conf 
    134         sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).files/dkms.conf.in > debian/$(gdkms)/usr/src/virtualbox-ose-guest-$(upstreamversion)/dkms.conf 
    135  
    136         # Build install files for the dkms'ified sources 
    137         sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(pdkms).install.in > debian/$(pdkms).install 
    138         sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).install.in > debian/$(gdkms).install 
    139  
    140         export VBOX_INSTALL_PATH=$(INSTALL_PATH) && \ 
    141             cd out/bin/sdk/installer && \ 
    142             python ./vboxapisetup.py install --root $(CURDIR)/debian/$(sname) 
    143         # Install helper scripts for vbox* interfaces 
    144         dh_installifupdown -p$(sname) 
    145  
    146 serverabi: install 
    147 ifeq ($(SERVERMINVERS),) 
    148         @echo error: xserver-xorg-dev needs to be installed 
    149         @exit 1 
    150 else 
    151         echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(uxname).substvars 
    152         echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(uxname).substvars 
    153         echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(uxname).substvars 
    154 endif 
    155  
    156 binary-arch: build install serverabi 
    157         dh_testdir -s 
    158         dh_testroot -s 
    159         dh_installchangelogs -s 
    160         dh_installdocs -s 
    161         dh_installmenu -s 
    162         dh_install -s 
    163         -chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/*.py 
    164         -chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/server/*.py 
    165         -chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/client/*.py 
    166         -chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config.pl 
    167         -install -m 755 src/VBox/Additions/x11/Installer/VBoxRandR.sh debian/$(uxname)/usr/bin/VBoxRandR 
    168         -chrpath -d debian/$(uxname)/usr/bin/VBoxClient 
    169         -chrpath -d debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so 
    170         -chrpath -d debian/$(uxname)/usr/lib/xorg/modules/input/vboxmouse_drv.so 
    171         -chrpath -d debian/$(uname)/sbin/mount.vboxsf 
    172         -chrpath -d debian/$(uname)/usr/sbin/VBoxService 
    173         -chrpath -d debian/$(uname)/usr/sbin/VBoxControl 
    174         -chmod 755 debian/$(sname)/usr/share/virtualbox/VBox.sh 
    175         dh_pycentral -p$(sname) 
    176         dh_strip -s --dbg-package=$(sname)-dbg 
    177         dh_link -s 
    178         dh_compress -s 
    179         dh_fixperms -s 
    180         chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxSDL 
    181         chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxHeadless 
    182         chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetDHCP 
    183         chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetAdpCtl 
    184         chmod +s debian/$(sxname)$(INSTALL_PATH)/VirtualBox 
    185         # Override evdev driver 
    186         dh_installudev -p$(uxname) --priority=69 
    187         dh_installudev -s -N$(uxname) 
    188         dh_installinit -s --no-start 
    189         dh_lintian -s 
    190         dh_installdeb -s 
    191         dh_shlibdeps -p$(sname) -X debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -- \ 
    192             -dRecommends debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -dDepends 
    193         dh_shlibdeps -s -N$(sname) 
    194         dh_gencontrol -s 
    195         dh_md5sums -s 
    196         dh_builddeb -s 
    197  
    198 binary-indep: build install 
    199         dh_testdir -i 
    200         dh_testroot -i 
    201         dh_installchangelogs -i 
    202         dh_installdocs -i 
    203         dh_install -i 
    204         # These files have incorrect permissions, fixing it. 
    205         chmod 755 debian/$(psource)/usr/src/modules/$(sname)/debian/rules 
    206         chmod 755 debian/$(gsource)/usr/src/modules/$(gname)/debian/rules 
    207         dh_link -i 
    208         # Create .tar.bz2 for virtualbox*source 
    209         cd debian/$(psource)/usr/src && \ 
    210                 tar -cjf $(sname).tar.bz2 modules && \ 
    211                 rm -rf modules 
    212         cd debian/$(gsource)/usr/src && \ 
    213                 tar -cjf $(gname).tar.bz2 modules && \ 
    214                 rm -rf modules 
    215         dh_lintian -i 
    216         dh_compress -i 
    217         dh_fixperms -i 
    218         dh_installudev -i 
    219         dh_installdeb -i 
    220         dh_gencontrol -i 
    221         dh_md5sums -i 
    222         dh_builddeb -i 
    223  
    224 binary: binary-arch binary-indep 
    225 .PHONY: patch unpatch serverabi \ 
    226         build clean binary-arch binary-indep binary install \ 
    227         binary-modules kdist kdist_configure kdist_image kdist_clean 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/vdfuse/vdfuse.c

    r6547 r6802  
    2525 *                            Fix _FILE_OFFSET_BITS 
    2626 *                            Option for older VBox 
     27 *         07      22 Feb 10  VBOX_SUCCESS macro was removed, replace with RT_SUCCESS 
    2728 * 
    2829 * 
    … …  
    556557   pthread_mutex_unlock (&disk_mutex); 
    557558 
    558    return VBOX_SUCCESS(ret) ? (signed) len : -EIO; 
     559   return RT_SUCCESS(ret) ? (signed) len : -EIO; 
    559560} 
    560561 
    … …  
    585586   pthread_mutex_unlock (&disk_mutex); 
    586587 
    587    return VBOX_SUCCESS(ret) ? (signed) len : -EIO; 
    588 } 
     588   return RT_SUCCESS(ret) ? (signed) len : -EIO; 
     589} 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-dkms.install.in

    r6547 r6802  
    11out/bin/src/vboxdrv/*.* /usr/src/virtualbox-ose-CVERSION/vboxdrv 
    2 out/bin/src/vboxdrv/build_in_tmp /usr/src/virtualbox-ose-CVERSION/vboxdrv 
    32out/bin/src/vboxdrv/linux /usr/src/virtualbox-ose-CVERSION/vboxdrv 
    43out/bin/src/vboxdrv/Makefile /usr/src/virtualbox-ose-CVERSION/vboxdrv 
    54 
    65out/bin/src/vboxnetflt/*.* /usr/src/virtualbox-ose-CVERSION/vboxnetflt 
    7 out/bin/src/vboxnetflt/build_in_tmp /usr/src/virtualbox-ose-CVERSION/vboxnetflt 
    86out/bin/src/vboxnetflt/linux /usr/src/virtualbox-ose-CVERSION/vboxnetflt 
    97out/bin/src/vboxnetflt/Makefile /usr/src/virtualbox-ose-CVERSION/vboxnetflt 
    108 
    119out/bin/src/vboxnetadp/*.* /usr/src/virtualbox-ose-CVERSION/vboxnetadp 
    12 out/bin/src/vboxnetadp/build_in_tmp /usr/src/virtualbox-ose-CVERSION/vboxnetadp 
    1310out/bin/src/vboxnetadp/linux /usr/src/virtualbox-ose-CVERSION/vboxnetadp 
    1411out/bin/src/vboxnetadp/Makefile /usr/src/virtualbox-ose-CVERSION/vboxnetadp 
    1512 
    16 out/bin/src/vboxdrv/SUPDrvIDC.h /usr/src/virtualbox-ose-CVERSION/include/ 
    17 out/bin/src/vboxdrv/version-generated.h /usr/src/virtualbox-ose-CVERSION/include/ 
     13out/bin/src/vboxdrv/*-generated.h /usr/src/virtualbox-ose-CVERSION/include 
    1814out/bin/src/vboxdrv/include/iprt/* /usr/src/virtualbox-ose-CVERSION/include/iprt 
    1915out/bin/src/vboxdrv/include/VBox/* /usr/src/virtualbox-ose-CVERSION/include/VBox 
    … …  
    2218out/bin/src/vboxnetflt/include/iprt/* /usr/src/virtualbox-ose-CVERSION/include/iprt 
    2319out/bin/src/vboxnetflt/include/VBox/* /usr/src/virtualbox-ose-CVERSION/include/VBox 
    24 out/bin/src/vboxnetflt/include/internal/* /usr/src/virtualbox-ose-CVERSION/include/internal 
     20 
     21out/bin/src/vboxnetadp/include/iprt/* /usr/src/virtualbox-ose-CVERSION/include/iprt 
     22out/bin/src/vboxnetadp/include/VBox/* /usr/src/virtualbox-ose-CVERSION/include/VBox 
     23out/bin/src/vboxnetadp/include/internal/* /usr/src/virtualbox-ose-CVERSION/include/internal 
    2524 
    2625out/bin/src/vboxdrv/r0drv /usr/src/virtualbox-ose-CVERSION 
    27 out/bin/src/vboxdrv/alloc /usr/src/virtualbox-ose-CVERSION 
    2826out/bin/src/vboxdrv/common /usr/src/virtualbox-ose-CVERSION 
    2927out/bin/src/vboxdrv/generic /usr/src/virtualbox-ose-CVERSION 
    3028out/bin/src/vboxdrv/math /usr/src/virtualbox-ose-CVERSION 
    3129out/bin/src/vboxdrv/VBox /usr/src/virtualbox-ose-CVERSION 
    32  
    33 out/bin/src/vboxnetflt/SUPR0IdcClientInternal.h /usr/src/virtualbox-ose-CVERSION/ 
     30out/bin/src/vboxdrv/include/iprt/nocrt /usr/src/virtualbox-ose-CVERSION/include/iprt 
    3431 
    3532debian/virtualbox-ose-dkms.files/Makefile /usr/src/virtualbox-ose-CVERSION 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-dkms.postinst

    r6547 r6802  
    11#!/bin/sh 
    2 # Copyright (C) 2008 Mario Limonciello 
    32 
    43set -e 
    … …  
    65#DEBHELPER# 
    76 
    8 NAME=virtualbox-ose 
    9 PACKAGE_NAME=$NAME-dkms 
    10 CVERSION=`dpkg-query -W -f='${Version}' $PACKAGE_NAME | awk -F "-" '{print $1}' | cut -d\: -f2` 
    11 ARCH=`dpkg --print-architecture` 
    12  
    137case "$1" in 
    148        configure) 
    15                 #These are no longer used 
    16                 dkms remove -m vboxdrv -v $CVERSION --all -q || true 
    17                 dkms remove -m vboxnetflt -v $CVERSION --all -q || true 
    18                 dkms remove -m vboxnetadp -v $CVERSION --all -q || true 
    19  
    20                 /usr/lib/dkms/common.postinst $NAME $CVERSION /usr/share/$PACKAGE_NAME $ARCH $2 
    21  
    229                # only restart if VirtualBox isn't running 
    2310                if test -x /etc/init.d/virtualbox-ose && ! pidof VBoxSVC > /dev/null; then 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-fuse.install

    r6547 r6802  
    1 debian/vdfuse/vdfuse usr/bin 
     1out/vdfuse/vdfuse usr/bin 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-dkms.files/Makefile

    r6547 r6802  
    11.NOTPARALLEL: 
    22 
    3 obj-m = vboxguest/ vboxvfs/ vboxvideo/ 
     3obj-m = vboxguest/ vboxsf/ vboxvideo/ 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-dkms.install.in

    r6547 r6802  
    66out/bin/additions/src/vboxguest/Makefile /usr/src/virtualbox-ose-guest-CVERSION/vboxguest 
    77 
    8 out/bin/additions/src/vboxvfs/*.* /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs 
    9 out/bin/additions/src/vboxvfs/build_in_tmp /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs 
    10 out/bin/additions/src/vboxvfs/Makefile /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs 
     8out/bin/additions/src/vboxsf/*.* /usr/src/virtualbox-ose-guest-CVERSION/vboxsf 
     9out/bin/additions/src/vboxsf/build_in_tmp /usr/src/virtualbox-ose-guest-CVERSION/vboxsf 
     10out/bin/additions/src/vboxsf/Makefile /usr/src/virtualbox-ose-guest-CVERSION/vboxsf 
    1111 
    1212out/bin/additions/src/vboxvideo/*.* /usr/src/virtualbox-ose-guest-CVERSION/vboxvideo 
    … …  
    1818out/bin/additions/src/vboxguest/include/internal/* /usr/src/virtualbox-ose-guest-CVERSION/include/internal 
    1919 
    20 out/bin/additions/src/vboxvfs/include/iprt/* /usr/src/virtualbox-ose-guest-CVERSION/include/iprt 
    21 out/bin/additions/src/vboxvfs/include/VBox/* /usr/src/virtualbox-ose-guest-CVERSION/include/VBox 
     20out/bin/additions/src/vboxsf/include/iprt/* /usr/src/virtualbox-ose-guest-CVERSION/include/iprt 
     21out/bin/additions/src/vboxsf/include/VBox/* /usr/src/virtualbox-ose-guest-CVERSION/include/VBox 
    2222 
    2323out/bin/additions/src/vboxguest/r0drv /usr/src/virtualbox-ose-guest-CVERSION/ 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-dkms.links.in

    r6547 r6802  
    11/usr/src/virtualbox-ose-guest-CVERSION/r0drv /usr/src/virtualbox-ose-guest-CVERSION/vboxguest/r0drv 
    2 /usr/src/virtualbox-ose-guest-CVERSION/r0drv /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs/r0drv 
     2/usr/src/virtualbox-ose-guest-CVERSION/r0drv /usr/src/virtualbox-ose-guest-CVERSION/vboxsf/r0drv 
    33/usr/src/virtualbox-ose-guest-CVERSION/include /usr/src/virtualbox-ose-guest-CVERSION/vboxguest/include 
    4 /usr/src/virtualbox-ose-guest-CVERSION/include /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs/include 
     4/usr/src/virtualbox-ose-guest-CVERSION/include /usr/src/virtualbox-ose-guest-CVERSION/vboxsf/include 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-source.files/Makefile

    r6547 r6802  
    11.NOTPARALLEL: 
    22 
    3 obj-m = vboxguest/ vboxvfs/ vboxvideo/ 
     3obj-m = vboxguest/ vboxsf/ vboxvideo/ 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-source.files/rules

    r6547 r6802  
    4242clean: 
    4343        $(MAKE) -C vboxguest clean 
    44         $(MAKE) -C vboxvfs clean 
     44        $(MAKE) -C vboxsf clean 
    4545        $(MAKE) -C vboxvideo clean 
    4646        dh_clean 
    … …  
    5353        # Install the modules 
    5454        dh_install vboxguest/vboxguest.ko /lib/modules/$(KVERS)/misc/ 
    55         dh_install vboxvfs/vboxvfs.ko /lib/modules/$(KVERS)/misc/ 
     55        dh_install vboxsf/vboxsf.ko /lib/modules/$(KVERS)/misc/ 
    5656        dh_install vboxvideo/vboxvideo.ko /lib/modules/$(KVERS)/misc/ 
    5757        dh_installudev 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-source.install

    r6547 r6802  
    66out/bin/additions/src/vboxguest/Makefile /usr/src/modules/virtualbox-ose-guest/vboxguest 
    77 
    8 out/bin/additions/src/vboxvfs/*.* /usr/src/modules/virtualbox-ose-guest/vboxvfs 
    9 out/bin/additions/src/vboxvfs/build_in_tmp /usr/src/modules/virtualbox-ose-guest/vboxvfs 
    10 out/bin/additions/src/vboxvfs/Makefile /usr/src/modules/virtualbox-ose-guest/vboxvfs 
     8out/bin/additions/src/vboxsf/*.* /usr/src/modules/virtualbox-ose-guest/vboxsf 
     9out/bin/additions/src/vboxsf/build_in_tmp /usr/src/modules/virtualbox-ose-guest/vboxsf 
     10out/bin/additions/src/vboxsf/Makefile /usr/src/modules/virtualbox-ose-guest/vboxsf 
    1111 
    1212out/bin/additions/src/vboxvideo/*.* /usr/src/modules/virtualbox-ose-guest/vboxvideo 
    … …  
    1818out/bin/additions/src/vboxguest/include/internal/* /usr/src/modules/virtualbox-ose-guest/include/internal 
    1919 
    20 out/bin/additions/src/vboxvfs/include/iprt/* /usr/src/modules/virtualbox-ose-guest/include/iprt 
    21 out/bin/additions/src/vboxvfs/include/VBox/* /usr/src/modules/virtualbox-ose-guest/include/VBox 
     20out/bin/additions/src/vboxsf/include/iprt/* /usr/src/modules/virtualbox-ose-guest/include/iprt 
     21out/bin/additions/src/vboxsf/include/VBox/* /usr/src/modules/virtualbox-ose-guest/include/VBox 
    2222 
    2323out/bin/additions/src/vboxguest/r0drv /usr/src/modules/virtualbox-ose-guest/ 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-source.links

    r6547 r6802  
    11/usr/src/modules/virtualbox-ose-guest/r0drv /usr/src/modules/virtualbox-ose-guest/vboxguest/r0drv 
    2 /usr/src/modules/virtualbox-ose-guest/r0drv /usr/src/modules/virtualbox-ose-guest/vboxvfs/r0drv 
     2/usr/src/modules/virtualbox-ose-guest/r0drv /usr/src/modules/virtualbox-ose-guest/vboxsf/r0drv 
    33/usr/src/modules/virtualbox-ose-guest/include /usr/src/modules/virtualbox-ose-guest/vboxguest/include 
    4 /usr/src/modules/virtualbox-ose-guest/include /usr/src/modules/virtualbox-ose-guest/vboxvfs/include 
     4/usr/src/modules/virtualbox-ose-guest/include /usr/src/modules/virtualbox-ose-guest/vboxsf/include 
    55 
    66/usr/share/modass/packages/default.sh   /usr/share/modass/overrides/virtualbox-ose-guest-source 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-utils.init

    r6547 r6802  
    2727} 
    2828 
    29 running() 
    30 { 
    31     lsmod | grep -q "$1[^_-]" 
    32 } 
    33  
    3429case "$1" in 
    3530  start) 
    3631        in_virtual_machine || exit 0 
    3732        log_begin_msg "Starting VirtualBox Additions" 
    38  
    39         # should already be loaded automatically 
    40         if ! running vboxguest; then 
    41                 if ! modprobe vboxguest > /dev/null 2>&1; then 
    42                         # vboxguest not installed, or has a problem 
    43                         log_failure_msg "Guest additions not available, kernel module not loadable (vboxguest)" 
    44                         log_end_msg 1 
    45                         exit 1 
    46                 fi 
    47         fi 
    48  
    49         if ! running vboxvfs; then 
    50                 if ! modprobe vboxvfs > /dev/null 2>&1; then 
    51                         # vboxvfs not installed, or has a problem 
    52                         log_failure_msg "Shared folders not available, kernel module not loadable (vboxvfs)" 
    53                         log_end_msg 1 
    54                         exit 1 
    55                 fi 
    56         fi 
    57  
    58         # Mount all shared folders from /etc/fstab. Normally this is done by some 
    59         # other startup script but this requires the vboxvfs kernel module loaded. 
    60         mount -a -t vboxsf 
    6133 
    6234        start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/VBoxService 
    … …  
    7951        fi 
    8052 
    81         umount -a -t vboxsf 
    82  
    83         if running vboxvfs; then 
    84                 if ! rmmod vboxvfs 2>/dev/null; then 
    85                         log_failure_msg "Cannot unload shared folders kernel module (vboxvfs)" 
    86                         log_end_msg 1 
    87                         exit 1 
    88                 fi 
    89         fi 
    90  
    91         if running vboxguest; then 
    92                 if ! rmmod vboxguest 2>/dev/null; then 
    93                         log_failure_msg "Cannot unload guest additions kernel module (vboxguest)" 
    94                         log_end_msg 1 
    95                         exit 1 
    96                 fi 
    97         fi 
    98  
    9953        log_end_msg 0 
    10054        ;; 
    … …  
    10559 
    10660  status) 
    107         status=0 
    108  
    109         if ! running vboxguest; then 
    110                 echo "Guest additions kernel module (vboxguest) not loaded" 
    111                 status=3 
     61        if ! pgrep -x VBoxService > /dev/null; then 
     62                echo "VBoxService daemon isn't running" 
     63                exit 3 
    11264        fi 
    11365 
    114         if ! running vboxvfs; then 
    115                 echo "Shared folders kernel module (vboxvfs) not loaded" 
    116                 status=3 
    117         fi 
    118  
    119         if ! pgrep -x VBoxService > /dev/null; then 
    120                 echo "VBoxService daemon isn't running" 
    121                 status=3 
    122         fi 
    123  
    124         exit $status 
     66        exit 0 
    12567        ;; 
    12668 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-utils.install

    r6547 r6802  
    22out/bin/additions/VBoxControl   /usr/sbin 
    33out/bin/additions/mount.vboxsf  /sbin 
     4out/bin/additions/pam_vbox.so   /lib/security 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-x11.install

    r6547 r6802  
    55out/bin/additions/vboxvideo_drv.so /usr/lib/xorg/modules/drivers 
    66out/bin/additions/VBoxOGL*.so /usr/lib 
    7 debian/10-vboxmouse.conf /usr/lib/X11/xorg.conf.d 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-guest-x11.lintian-overrides

    r6547 r6802  
    1 virtualbox-ose-guest-x11: shlib-with-non-pic-code usr/lib/VBoxOGL.so 
    21virtualbox-ose-guest-x11: shlib-without-versioned-soname 
    32virtualbox-ose-guest-x11: shlib-without-versioned-soname 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose-source.install

    r6547 r6802  
    11out/bin/src/vboxdrv/*.* /usr/src/modules/virtualbox-ose/vboxdrv 
    2 out/bin/src/vboxdrv/build_in_tmp /usr/src/modules/virtualbox-ose/vboxdrv 
    32out/bin/src/vboxdrv/linux /usr/src/modules/virtualbox-ose/vboxdrv 
    43out/bin/src/vboxdrv/Makefile /usr/src/modules/virtualbox-ose/vboxdrv 
    54 
    65out/bin/src/vboxnetflt/*.* /usr/src/modules/virtualbox-ose/vboxnetflt 
    7 out/bin/src/vboxnetflt/build_in_tmp /usr/src/modules/virtualbox-ose/vboxnetflt 
    86out/bin/src/vboxnetflt/linux /usr/src/modules/virtualbox-ose/vboxnetflt 
    97out/bin/src/vboxnetflt/Makefile /usr/src/modules/virtualbox-ose/vboxnetflt 
    108 
    119out/bin/src/vboxnetadp/*.* /usr/src/modules/virtualbox-ose/vboxnetadp 
    12 out/bin/src/vboxnetadp/build_in_tmp /usr/src/modules/virtualbox-ose/vboxnetadp 
    1310out/bin/src/vboxnetadp/linux /usr/src/modules/virtualbox-ose/vboxnetadp 
    1411out/bin/src/vboxnetadp/Makefile /usr/src/modules/virtualbox-ose/vboxnetadp 
    1512 
    16 out/bin/src/vboxdrv/SUPDrvIDC.h /usr/src/modules/virtualbox-ose/include/ 
    17 out/bin/src/vboxdrv/version-generated.h /usr/src/modules/virtualbox-ose/include/ 
     13out/bin/src/vboxdrv/*-generated.h /usr/src/modules/virtualbox-ose/include 
    1814out/bin/src/vboxdrv/include/iprt/* /usr/src/modules/virtualbox-ose/include/iprt 
    1915out/bin/src/vboxdrv/include/VBox/* /usr/src/modules/virtualbox-ose/include/VBox 
    … …  
    2218out/bin/src/vboxnetflt/include/iprt/* /usr/src/modules/virtualbox-ose/include/iprt 
    2319out/bin/src/vboxnetflt/include/VBox/* /usr/src/modules/virtualbox-ose/include/VBox 
    24 out/bin/src/vboxnetflt/include/internal/* /usr/src/modules/virtualbox-ose/include/internal 
     20 
     21out/bin/src/vboxnetadp/include/iprt/* /usr/src/modules/virtualbox-ose/include/iprt 
     22out/bin/src/vboxnetadp/include/VBox/* /usr/src/modules/virtualbox-ose/include/VBox 
     23out/bin/src/vboxnetadp/include/internal/* /usr/src/modules/virtualbox-ose/include/internal 
    2524 
    2625out/bin/src/vboxdrv/r0drv /usr/src/modules/virtualbox-ose 
    27 out/bin/src/vboxdrv/alloc /usr/src/modules/virtualbox-ose 
    2826out/bin/src/vboxdrv/common /usr/src/modules/virtualbox-ose 
    2927out/bin/src/vboxdrv/generic /usr/src/modules/virtualbox-ose 
    3028out/bin/src/vboxdrv/math /usr/src/modules/virtualbox-ose 
    3129out/bin/src/vboxdrv/VBox /usr/src/modules/virtualbox-ose 
    32  
    33 out/bin/src/vboxnetflt/SUPR0IdcClientInternal.h /usr/src/modules/virtualbox-ose/ 
     30out/bin/src/vboxdrv/include/iprt/nocrt /usr/src/modules/virtualbox-ose/include/iprt 
    3431 
    3532debian/control debian/changelog debian/copyright debian/compat /usr/src/modules/virtualbox-ose/debian 

  • pkg/vinnie/main/virtualbox-ose/trunk/debian/virtualbox-ose.lintian-overrides

    r6547 r6802  
    1 virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxBFE.so 
    21virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDD.so 
    32virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDD2.so 
    43virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDDU.so 
     4virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxGuestControlSvc.so 
    55virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxGuestPropSvc.so 
    66virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxHeadless.so 
Note: See TracChangeset for help on using the changeset viewer.