[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - bin/unpack patches/dev300

[Kohei Yoshida]

 bin/unpack           |    2 +-
 patches/dev300/apply |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7a8d6b0c31efa35d5b439e0483240d32cb36e36
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Sep 22 23:22:37 2010 -0400

    Fixed broken unpack due to addition of ixion library.
    
    * bin/unpack: copy only when IXION_ENABLED equals TRUE.
    * patches/dev300/apply: added IxionUse to Experimental section
      or else the patch apply fails.

diff --git a/bin/unpack b/bin/unpack
index 0c70f05..3f357e1 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -874,7 +874,7 @@ if test "$SYSTEM_LIBWPG" != "YES"; then
 fi
 
 # Ixion
-if test "$IXION_ENABLED" != "YES"; then
+if test "$IXION_ENABLED" = "TRUE"; then
   check_tarball $SRCDIR/$LIBIXION_TARBALL
   echo "Copying ixion package into the tree"
   mkdir -p $OOBUILDDIR/ixion/download || exit 1
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 704f97d..e84f143 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -37,7 +37,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
 	      KDE4Experimental, MinGW, CalcExperimental, \
 	      OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
 	      WriterNavigation, SystemGraphiteWithSTLport, \
-	      HPPA, AXP, Speed, SystemMySQLWithSTLport, OOXMLExportDevel
+	      HPPA, AXP, Speed, SystemMySQLWithSTLport, OOXMLExportDevel, IxionUse
 DebianLooseSections: DebianBaseNoHelpContent
 # Optional sections
 Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes