ooo-build r12178 - in trunk: . patches/dev300 patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Apr 16 10:03:42 2008
New Revision: 12178
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12178&view=rev

Log:
2008-04-16  Rene Engelhard  <rene debian org>

        * patches/src680/configures-explicit-arch.diff,
          patches/dev300/configures-explicit-arch.diff: work around
          dpkg-architecture printing a newline after the triplet



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/src680/configures-explicit-arch.diff

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Wed Apr 16 10:03:42 2008
@@ -36,8 +36,8 @@
  CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
  CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);
  
-+ToFile( "DEB_BUILD_GNU_TYPE",`dpkg-architecture -qDEB_BUILD_GNU_TYPE`, "e" );
-+ToFile( "DEB_HOST_GNU_TYPE", `dpkg-architecture -qDEB_HOST_GNU_TYPE`,  "e" );
++ToFile( "DEB_BUILD_GNU_TYPE",`dpkg-architecture -qDEB_BUILD_GNU_TYPE | head -n 1`, "e" );
++ToFile( "DEB_HOST_GNU_TYPE", `dpkg-architecture -qDEB_HOST_GNU_TYPE | head -n 1`,  "e" );
  ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
  ToFile( "SHELL",             $SHELL,             "e" );
  ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );

Modified: trunk/patches/src680/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/src680/configures-explicit-arch.diff	(original)
+++ trunk/patches/src680/configures-explicit-arch.diff	Wed Apr 16 10:03:42 2008
@@ -36,8 +36,8 @@
  CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
  CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);
  
-+ToFile( "DEB_BUILD_GNU_TYPE",`dpkg-architecture -qDEB_BUILD_GNU_TYPE`, "e" );
-+ToFile( "DEB_HOST_GNU_TYPE", `dpkg-architecture -qDEB_HOST_GNU_TYPE`,  "e" );
++ToFile( "DEB_BUILD_GNU_TYPE",`dpkg-architecture -qDEB_BUILD_GNU_TYPE | head -n 1`, "e" );
++ToFile( "DEB_HOST_GNU_TYPE", `dpkg-architecture -qDEB_HOST_GNU_TYPE | head -n 1`,  "e" );
  ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
  ToFile( "SHELL",             $SHELL,             "e" );
  ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );