Changeset 31999 in vbox for trunk/debian/rules

Timestamp:

Aug 26, 2010 2:03:20 PM (15 years ago)

Author:

vboxsync

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

65242

Message:

deb: sync

File:

• trunk/debian/rules (modified) (7 diffs)

trunk/debian/rules

@@ -60 +60 @@
 endif
 
-# Hack: Xandros is actually Debian/sarge ... :(
-ifneq ($(wildcard /etc/xandros-desktop-version),)
- debrel  := _xandros4.1
-else
-ifneq ($(wildcard /etc/univention),)
- debrel  := _ucs1.3
-else
- debrel  := $(if $(shell which lsb_release),_$(shell lsb_release -si)_$(shell lsb_release -sc),unknown)
-endif
-endif
+debrel  := $(if $(shell which lsb_release),_$(shell lsb_release -si)_$(shell lsb_release -sc),unknown)
 
 # shipping Linux kernel modules with bleeding-edge releases doesn't make sense
-instmod := $(if $(filter _Ubuntu_karmic _Debian_sid,$(debrel)),,1)
+instmod := $(if $(filter _Ubuntu_lucid _Debian_sid,$(debrel)),,1)
 
 # Locations of custom built Qt libraries (see below)
@@ -80 +71 @@
 cfg_flags := $(if $(NOQT),--disable-qt,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
-             $(if $(filter _Ubuntu_dapper,$(debrel)),--with-gcc=gcc-3.4 --with-g++=g++-3.4,) \
-             $(if $(filter _Ubuntu_gutsy,$(debrel)),--with-gcc=gcc-4.2 --with-g++=g++-4.2,) \
-             $(if $(filter _xandros4.1 _ucs1.3 _Debian_sarge _Ubuntu_dapper,$(debrel)),--build-libxml2,) \
-             $(if $(filter _xandros4.1 _ucs1.3 _Debian_sarge _Ubuntu_dapper,$(debrel)),--build-libxslt,) \
              $(if $(filter _Debian_etch,$(debrel)),$(if $(ose),,--build-libcurl),) \
-             $(if $(filter _Debian_sarge _xandros4.1 _ucs1.3,$(debrel)),--with-qt4-dir=$(qtstdc5)) \
-             $(if $(filter _Debian_etch _Ubuntu_dapper _Ubuntu_edgy _Ubuntu_feisty _Ubuntu_gutsy _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
-             $(if $(filter _xandros4.1 _ucs1.3,$(debrel)),--disable-sdl-ttf,) \
-             $(if $(filter _Debian_sarge _Ubuntu_dapper _Ubuntu_edgy _xandros4.1 _ucs1.3,$(debrel)),--disable-pulse,) \
+             $(if $(filter _Debian_etch _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
              $(if $(HEADLESS),--build-headless,) \
              $(if $(DEBUG),--build-debug,) \
@@ -105 +89 @@
              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
              $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
-             $(if $(filter _Debian_sarge _xandros4.1 _ucs1.3,$(debrel)),VBOX_LD_as_needed= ,) \
              $(if $(filter _Debian_etch _Ubuntu_hardy,$(debrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
 
-# Ubuntu dapper: gcc-4.0 does not work with recompiler, use gcc-3.4 instead
-# Ubuntu gutsy:  gcc-4.1 does not work for the webservices, use gcc-4.2 instead
 configure: debian/configure-stamp
 debian/configure-stamp:
@@ -126 +107 @@
         . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) \
             VBOX_NO_LINUX_RUN_INSTALLER=1 \
-            VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \
+            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 \
             packing
         touch debian/build-stamp
@@ -238 +220 @@
         dh_installdocs \
             $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \
-            LICENSE
-        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm LICENSE)
+            $(addprefix $(archdir)/, $(if $(HEADLESS),,License-*.html) LICENSE)
+        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm \
+            LICENSE $(if $(HEADLESS),,License-*.html))
         for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
             mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
@@ -263 +246 @@
         $(if $(NOMODS),,dh_installmodules)
         sed \
-            -e 's|%NOLSB%|$(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g' \
+            -e 's|%NOLSB%||g' \
             -e 's|%DEBIAN%|yes|g' \
             -e 's|%PACKAGE%|virtualbox|g' \
-            src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init
-        dh_installinit --name=vboxdrv
+            $(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/vboxweb-service.sh.in > debian/vboxweb-service.init
+        dh_installinit --name=vboxweb-service --noscripts
         cat debian/preinst.in | sed -e 's|%VER%|$(ver)|g' > debian/preinst
         cat debian/postinst.in | sed -e 's|%VER%|$(ver)|g' > debian/postinst
-        if [ "$(debrel)" = "_Ubuntu_dapper" -o "$(debrel)" = "_Debian_sarge" ]; then \
-            cat debian/postrm.dapper > debian/postrm; fi
         dh_installdebconf
         dh_installchangelogs
@@ -302 +289 @@
           -Vpulse=$(if $(HEADLESS),,libpulse0) \
           -Vsdlttf=$(if $(HEADLESS),,libsdl-ttf2.0-0) \
-          -Vdkms=$(if $(filter _Ubuntu_gutsy _Ubuntu_hardy _Ubuntu_intrepid _Ubuntu_jaunty _Ubuntu_karmic,$(debrel)),dkms,)
+          -Vdkms=$(if $(filter _Ubuntu_hardy _Ubuntu_intrepid _Ubuntu_jaunty _Ubuntu_karmic _Ubuntu_lucid,$(debrel)),dkms,)
         dh_md5sums
         dh_builddeb --destdir $(pkgdir)