Changeset 5773 in vbox

Timestamp:

Nov 16, 2007 3:18:17 PM (17 years ago)

Author:

vboxsync

Message:

.deb: sync

Location:

trunk/debian

Files:

• LocalConfig.kmk (modified) (1 diff)
• postinst (modified) (1 diff)
• rules (modified) (3 diffs)

trunk/debian/LocalConfig.kmk

@@ -14 +14 @@
 KBUILD_MSG_STYLE        := brief
 
-DEFS                    += RTPATH_APP_DOCS=\"/usr/share/doc/virtualbox-ose\"
+DEFS                    += RTPATH_APP_DOCS=\"$(VBOX_PATH_PACKAGE_DOCS)\"
 DEFS                    += RTPATH_APP_PRIVATE_ARCH=\"/usr/lib/virtualbox-ose\"
 DEFS                    += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox-ose\"

trunk/debian/postinst

@@ -21 +21 @@
 # install udev rule
 if [ -d /etc/udev/rules.d ]; then
-  udev_out=`udevinfo -V` 2>&1 > /dev/null
-  if [ "$udev_out" = "" ]; then
-    udev_out=`udevinfo -V` 2>&1 > /dev/null  # New syntax
-  fi
+  udev_out=`udevinfo -V 2> /dev/null`
   udev_ver=`expr "$udev_out" : '[^0-9]*\([0-9]*\)'`
   if [ "$udev_ver" = "" -o "$udev_ver" -lt 55 ]; then

trunk/debian/rules

@@ -51 +51 @@
 endif
 
+debdocs := VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/virtualbox\""
+
 # Ubuntu dapper: gcc-4.0 does not work with recompiler, use gcc-3.4 instead
 configure: debian/configure-stamp
@@ -77 +79 @@
             PATH_OUT=$(current)/debian/builddir \
             VBOX_DO_STRIP= VBOX_DO_STRIP_MODULES= \
+            $(debdocs) \
             all
         $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual.pdf $(builddir)/bin,)
@@ -91 +94 @@
             PATH_OUT=$(current)/debian/builddir \
             VBOX_DO_STRIP= VBOX_DO_STRIP_MODULES= \
+            $(debdocs) \
             packing
         touch debian/build-stamp