diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-09-22 23:22:37 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-09-22 23:22:37 -0400 |
| commit | c7a8d6b0c31efa35d5b439e0483240d32cb36e36 (patch) | |
| tree | 9809474c9bb1970c5d5165d25004d79c77427655 | |
| parent | 6862bcb155daa0aee1d98ed30b5c94edfa8255d7 (diff) | |
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.
| -rwxr-xr-x | bin/unpack | 2 | ||||
| -rw-r--r-- | patches/dev300/apply | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/unpack b/bin/unpack index 0c70f0546..3f357e102 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 704f97df5..e84f1431e 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 |