ooo-build r14454 - in branches/ooo-build-3-0: . bin distro-configs patches/dev300

[atimar svn gnome org]

Author: atimar
Date: Sat Nov  1 21:30:34 2008
New Revision: 14454
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14454&view=rev

Log:
2008-11-01  Andras Timar  <timar fsf hu>

	* configure.in,
	* download.in,
	* bin/unpack,
	* distro-configs/FSFhuLinux.conf.in,
	* distro-configs/FSFhuMacOSX.conf.in,
	* distro-configs/FSFhuWindows.conf.in,
	* patches/dev-300/apply: Added FSFhu distro bits


Added:
   branches/ooo-build-3-0/distro-configs/FSFhuMacOSX.conf.in
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/unpack
   branches/ooo-build-3-0/configure.in
   branches/ooo-build-3-0/distro-configs/FSFhuLinux.conf.in
   branches/ooo-build-3-0/distro-configs/FSFhuWindows.conf.in
   branches/ooo-build-3-0/download.in
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/bin/unpack
==============================================================================
--- branches/ooo-build-3-0/bin/unpack	(original)
+++ branches/ooo-build-3-0/bin/unpack	Sat Nov  1 21:30:34 2008
@@ -152,7 +152,7 @@
     esac
 
     case "$DISTRO" in
-	OxygenOffice*)
+	OxygenOffice*|FSFhu*)
 	    check_file $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip
 	    ;;
     esac
@@ -594,7 +594,7 @@
 esac
 
 case "$DISTRO" in
-	OxygenOffice*)
+	OxygenOffice*|FSFhu*)
 	    unzip -q $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip $OOBUILDDIR/dictionaries/
 	    ;;
 esac

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Sat Nov  1 21:30:34 2008
@@ -1354,6 +1354,9 @@
 distro-configs/Debian.conf
 distro-configs/DebianEtch.conf
 distro-configs/DebianSarge.conf
+distro-configs/FSFhuLinux.conf
+distro-configs/FSFhuMacOSX.conf
+distro-configs/FSFhuWindows.conf
 distro-configs/OxygenOfficeLinux.conf
 distro-configs/OxygenOfficeWindows.conf
 distro-configs/Ubuntu.conf

Modified: branches/ooo-build-3-0/distro-configs/FSFhuLinux.conf.in
==============================================================================
--- branches/ooo-build-3-0/distro-configs/FSFhuLinux.conf.in	(original)
+++ branches/ooo-build-3-0/distro-configs/FSFhuLinux.conf.in	Sat Nov  1 21:30:34 2008
@@ -1,5 +1,6 @@
 --with-intro-bitmaps=\"$SRCDIR/openintro_fsfhu.bmp\"
---with-vendor=\"FSF.hu.\"
+--with-vendor=\"FSF.hu AlapÃtvÃny\"
+--with-lang=hu
 --disable-access
 --enable-cairo
 --without-system-cairo

Added: branches/ooo-build-3-0/distro-configs/FSFhuMacOSX.conf.in
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/distro-configs/FSFhuMacOSX.conf.in	Sat Nov  1 21:30:34 2008
@@ -0,0 +1,9 @@
+--with-intro-bitmaps=\"$SRCDIR/openintro_fsfhu.bmp\"
+--with-vendor=\"FSF.hu AlapÃtvÃny\"
+--with-lang=hu
+--enable-minimizer 
+--enable-presenter-console 
+--enable-pdfimport 
+--enable-wiki-publisher 
+--enable-report-builder 
+--with-extension-integration

Modified: branches/ooo-build-3-0/distro-configs/FSFhuWindows.conf.in
==============================================================================
--- branches/ooo-build-3-0/distro-configs/FSFhuWindows.conf.in	(original)
+++ branches/ooo-build-3-0/distro-configs/FSFhuWindows.conf.in	Sat Nov  1 21:30:34 2008
@@ -1,5 +1,6 @@
 --with-intro-bitmaps=\"$SRCDIR/openintro_fsfhu.bmp\"
---with-vendor=\"FSF.hu.\"
+--with-vendor=\"FSF.hu AlapÃtvÃny\"
+--with-lang=hu
 --disable-activex-component
 --without-agfa-monotype-fonts
 --disable-xrender-link

Modified: branches/ooo-build-3-0/download.in
==============================================================================
--- branches/ooo-build-3-0/download.in	(original)
+++ branches/ooo-build-3-0/download.in	Sat Nov  1 21:30:34 2008
@@ -66,7 +66,7 @@
 # Prebuilt dictionaries for Novell Windows builds
     'writingaids.*\.zip'                 => '@MIRROR@/SRC680',
 
-# Prebuilt extension dictionaries for OxygenOffice builds
+# Prebuilt extension dictionaries for OxygenOffice and FSFhu builds
     'extensionaids.*\.zip'                 => 'http://ftp.devall.hu/kami/go-oo/',
 # Win32 bits:
     'unicows\.exe'			 => 'http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642',
@@ -267,7 +267,7 @@
 push @files, ( 'writingaids- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
 push @files, ( 'writingaids-doc- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
 
-push @files, ( 'extensionaids- PREBUILT_EXTENSIONAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOfficeLinux|OxygenOfficeWindows/;
+push @files, ( 'extensionaids- PREBUILT_EXTENSIONAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOfficeLinux|OxygenOfficeWindows|FSFhu/;
 
 if ('@CAIRO_ENABLED@' eq 'TRUE' && '@SYSTEM_CAIRO@' ne 'TRUE') {
     push @files, ( 'cairo- CAIRO_VER@.tar.gz' );
@@ -384,6 +384,7 @@
     $distro eq 'SUSE-9.1' || $distro eq 'SUSE-9.2' || $distro eq 'SUSE-9.3' ||
     $distro eq 'NovellWin32' || $distro eq 'GoOoWin32' ||
     $distro eq 'OxygenOfficeLinux' || $distro eq 'OxygenOfficeWindows' || 
+    $distro eq 'FSFhuLinux' || $distro eq 'FSFhuWindows' || 
     $distro eq 'translate-org-za-linux' || $distro eq 'translate-org-za-win32' || $distro eq 'Pardus') {
     push @files, ( source_file( "libs_extern_sys" ) );
 }

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Sat Nov  1 21:30:34 2008
@@ -137,6 +137,10 @@
 
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
 OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
+# FSFhu
+FSFhuWindows : Win32Common, NovellOnly, Lockdown, Fpickers, CustomUserConfig, CalcSolver, DejaVuFonts, IntegrateExtensions
+FSFhuLinux : NovellBase, Gcc43, EMFPlus, CairoFonts
+FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, CalcSolver, IntegrateExtensions
 # Plain build; just with base build fixes
 PlainLinux: PlainBuildFixes