[Pkg-virtualbox-commits] r83 - in trunk/debian: . patches

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-10-18 20:12:20 +0000 (Thu, 18 Oct 2007)
New Revision: 83

Modified:
   trunk/debian/changelog
   trunk/debian/patches/01-configure.dpatch
Log:
Updating 01-configure.dpatch

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-10-18 19:59:14 UTC (rev 82)
+++ trunk/debian/changelog	2007-10-18 20:12:20 UTC (rev 83)
@@ -9,7 +9,6 @@
   * Changed priority to extra.
 
   [ Daniel Baumann ]
-  * New upstream release.
   * Removing useless whitespaces at EOL and EOF in debian/*.
   * Sorting architectures.
   * Sorting build-depends.
@@ -38,6 +37,9 @@
     debian/lintian/virtualbox-ose for consistency reasons.
   * Moving debian/VBox.sh to debian/scripts/VBox.sh for consistency reasons.
   * Updated menu file to new menu policy.
+  * New upstream release:
+    - Updating dfsg-free target in rules.
+    - Updating 01-configure.dpatch.
 
  -- Daniel Baumann <daniel at debian.org>  Thu, 18 Oct 2007 21:45:00 +0200
 

Modified: trunk/debian/patches/01-configure.dpatch
===================================================================
--- trunk/debian/patches/01-configure.dpatch	2007-10-18 19:59:14 UTC (rev 82)
+++ trunk/debian/patches/01-configure.dpatch	2007-10-18 20:12:20 UTC (rev 83)
@@ -5,10 +5,10 @@
 
 @DPATCH@
 
-diff -Naurp virtualbox-ose-1.5.0-dfsg2.orig/configure virtualbox-ose-1.5.0-dfsg2/configure
---- virtualbox-ose-1.5.0-dfsg2.orig/configure	2007-08-31 12:42:12.000000000 +0000
-+++ virtualbox-ose-1.5.0-dfsg2/configure	2007-10-09 12:24:17.000000000 +0000
-@@ -248,8 +248,8 @@ check_environment()
+diff -Naurp virtualbox-ose-1.5.2-dfsg.orig/configure virtualbox-ose-1.5.2-dfsg/configure
+--- virtualbox-ose-1.5.2-dfsg.orig/configure	2007-10-18 11:07:28.000000000 +0000
++++ virtualbox-ose-1.5.2-dfsg/configure	2007-10-18 20:09:49.000000000 +0000
+@@ -265,8 +265,8 @@ check_environment()
        exit 1
        ;;
    esac
@@ -16,15 +16,15 @@
 -  KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.$BUILD_MACHINE"
 +  DEVDIR_BIN="/usr/bin"
 +  KBUILDDIR_BIN="/usr/bin"
+   KBUILD_SED="$KBUILDDIR_BIN/kmk_sed"
    log_success "Determined build machine: $OS.$BUILD_MACHINE, target machine: $OS.$TARGET_MACHINE"
  
-   # Automatically disable XPCOM on darwin.
-@@ -1335,7 +1335,7 @@ check_gcc
+@@ -1450,7 +1450,7 @@ check_gcc
  
  # Linux-specific
  if [ "$OS" = "linux" ]; then
 -  check_linux
-+#  check_linux
++  #check_linux
    check_alsa
    check_compiler_h
    [ "$BUILD_MACHINE" = "amd64" ] && check_32bit