[Pkg-virtualbox-commits] r345 - tags tags/1.6.2-dfsg-5/debian tags/1.6.2-dfsg-5/debian/patches tags/1.6.2-dfsg-5/debian/virtualbox-ose.files trunk/debian

Fri Sep 12 08:41:21 UTC 2008

Author: meskes
Date: 2008-09-12 08:41:20 +0000 (Fri, 12 Sep 2008)
New Revision: 345

Added:
   tags/1.6.2-dfsg-5/
Modified:
   tags/1.6.2-dfsg-5/debian/changelog
   tags/1.6.2-dfsg-5/debian/control
   tags/1.6.2-dfsg-5/debian/patches/09-initscript.dpatch
   tags/1.6.2-dfsg-5/debian/virtualbox-ose.README.Debian.xml
   tags/1.6.2-dfsg-5/debian/virtualbox-ose.files/VBox.sh
   trunk/debian/changelog
Log:
Started preparing a 1.6.2-dfsg-5 upload for Lenny by just moving the relevant changes from 1.6.6-dfsg-1.



Copied: tags/1.6.2-dfsg-5 (from rev 344, tags/1.6.2-dfsg-4)

Modified: tags/1.6.2-dfsg-5/debian/changelog
===================================================================

--- tags/1.6.2-dfsg-4/debian/changelog	2008-09-07 19:24:40 UTC (rev 344)
+++ tags/1.6.2-dfsg-5/debian/changelog	2008-09-12 08:41:20 UTC (rev 345)
@@ -1,3 +1,18 @@
+virtualbox-ose (1.6.2-dfsg-5) unstable; urgency=low
+
+  [ Michael Meskes ]
+  * Updated initscript to better handle LSB compatibility, yet again
+    closes: #474089
+  * Added a short note to README.Debian asking user to use only the 486 version
+    of the 2.6.26 kernel. This documents a workaround for #497505 and #497875.
+  * In VBox.sh honor LD_LIBRARY_PATH if already set, closes: #496953
+
+  [ Loic Minier ]
+  * Demote module-assistant deps to Recommends; closes: #495671.
+  * Don't prepend current directory to LD_LIBRARY_PATH if it isn't set.
+
+ -- Michael Meskes <meskes at debian.org>  Sat, 09 Aug 2008 21:46:44 +0200
+
 virtualbox-ose (1.6.2-dfsg-4) unstable; urgency=medium
 
   * Adding patch from Gonéri Le Bouder <goneri at rulezlan.org> to fix FTBFS with

Modified: tags/1.6.2-dfsg-5/debian/control
===================================================================
--- tags/1.6.2-dfsg-4/debian/control	2008-09-07 19:24:40 UTC (rev 344)
+++ tags/1.6.2-dfsg-5/debian/control	2008-09-12 08:41:20 UTC (rev 345)
@@ -76,9 +76,9 @@
 Depends: ${misc:Depends},
          debhelper (>= 5),
          dpatch,
-         module-assistant,
          bzip2,
          kbuild
+Recommends: module-assistant
 Conflicts: virtualbox-source
 Replaces: virtualbox-source
 Provides: virtualbox-source
@@ -96,9 +96,9 @@
 Depends: ${misc:Depends},
          debhelper (>= 5),
          dpatch,
-         module-assistant,
          bzip2,
          kbuild
+Recommends: module-assistant
 Description: x86 virtualization solution - guest addition module source
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a

Modified: tags/1.6.2-dfsg-5/debian/patches/09-initscript.dpatch
===================================================================
--- tags/1.6.2-dfsg-4/debian/patches/09-initscript.dpatch	2008-09-07 19:24:40 UTC (rev 344)
+++ tags/1.6.2-dfsg-5/debian/patches/09-initscript.dpatch	2008-09-12 08:41:20 UTC (rev 345)
@@ -8,18 +8,20 @@
 diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
 --- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in	2008-05-09 09:28:41.000000000 +0000
 +++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in	2008-05-09 09:29:40.000000000 +0000
-@@ -34,6 +34,11 @@ VARFILE="/var/run/VirtualBox/vboxnet"
+@@ -34,7 +34,12 @@
  TAPDEV="/dev/net/tun"
  NOLSB=%NOLSB%
  
+-[ -f /lib/lsb/init-functions ] || NOLSB=yes
 +# Include virtualbox-ose defaults if available
 +if [ -f /etc/default/virtualbox-ose ] ; then
 +	. /etc/default/virtualbox-ose
 +fi
 +
- [ -f /lib/lsb/init-functions ] || NOLSB=yes
++[ -f /lib/lsb/init-functions ] && NOLSB=
  
  if [ -n "$NOLSB" ]; then
+     if [ -f /etc/redhat-release ]; then
 @@ -162,13 +167,6 @@ start_network()
      if ! VBoxTunctl -h 2>&1 | grep VBoxTunctl > /dev/null; then
        failure "VBoxTunctl not found"

Modified: tags/1.6.2-dfsg-5/debian/virtualbox-ose.README.Debian.xml
===================================================================
--- tags/1.6.2-dfsg-4/debian/virtualbox-ose.README.Debian.xml	2008-09-07 19:24:40 UTC (rev 344)
+++ tags/1.6.2-dfsg-5/debian/virtualbox-ose.README.Debian.xml	2008-09-12 08:41:20 UTC (rev 345)
@@ -168,6 +168,15 @@
     </para>
   </section>
   <section>
+    <title>Other incompatibilities</title>
+    <para>
+      For reasons not yet known VirtualBox does not work reliably with 686
+      optimized linux kernel 2.6.26. If you experience any problem here, please
+      switch to the standard 486 optimized kernel for which these problems have
+      not been reported.
+    </para>
+  </section>
+  <section>
     <title>See also</title>
     <para>
       Additional and updated information may be found on

Modified: tags/1.6.2-dfsg-5/debian/virtualbox-ose.files/VBox.sh
===================================================================
--- tags/1.6.2-dfsg-4/debian/virtualbox-ose.files/VBox.sh	2008-09-07 19:24:40 UTC (rev 344)
+++ tags/1.6.2-dfsg-5/debian/virtualbox-ose.files/VBox.sh	2008-09-12 08:41:20 UTC (rev 345)
@@ -69,7 +69,7 @@
     fi
 fi
 
-export LD_LIBRARY_PATH="$INSTALL_DIR"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$INSTALL_DIR"
 
 APP=`which $0`
 APP=${APP##/*/}

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-09-07 19:24:40 UTC (rev 344)
+++ trunk/debian/changelog	2008-09-12 08:41:20 UTC (rev 345)
@@ -3,11 +3,17 @@
   [ Michael Meskes ]
   * New upstream version
     - no longer able to select disk in use for new VM, closes: #495028
+  * Removed patch 05-vboxadd-udev which was applied by upstream.
+ 
+ -- Michael Meskes <meskes at debian.org>  Fri, 12 Sep 2008 10:17:59 +0200
+
+virtualbox-ose (1.6.2-dfsg-5) unstable; urgency=low
+
+  [ Michael Meskes ]
   * Updated initscript to better handle LSB compatibility, yet again
     closes: #474089
-  * Removed patch 05-vboxadd-udev which was applied by upstream.
   * Added a short note to README.Debian asking user to use only the 486 version
-    of the 2.6.26 kernel.
+    of the 2.6.26 kernel. This documents a workaround for #497505 and #497875.
   * In VBox.sh honor LD_LIBRARY_PATH if already set, closes: #496953
 
   [ Loic Minier ]


