Changeset 10349 in vbox

Timestamp:

Jul 8, 2008 8:20:04 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

32978

Message:

sync debian

Location:

trunk/debian

Files:

• VBox.sh (modified) (1 diff)
• changelog (modified) (1 diff)
• control (modified) (1 diff)
• rules (modified) (10 diffs)

trunk/debian/VBox.sh

@@ -97 +97 @@
     exec "/usr/lib/virtualbox-ose/VirtualBox" "$@"
     ;;
+  VirtualBox4)
+    exec "/usr/lib/virtualbox-ose/VirtualBox4" "$@"
+    ;;
   VBoxManage)
     exec "/usr/lib/virtualbox-ose/VBoxManage" "$@"

trunk/debian/changelog

@@ -3 +3 @@
   * rebuild Debian package
 
+ -- Sun Microsystems, Inc. <[email protected]>  Sat, 31 May 2008 09:01:00 +0200
+
 virtualbox-ose (1.6.2) unstable; urgency=low
 
   * rebuild Debian package
+
+ -- Sun Microsystems, Inc. <[email protected]>  Sat, 31 May 2008 09:00:00 +0200
 
 virtualbox-ose (1.6.1~svn-1) unstable; urgency=low

trunk/debian/control

@@ -13 +13 @@
 Pre-Depends: debconf (>= 1.1) | debconf-2.0
 Depends: ${shlibs:Depends}, debconf (>= 0.5) | debconf-2.0, psmisc, adduser
-Recommends: ${alsa}, ${pulse}, ${sdlttf}, linux-headers, gcc, make, binutils,
+Recommends: ${alsa}, ${pulse}, ${sdlttf}, ${dkms}, linux-headers, gcc, make, binutils,
   bridge-utils, uml-utilities, libhal1 (>= 0.5)
 Description: Sun xVM VirtualBox

trunk/debian/rules

@@ -63 +63 @@
 endif
 
-debdocs := VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/virtualbox\""
+gccver   := $(subst ., ,$(shell gcc -dumpversion))
+gccvmaj  := $(word 1,$(gccver))
+gccvmin  := $(word 2,$(gccver))
+debdocs  := VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/virtualbox\""
 
 # Ubuntu dapper: gcc-4.0 does not work with recompiler, use gcc-3.4 instead
@@ -72 +75 @@
             $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) $(if \
             $(filter _Ubuntu_dapper,$(debrel)),--with-gcc=gcc-3.4 --with-g++=g++-3.4,) $(if \
+            $(shell test $(gccvmaj) -eq 4 -a $(gccvmin) -gt 2 -o $(gccvmaj) -gt 4 && echo "yes"),--with-gcc=gcc-4.2 --with-g++=g++-4.2,) $(if \
             $(filter _xandros4.1 _ucs1.3,$(debrel)),--disable-sdl-ttf,) $(if \
             $(HEADLESS),--build-headless,) $(if $(DEBUG),--build-debug,)
@@ -84 +88 @@
             $(VERBOSE),KBUILD_VERBOSE=2,) $(if \
             $(NODOCS),VBOX_WITH_DOCS=,)\
-            $(if $(STAGEDISO),\
-              VBOX_WITH_LINUX_ADDITIONS= VBOX_WITH_WIN32_ADDITIONS=,) \
+            $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
             AUTOCFG=$(current)/debian/AutoConfig.kmk \
             LOCALCFG=$(current)/debian/LocalConfig.kmk \
@@ -99 +102 @@
             $(VERBOSE),--print-directory,--no-print-directory) $(if \
             $(VERBOSE),KBUILD_VERBOSE=2,) $(if \
-            $(STAGEDISO),\
-              VBOX_WITH_LINUX_ADDITIONS= VBOX_WITH_WIN32_ADDITIONS=,) \
+            $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
             AUTOCFG=$(current)/debian/AutoConfig.kmk \
             LOCALCFG=$(current)/debian/LocalConfig.kmk \
             PATH_OUT=$(current)/debian/builddir \
             VBOX_DO_STRIP= VBOX_DO_STRIP_MODULES= \
+            VBOX_NO_LINUX_RUN_INSTALLER=1 \
             $(debdocs) \
             packing
@@ -116 +119 @@
         make -C $(builddir)/bin/src clean
         for d in $(wildcard /lib/modules/*); do \
-            make -C $(builddir)/bin/src KERN_DIR=$$d/build MODULE_DIR=$$d clean all && \
-            install -D -m 0644 -g 0 -o 0 \
-                $(builddir)/bin/src/vboxdrv.ko $(moddir)/$$(basename $$d)/vboxdrv.ko; \
-            done
+            if [ -L $$d/build ]; then \
+                make -C $(builddir)/bin/src KERN_DIR=$$d/build MODULE_DIR=$$d clean all && \
+                install -D -m 0644 -g 0 -o 0 \
+                    $(builddir)/bin/src/vboxdrv.ko $(moddir)/$$(basename $$d)/vboxdrv.ko; \
+            fi; \
+        done
         make -C $(builddir)/bin/src clean
         touch debian/modules-stamp
@@ -163 +168 @@
         mv $(archdir)/components $(prefix)/usr/lib/$(package)/components
         mv $(archdir)/*.so $(prefix)/usr/lib
+        mv $(archdir)/*.so.4 $(prefix)/usr/lib || true
+        mv $(archdir)/sdk/bin/xpidl $(prefix)/usr/lib/$(package)
+        rmdir $(archdir)/sdk/bin
         mv $(archdir)/sdk  $(prefix)/usr/share/$(package)
-        $(if $(HEADLESS),,mv $(archdir)/nls $(prefix)/usr/share/$(package))
+        $(if $(HEADLESS),,mv $(archdir)/nls $(archdir)/nls4 $(prefix)/usr/share/$(package))
         mv $(archdir)/src  $(prefix)/usr/share/$(package)
         rm $(archdir)/VBox.sh
@@ -171 +179 @@
         mv $(archdir)/VBoxAddIF.sh $(prefix)/usr/bin/VBoxTAP
         for i in VBoxManage VBoxSVC $(if $(HEADLESS),,VBoxSDL) \
-            $(if $(HEADLESS),,VirtualBox) $(if $(ose),,VBoxVRDP) \
+            $(if $(HEADLESS),,VirtualBox VirtualBox4) $(if $(ose),,VBoxVRDP) \
             VBoxHeadless; do \
             mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done
@@ -193 +201 @@
         dh_link \
             $(if $(HEADLESS),,usr/bin/VBox usr/bin/VirtualBox) \
+            $(if $(HEADLESS),,usr/bin/VBox usr/bin/VirtualBox4) \
             usr/bin/VBox usr/bin/VBoxManage \
             $(if $(HEADLESS),,usr/bin/VBox usr/bin/VBoxSDL) \
@@ -214 +223 @@
         dh_installchangelogs
         dh_link
-        dh_strip --keep-debug
+        dh_strip --keep-debug --exclude=libVBoxQtCore.so.4 --exclude=libVBoxQtGui.so.4
         # manually strip our R0/GC modules, dh_strip cannot handle them
         for f in \
@@ -235 +244 @@
           -Valsa=$(if $(HEADLESS),,libasound2) \
           -Vpulse=$(if $(HEADLESS),,libpulse0) \
-          -Vsdlttf=$(if $(HEADLESS),,libsdl-ttf2.0-0)
+          -Vsdlttf=$(if $(HEADLESS),,libsdl-ttf2.0-0) \
+          -Vdkms=$(if $(filter _Ubuntu_gutsy _Ubuntu_hardy,$(debrel)),dkms,)
         dh_md5sums
         dh_builddeb