VirtualBox

Changeset 13540 in vbox


Ignore:
Timestamp:
Oct 23, 2008 3:15:41 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
38397
Message:

sync debian/ directory

Location:
trunk/debian
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/debian/LocalConfig.kmk

    r11725 r13540  
    2828VBOX_WITH_HARDENING        := 1
    2929VBOX_WITH_ORIGIN           :=
    30 VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox-ose
     30VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
    3131VBOX_PATH_SHARED_LIBS      := $(VBOX_PATH_APP_PRIVATE_ARCH)
    3232VBOX_WITH_RUNPATH          := $(VBOX_PATH_APP_PRIVATE_ARCH)
    33 VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox-ose
     33VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox
    3434VBOX_PATH_APP_DOCS          = $(VBOX_PATH_PACKAGE_DOCS)

  • trunk/debian/VBox.sh

    r11755 r13540  
    7575
    7676APP=`which $0`
     77APP=`basename $APP`
    7778APP=${APP##/*/}
    7879case "$APP" in
    7980  VirtualBox)
    80     exec "/usr/lib/virtualbox-ose/VirtualBox" "$@"
     81    exec "/usr/lib/virtualbox/VirtualBox" "$@"
    8182    ;;
    8283  VBoxManage)
    83     exec "/usr/lib/virtualbox-ose/VBoxManage" "$@"
     84    exec "/usr/lib/virtualbox/VBoxManage" "$@"
    8485    ;;
    8586  VBoxSDL)
    86     exec "/usr/lib/virtualbox-ose/VBoxSDL" "$@"
     87    exec "/usr/lib/virtualbox/VBoxSDL" "$@"
    8788    ;;
    8889  VBoxVRDP)
    89     exec "/usr/lib/virtualbox-ose/VBoxVRDP" "$@"
     90    exec "/usr/lib/virtualbox/VBoxHeadless" "$@"
    9091    ;;
    9192  VBoxHeadless)
    92     exec "/usr/lib/virtualbox-ose/VBoxHeadless" "$@"
     93    exec "/usr/lib/virtualbox/VBoxHeadless" "$@"
    9394    ;;
    9495  *)

  • trunk/debian/changelog

    r12442 r13540  
    33  * rebuild Debian package
    44
    5  -- Sun Microsystems, Inc. <[email protected]>  Fri, 12 Sep 2008 20:01:00 +0200
     5 -- Sun Microsystems, Inc. <[email protected]>  Fri, 24 Sep 2008 11:00:00 +0200
     6
     7virtualbox-ose (2.0.4) unstable; urgency=low
     8
     9  * rebuild Debian package
     10
     11 -- Sun Microsystems, Inc. <[email protected]>  Fri, 24 Oct 2008 10:00:00 +0200
    612
    713virtualbox-ose (2.0.2) unstable; urgency=low

  • trunk/debian/dirs

    r9190 r13540  
    33/etc/init.d
    44/usr/src
    5 /usr/lib/virtualbox-ose
     5/usr/lib/virtualbox

  • trunk/debian/lintian-override

    r5452 r13540  
    1010virtualbox-ose: shlib-with-non-pic-code usr/lib/VBoxSharedFolders.so
    1111virtualbox-ose: shlib-with-non-pic-code usr/lib/VBoxSharedClipboard.so
    12 virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox-ose/components/VBoxSVCM.so
    13 virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox-ose/components/VBoxC.so
    14 virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox-ose/VBoxDDGC.gc
    15 virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox-ose/VBoxDD2GC.gc
    16 virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox-ose/VBoxDDR0.r0
    17 virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox-ose/VBoxDD2R0.r0
    18 virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox-ose/VMMGC.gc
    19 virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox-ose/VMMR0.r0
     12virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so
     13virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so
     14virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDGC.gc
     15virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2GC.gc
     16virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDR0.r0
     17virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2R0.r0
     18virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox/VMMGC.gc
     19virtualbox-ose: unstripped-binary-or-object usr/lib/virtualbox/VMMR0.r0
    2020virtualbox-ose: no-shlibs-control-file usr/lib/VBoxRT.so
    2121virtualbox-ose: no-shlibs-control-file usr/lib/VBoxDD.so

  • trunk/debian/postinst

    r11725 r13540  
    4848
    4949# create users groups
    50 db_input high virtualbox-ose/group-vboxusers || true
     50db_input high virtualbox/group-vboxusers || true
    5151db_go || true
    5252addgroup --system vboxusers
    5353
    5454if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
    55   db_get virtualbox-ose/module-compilation-allowed
     55  db_get virtualbox/module-compilation-allowed
    5656  if [ "$RET" = "false" ]; then
    5757    cat << EOF
    … …  
    6060EOF
    6161  else
    62     db_input critical virtualbox-ose/module-compilation-allowed || true
     62    db_input critical virtualbox/module-compilation-allowed || true
    6363    db_go || true
    64     db_get virtualbox-ose/module-compilation-allowed
     64    db_get virtualbox/module-compilation-allowed
    6565    if [ "$RET" = "true" ]; then
    6666      # Compile module. Don't show a message box here if everything works well.
    … …  
    6868Messages emitted during module compilation will be logged to $LOG.
    6969EOF
    70       if ! /usr/share/virtualbox-ose/src/build_in_tmp install > /var/log/vbox-install.log 2>&1; then
    71         db_fset virtualbox-ose/module-compilation-failed seen false
    72         db_input critical virtualbox-ose/module-compilation-failed || true
     70      if ! /usr/share/virtualbox/src/build_in_tmp install > /var/log/vbox-install.log 2>&1; then
     71        db_fset virtualbox/module-compilation-failed seen false
     72        db_input critical virtualbox/module-compilation-failed || true
    7373        db_go || true
    7474        touch /etc/vbox/module_not_compiled
    … …  
    9292# The starters need to be Suid root. They drop the privileges before starting
    9393# the real frontend.
    94 if ! dpkg-statoverride --list /usr/lib/virtualbox-ose/VirtualBox > /dev/nnull 2>&1; then
    95   chmod 4711 /usr/lib/virtualbox-ose/VirtualBox
     94if ! dpkg-statoverride --list /usr/lib/virtualbox/VirtualBox > /dev/nnull 2>&1; then
     95  chmod 4711 /usr/lib/virtualbox/VirtualBox
    9696fi
    97 if ! dpkg-statoverride --list /usr/lib/virtualbox-ose/VBoxHeadless > /dev/nnull 2>&1; then
    98   chmod 4711 /usr/lib/virtualbox-ose/VBoxHeadless
     97if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxHeadless > /dev/nnull 2>&1; then
     98  chmod 4711 /usr/lib/virtualbox/VBoxHeadless
    9999fi
    100 if ! dpkg-statoverride --list /usr/lib/virtualbox-ose/VBoxSDL > /dev/nnull 2>&1; then
    101   chmod 4711 /usr/lib/virtualbox-ose/VBoxSDL
     100if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxSDL > /dev/nnull 2>&1; then
     101  chmod 4711 /usr/lib/virtualbox/VBoxSDL
    102102fi
    103103

  • trunk/debian/preinst.in

    r9190 r13540  
    1616db_capb backup
    1717
    18 # check for upgrade, disable this check for now
    19 if false; then
    20   ver_new=%VER%
    21   ver_old=`echo $2 | cut -f1 -d"-"`
    22   if [ -n "$ver_old" -a "$ver_new" == "$ver_old" ]; then
    23     db_get virtualbox-ose/update_version_change
    24     db_input critical virtualbox-ose/update_version_change || true
    25     db_go || true
    26     db_get virtualbox-ose/update_version_change || true
    27     if [ "$RET" = false ]; then
    28       db_stop
    29       exit 1
    30     fi
    31   fi
    32 fi
    33 
    3418# check for old installation
    3519if [ -r /etc/vbox/vbox.cfg ]; then
    … …  
    4731if find /lib/modules -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
    4832  # old modules found
    49   db_get virtualbox-ose/delete-old-modules
     33  db_get virtualbox/delete-old-modules || true
    5034  if [ "$RET" = "false" ]; then
    5135    cat << EOF
    … …  
    5741EOF
    5842  else
    59     db_input critical virtualbox-ose/delete-old-modules || true
     43    db_input critical virtualbox/delete-old-modules || true
    6044    db_go || true
    61     db_get virtualbox-ose/delete-old-modules
     45    db_get virtualbox/delete-old-modules || true
    6246    if [ "$RET" = "true" ]; then
    6347      find /lib/modules -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null

  • trunk/debian/rules

    r11755 r13540  
    2929#  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
    3030
    31 package  := virtualbox-ose
     31package  := virtualbox
     32verpkg   := virtualbox-ose
    3233current  := $(shell pwd)
    3334vboxroot := $(shell pwd)
    3435builddir := $(current)/debian/builddir
    3536moddir   := $(current)/debian/modules
    36 prefix   := $(current)/debian/$(package)
     37prefix   := $(current)/debian/$(verpkg)
    3738arch     := $(shell dpkg --print-architecture)
    3839verfile  := $(builddir)/version-generated.mk
    … …  
    6667gccvmaj  := $(word 1,$(gccver))
    6768gccvmin  := $(word 2,$(gccver))
    68 debdocs  := VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/virtualbox\""
     69debcfgs  := VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\""
    6970
    7071# Ubuntu dapper: gcc-4.0 does not work with recompiler, use gcc-3.4 instead
    … …  
    9394            PATH_OUT=$(current)/debian/builddir \
    9495            VBOX_DO_STRIP= VBOX_DO_STRIP_MODULES= \
    95             $(debdocs) \
     96            $(debcfgs) \
    9697            all
    9798        $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual.pdf $(builddir)/bin,)
    … …  
    108109            VBOX_DO_STRIP= VBOX_DO_STRIP_MODULES= \
    109110            VBOX_NO_LINUX_RUN_INSTALLER=1 \
    110             $(debdocs) \
     111            $(debcfgs) \
    111112            packing
    112113        touch debian/build-stamp
    … …  
    153154        install -d -g 0 -o 0 $(prefix)/usr/lib/$(package)
    154155        install -d -g 0 -o 0 $(prefix)/usr/share/$(package)
    155         install -d -g 0 -o 0 $(prefix)/usr/share/doc/$(package)
     156        install -d -g 0 -o 0 $(prefix)/usr/share/doc/$(verpkg)
    156157        $(if $(HEADLESS),,mv $(archdir)/VirtualBox.desktop \
    157158           $(prefix)/usr/share/applications/VirtualBox.desktop)
    … …  
    207208        dh_installmenu
    208209        $(if $(NOMODS),,dh_installmodules)
    209         sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g; s|%PACKAGE%|virtualbox-ose|g;' \
     210        sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g; s|%PACKAGE%|virtualbox|g;' \
    210211            src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init
    211212        sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge,$(debrel)),yes,)|g;' \
    … …  
    219220        dh_installchangelogs
    220221        dh_link
    221         dh_strip --keep-debug --exclude=libVBoxQtCore.so.4 --exclude=libVBoxQtGui.so.4
     222        dh_strip --keep-debug --exclude=libVBoxQtCore.so.4 --exclude=libVBoxQtGui.so.4 --exclude=libqtaccessiblewidgets.so
    222223        # manually strip our R0/GC modules, dh_strip cannot handle them
    223224        for f in \
    … …  
    229230            objcopy --add-gnu-debuglink=$(prefix)/usr/lib/debug/usr/lib/$(package)/`basename $$f` $$f; \
    230231        done
    231         mkdir -p $(current)/debian/$(package)-dbg/usr/lib
    232         mv $(current)/debian/$(package)/usr/lib/debug $(current)/debian/$(package)-dbg/usr/lib
     232        mkdir -p $(current)/debian/$(verpkg)-dbg/usr/lib
     233        mv $(current)/debian/$(verpkg)/usr/lib/debug $(current)/debian/$(verpkg)-dbg/usr/lib
    233234        dh_compress -X.pdf -X.chm -X LICENSE
    234235        dh_fixperms

  • trunk/debian/templates

    r9199 r13540  
    1 Template: virtualbox-ose/group-vboxusers
     1Template: virtualbox/group-vboxusers
    22Type: note
    33Description: Creating group 'vboxusers'
    4  Users of VirtualBox must be member of that group in order to have write
    5  permissions to /dev/vboxdrv. Otherwise starting of VMs will not be possible.
     4 Users of VirtualBox must be members of that group. Host network interfaces
     5 will be assigned to that group.
     6Description-de.UTF-8: Erzeuge Gruppe 'vboxusers'
     7 Nutzer von VirtualBox müssen Mitglied dieser Gruppe sein. Hostinterfaces
     8 werden dieser Gruppe zugewiesen.
    69
    7 Template: virtualbox-ose/module-compilation-failed
     10Template: virtualbox/module-compilation-failed
    811Type: note
    912Description: Compilation of the kernel module FAILED!
    1013 VirtualBox will not start until this problem is fixed. Please consult
    1114 /var/log/vbox-install.log to find out why the kernel module does not compile.
    12  Most probably the kernel sources were not found. Install them and execute
     15 Most probably the kernel sources were not found. Install them (the package
     16 name is probably linux-headers-<version> whereby <version> can be determined
     17 by 'uname -r') and execute
    1318   
    1419   /etc/init.d/vboxdrv setup
    1520   
    1621 as root.
     22Description-de.UTF-8: Konnte das Kernmodul nicht compilieren!
     23 Sie können keine virtuelle Maschine starten, solange dieses Problem nicht
     24 behoben ist. Bitte lesen Sie die Datei /var/log/vbox-install.log um die
     25 Ursache herauszufinden. Wahrscheinlich konnten die Quellen für den aktiven
     26 Linux-Kern nicht gefunden werden. Installieren Sie das entsprechende
     27 Paket (möglicherweise linux-headers-<version> wobei Sie <version> mit
     28 'uname -r' herausfinden können) und führen Sie danach
     29   
     30   /etc/init.d/vboxdrv setup
     31   
     32 mit Root-Rechten aus.
    1733
    18 Template: virtualbox-ose/module-compilation-allowed
     34Template: virtualbox/module-compilation-allowed
    1935Type: boolean
    2036Default: true
    … …  
    2238 Unable to find a precompiled module for the current kernel!
    2339 .
    24  Without a suitable kernel module you will never be able to start VMs. It is
     40 Without a suitable kernel module you will not be able to start any VMs. It is
    2541 strongly recommended to compile a kernel module now. The kernel headers and
    2642 the tools to build kernel modules (gcc, make, binutils, ...) are required.
    27  However, in case a suitable kernel module already exists at another place you
    28  might want to override the default position by setting KDIR=<full_path_to_vboxdrv_module>
    29  in /etc/default/virtualbox-ose. The compilation can also be done later by executing
     43 However if you know that a suitable kernel module already exists at another
     44 location, you might want to override the default by setting
     45 KDIR=<full_path_to_vboxdrv_module> in /etc/default/virtualbox. The
     46 compilation can also be done later by executing
    3047   
    3148   /etc/init.d/vboxdrv setup
    3249   
    3350 as root.
    34 
    35 Template: virtualbox-ose/delete-old-modules
    36 Type: boolean
    37 Default: true
    38 Description: Delete old modules?
    39  Old vboxdrv modules found. It is recommended to purge these modules as they might not
    40  work together with this version of VirtualBox. The module re-compilation can be
    41  forced later by executing
     51Description-de.UTF-8: Soll das Kernmodul jetzt compiliert werden?
     52 Es konnte kein Kernmodul für den aktuellen Linux-Kern gefunden werden!
     53 .
     54 Ohne ein passendes Kernmodul können Sie keine VM starten. Daher sollten Sie
     55 jetzt ein Kernmodul compilieren. Dazu werden die Kern-Header und die Programme
     56 zum Bauen eines Kernmoduls (gcc, make, binutils, ...) benötigt. Falls Sie
     57 bereits ein passendes Kernmodul in ein anderes Verzeichnis installiert haben,
     58 können Sie den Verzeichnisnamen durch Hinzufügen von KDIR=<voller_Pfad_zu_vboxdrv>
     59 in der Datei /etc/default/virtualbox angeben. Sie können das Kernmodul auch
     60 später compilieren, indem Sie
    4261   
    4362   /etc/init.d/vboxdrv setup
    4463   
    45  as root
     64 mit Root-Rechten ausführen.
    4665
    47 Template: virtualbox-ose/update_version_change
     66Template: virtualbox/delete-old-modules
    4867Type: boolean
    49 Default: false
    50 Description: Proceed with VirtualBox upgrade?
    51  You are about to update VirtualBox to a new upstream version. Make sure to discard or
    52  merge all snapshots and saved states before you proceed because VM states are version
    53  specific.
     68Default: true
     69Description: Delete old vboxdrv kernel modules?
     70 Old vboxdrv kernel modules found. It is recommended to purge these modules as they
     71 might interfere with this version of VirtualBox. The module re-compilation
     72 can be forced later by executing
     73   
     74   /etc/init.d/vboxdrv setup
     75   
     76 as root.
     77Description-de.UTF-8: Alte Kernmodule löschen?
     78 Es wurden alte vboxdrv-Kernmodule gefunden. Diese sollten gelöscht werden, da sie
     79 eventuell nicht mit dieser Version von VirtualBox zusammen arbeiten. Das Compilieren
     80 des Kernmoduls können Sie später durch
     81   
     82   /etc/init.d/vboxdrv setup
     83   
     84 erzwingen.
    5485
    55 Template: virtualbox-ose/old-installation-found
     86Template: virtualbox/old-installation-found
    5687Type: note
    5788Description: Old installation found
    … …  
    6091 directory of the previous installation. After uninstalling the old package remove the file
    6192 /etc/vbox/vbox.cfg.
     93Description-de.UTF-8: Alte Version gefunden
     94 Es wurde eine alte Version von VirtualBox gefunden. Bitte entfernen Sie die alte Version
     95 bevor Sie fortfahren. In der Datei /etc/vbox/vbox.cfg finden Sie das Verzeichnis der alten
     96 Version. Nachdem Sie diese entfernt haben, können Sie /etc/vbox/vbox.cfg löschen.
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette