[ooo-build-commit] .: 3 commits - bin/unpack distro-configs/FSFhuLinux.conf.in patches/dev300

[Andras Timar]

 bin/unpack                        |    2 +-
 distro-configs/FSFhuLinux.conf.in |   27 ++++++++++++++-------------
 patches/dev300/apply              |    6 +++---
 3 files changed, 18 insertions(+), 17 deletions(-)

New commits:
commit bb85cbfe03e7a215e2905ffde13ae0cf8b217142
Author: Andras Timar <timar at fsf.hu>
Date:   Sat Aug 28 11:45:10 2010 +0200

    rsync did not find directory between quotes

diff --git a/bin/unpack b/bin/unpack
index 76f5dde..075c32d 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -314,7 +314,7 @@ else
     rsync -prL --exclude .git --exclude 'unxlng??.pro' "$RAWBUILDDIR/" "$OOBUILDDIR/"
     if test -d "$CLONEDIR/l10n" ; then
 	echo "* copying translations into $OOBUILDDIR..."
-	rsync -a --exclude .git "$CLONEDIR/l10n/*" $OOBUILDDIR/
+	rsync -a --exclude .git $CLONEDIR/l10n/* $OOBUILDDIR/
     fi
 fi
 
commit 30add36859d31f8945a705a71d6ed98e827f4126
Author: Andras Timar <timar at fsf.hu>
Date:   Sat Aug 28 09:26:26 2010 +0200

    FSFhu bits

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f1ceb24..f619cb9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -152,8 +152,8 @@ OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions, Lib
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeLinuxOnly
 OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
 # FSFhu
-FSFhuWindows : Win32Common, FSFhuWin32Only, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions, MagyarLinuxLibertineFonts
-FSFhuLinux : NovellBase, EMFPlus, LiberationFontsOnWindows, IntegrateExtensions
+FSFhuWindows : Win32Common, FSFhuOnly, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions, MagyarLinuxLibertineFonts
+FSFhuLinux : NovellBase, FSFhuOnly, EMFPlus, LiberationFontsOnWindows, IntegrateExtensions
 FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions
 # Plain build; just with base build fixes
 PlainLinux: PlainBuildFixes
@@ -3586,7 +3586,7 @@ border-types-dotted-dashed.diff, fate#307731, fate 307730
 #FIXME: Incomplete, not to be included in 3.2.1
 #border-types-more.diff, fate#309127
 
-[ FSFhuWin32Only ]
+[ FSFhuOnly ]
 SectionOwner => timar
 
 fsfhu-instset.diff 
diff --git a/patches/dev300/fsfhu-instset.diff b/patches/dev300/fsfhu-instset.diff
old mode 100755
new mode 100644
diff --git a/patches/dev300/fsfhu-splash.diff b/patches/dev300/fsfhu-splash.diff
old mode 100755
new mode 100644
commit bd624ccb3625e8f1f8a91ec4c226b9e99a8c5e19
Author: Andras Timar <timar at fsf.hu>
Date:   Sat Aug 28 09:14:11 2010 +0200

    Tweaking FSFhuLinux.conf.in
    
    * distro-configs/FSFhuLinux.conf.in:

diff --git a/distro-configs/FSFhuLinux.conf.in b/distro-configs/FSFhuLinux.conf.in
index 53f2fe1..1c5025c 100644
--- a/distro-configs/FSFhuLinux.conf.in
+++ b/distro-configs/FSFhuLinux.conf.in
@@ -1,34 +1,35 @@
 --with-intro-bitmaps=\"$TOOLSDIR/src/openintro_fsfhu.bmp\"
 --with-vendor=\"FSF.hu Alapítvány\"
+--enable-epm
 --with-package-format=\"deb\"
 --with-lang=\"hu\"
---with-myspell-dicts
+--with-fonts
+--with-magyarlinuxlibertine-fonts
+--disable-odk
+--disable-qadevooo
+--disable-layout
+--enable-binfilter
 --with-system-expat
 --with-system-odbc-headers
 --with-system-curl
 --with-system-sane-header
 --with-system-xrender-headers
---enable-binfilter
 --enable-gnome-vfs
 --enable-symbols
---enable-epm
 --with-system-db
 --enable-crypt-link
 --enable-pam-link
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=gnu
 --disable-kde
 --disable-kde4
---disable-odk
---with-linker-hash-style=both
---with-fonts
---with-magyarlinuxlibertine-fonts
---enable-minimizer 
---enable-presenter-console 
+--enable-minimizer
+--enable-presenter-console
 --enable-pdfimport
---enable-wiki-publisher 
---enable-report-builder 
+--enable-wiki-publisher
+--enable-report-builder
 --with-extension-integration
-
-
+--with-myspell-dicts
+--without-unix-wrapper