[ooo-build-commit] .: 2 commits - bin/setup.in bin/unpack configure.in distro-configs/FSFhuLinux.conf.in distro-configs/FSFhuMacOSX.conf.in distro-configs/FSFhuWindows.conf.in download.in patches/dev300 src/Makefile.am src/nologoinstall_fsfhu.bmp src/ooobitmap_fsfhu.bmp src/openintro_fsfhu.bmp
Andras Timar
timar at kemper.freedesktop.org
Fri Oct 1 13:00:54 PDT 2010
bin/setup.in | 1
bin/unpack | 8
configure.in | 4
dev/null |binary
distro-configs/FSFhuLinux.conf.in | 36 ----
distro-configs/FSFhuMacOSX.conf.in | 9 -
distro-configs/FSFhuWindows.conf.in | 16 -
download.in | 11 -
patches/dev300/apply | 21 --
patches/dev300/fsfhu-instset.diff | 14 -
patches/dev300/fsfhu-revert-scp2-3layer-nicer-paths.diff | 49 -----
patches/dev300/fsfhu-splash.diff | 17 -
patches/dev300/fsfhu-vendor-win32.diff | 11 -
patches/dev300/fsfhu-win32-installer-branding.diff | 46 -----
patches/dev300/magyarlinuxlibertine-fonts.diff | 133 ---------------
src/Makefile.am | 3
16 files changed, 4 insertions(+), 375 deletions(-)
New commits:
commit 3bebaf66eecf989e7e576e3364c80615f0eeb2b2
Author: Andras Timar <timar at fsf.hu>
Date: Fri Oct 1 21:56:02 2010 +0200
Magyar Linux Libertine removed (Linux Libertine G will be added)
diff --git a/bin/setup.in b/bin/setup.in
index 33dd5f2..5d6a30e 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -70,7 +70,6 @@ CAIRO_ENABLED=@CAIRO_ENABLED@
SYSTEM_CAIRO=@SYSTEM_CAIRO@
PREBUILT_WRITINGAIDS_TIMESTAMP=@PREBUILT_WRITINGAIDS_TIMESTAMP@
PREBUILT_EXTENSIONAIDS_TIMESTAMP=@PREBUILT_EXTENSIONAIDS_TIMESTAMP@
-MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP=@MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP@
SYSTEM_MDDS=@SYSTEM_MDDS@
UNSTABLE_WP=@UNSTABLE_WP@
SYSTEM_LIBWPD=@SYSTEM_LIBWPD@
diff --git a/bin/unpack b/bin/unpack
index 520a6ac..81597e9 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -227,7 +227,6 @@ fi
case "$DISTRO" in
OxygenOffice*)
check_file $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip
- check_file $SRCDIR/MagyarLinLibertine-$MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP.zip
;;
esac
@@ -736,9 +735,6 @@ case "$DISTRO" in
OxygenOffice*)
echo "Extracting extension aids..."
unzip -q -o $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip -d $OOBUILDDIR/dictionaries
- echo "Copying Magyar Linux Libertine fonts into the tree..."
- mkdir -p $OOBUILDDIR/bitstream_vera_fonts/download/
- $GNUCP $SRCDIR/MagyarLinLibertine-$MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP.zip $OOBUILDDIR/bitstream_vera_fonts/download/MagyarLinLibertine.zip
;;
esac
diff --git a/download.in b/download.in
index 4fcd86e..4064aa2 100755
--- a/download.in
+++ b/download.in
@@ -207,9 +207,6 @@ sub download_tests_dependencies() {
# MySQL Connector/C++
'mysql-connector-cpp.zip' => 'http://svn.services.openoffice.org/ooo/cws/mysqlnative/mysqlcppconn/download/mysql-connector-cpp.zip',
-# Magyar Linux Libertine fonts
- 'MagyarLinLibertine.*\.zip' => 'http://numbertext.org/linux/',
-
# Multi-dimensional data structure
'cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2' => 'http://hg.services.openoffice.org/binaries/',
);
@@ -450,9 +447,6 @@ source_file( 'writingaids-doc- at PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTR
source_file( 'extensionaids- at PREBUILT_EXTENSIONAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOfficeLinux|OxygenOfficeWindows/;
-# Magyar Linux Libertine fonts
-source_file( 'MagyarLinLibertine- at MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOffice/;
-
if ('@CAIRO_ENABLED@' eq 'TRUE' && '@SYSTEM_CAIRO@' ne 'TRUE') {
source_file( 'cairo- at CAIRO_VER@.tar.gz' );
}
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9c41a1d..dc1729c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2851,11 +2851,6 @@ border-types-dotted-dashed.diff, fate#307731, fate 307730
# Better mapping of cell border thickness & inner padding.
calc-xls-import-cell-border.diff, n#636691, kohei
-[ MagyarLinuxLibertineFonts ]
-SectionOwner => timar
-
-magyarlinuxlibertine-fonts.diff
-
[ OOXML ]
oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
oox-smartart-import.diff, thorsten
diff --git a/patches/dev300/magyarlinuxlibertine-fonts.diff b/patches/dev300/magyarlinuxlibertine-fonts.diff
deleted file mode 100644
index eb2d6cf..0000000
--- a/patches/dev300/magyarlinuxlibertine-fonts.diff
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -Naur bitstream_vera_fonts.orig/prj/build.lst bitstream_vera_fonts/prj/build.lst
---- bitstream_vera_fonts/prj/build.lst 2010-02-12 22:44:46.000000000 +0100
-+++ bitstream_vera_fonts/prj/build.lst 2010-03-19 12:25:39.452375000 +0100
-@@ -2,4 +2,4 @@
- bs bitstream_vera_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL
- bs bitstream_vera_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL
- bs bitstream_vera_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL
--
-+bs bitstream_vera_fonts\fonts\ttf_magyarlinuxlibertine nmake - all mlli_fonts NULL
-diff -Naur bitstream_vera_fonts.orig/prj/d.lst bitstream_vera_fonts/prj/d.lst
---- bitstream_vera_fonts/prj/d.lst 2010-02-12 22:44:46.000000000 +0100
-+++ bitstream_vera_fonts/prj/d.lst 2010-03-19 15:30:42.268250000 +0100
-@@ -5,4 +5,5 @@
- ..\%__SRC%\misc\build\liberation-fonts-1.05\License %COMMON_DEST%\pck%_EXT%\LICENSE_liberation
- ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
- ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium
--
-+..\%__SRC%\misc\build\magyarlinuxlibertine\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-+..\%__SRC%\misc\build\magyarlinuxlibertine\LICENCE.txt %COMMON_DEST%\pck%_EXT%\LICENSE_magyarlinuxlibertine
-diff -Naur bitstream_vera_fonts.orig/fonts/ttf_magyarlinuxlibertine/makefile.mk bitstream_vera_fonts/fonts/ttf_magyarlinuxlibertine/makefile.mk
---- bitstream_vera_fonts/fonts/ttf_magyarlinuxlibertine/makefile.mk 1970-01-01 01:00:00.000000000 +0100
-+++ bitstream_vera_fonts/fonts/ttf_magyarlinuxlibertine/makefile.mk 2010-03-19 15:14:13.265625000 +0100
-@@ -0,0 +1,60 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..
-+
-+PRJNAME=bitstream_vera_fonts
-+TARGET=ttf_magyarlinuxlibertine
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+TARFILE_NAME=MagyarLinLibertine
-+TARFILE_ROOTDIR=magyarlinuxlibertine
-+
-+PATCH_FILES=
-+
-+
-+CONFIGURE_DIR=
-+CONFIGURE_ACTION=
-+
-+BUILD_DIR=
-+BUILD_ACTION=
-+BUILD_FLAGS=
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : set_ext.mk
-+.INCLUDE : target.mk
-+
-+.IF "$(WITH_FONTS)"!="NO"
-+.INCLUDE : tg_ext.mk
-+.ENDIF
-+
---- configure.in 2010-03-16 12:08:56.323375000 +0100
-+++ configure.in 2010-03-19 13:14:09.766500000 +0100
-@@ -102,6 +102,9 @@
- (even if present) in the openoffice.org installation
- set.
- ],,with_agfa_monotype_fonts="yes")
-+AC_ARG_WITH(magyarlinuxlibertine-fonts,
-+[ --with-magyarlinuxlibertine-fonts Include Magyar Linux Libertine font set
-+],,)
- AC_ARG_ENABLE(epm,
- [ --disable-epm OO.o includes self-packaging code, that requires
- epm, however epm is useless for large scale
-@@ -6861,6 +6864,19 @@
- fi
- AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
-
-+AC_MSG_CHECKING([whether to include Magyar Linux Libertine fonts])
-+if test "$with_magyarlinuxlibertine_fonts" != "no" ; then
-+ AC_MSG_RESULT([yes])
-+ WITH_MAGYARLINUXLIBERTINE_FONTS=YES
-+ BUILD_TYPE="$BUILD_TYPE MAGYARLINUXLIBERTINE_FONTS"
-+ SCPDEFS="$SCPDEFS -DWITH_MAGYARLINUXLIBERTINE_FONTS"
-+else
-+ AC_MSG_RESULT([no])
-+ WITH_MAGYARLINUXLIBERTINE_FONTS=NO
-+fi
-+AC_SUBST(WITH_MAGYARLINUXLIBERTINE_FONTS)
-+
-+
- dnl ===================================================================
- dnl Test whether to include ppds
- dnl ===================================================================
-diff -Naur scp2.orig/source/ooo/file_font_ooo.scp scp2/source/ooo/file_font_ooo.scp
---- scp2/source/ooo/file_font_ooo.scp 2010-03-16 12:04:42.306375000 +0100
-+++ scp2/source/ooo/file_font_ooo.scp 2010-03-19 13:02:02.527125000 +0100
-@@ -212,3 +212,14 @@
- STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
- #endif
- #endif
-+
-+#ifndef WITHOUT_FONTS
-+#ifdef WITH_MAGYARLINUXLIBERTINE_FONTS
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineG, MagyarLinLibertineG.ttf, Magyar Linux Libertine Graphite)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGB, MagyarLinLibertineGB.ttf, Magyar Linux Libertine Bold Graphite)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGBI, MagyarLinLibertineGBI.ttf, Magyar Linux Libertine Bold Italic Graphite)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGI, MagyarLinLibertineGI.ttf, Magyar Linux Libertine Italic Graphite)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinum, MagyarLinBiolinum.ttf, Magyar Linux Biolinum)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinumB, MagyarLinBiolinumB.ttf, Magyar Linux Biolinum Bold)
-+#endif
-+#endif
commit 5e383f7255732ae7ec9c95df2498ad35a8c209ab
Author: Andras Timar <timar at fsf.hu>
Date: Fri Oct 1 21:46:10 2010 +0200
Removed FSFhu* distros (obsoleted by LibreOffice)
diff --git a/bin/unpack b/bin/unpack
index 6456f4b..520a6ac 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -225,7 +225,7 @@ fi
esac
case "$DISTRO" in
- OxygenOffice*|FSFhu*)
+ OxygenOffice*)
check_file $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip
check_file $SRCDIR/MagyarLinLibertine-$MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP.zip
;;
@@ -733,7 +733,7 @@ case "$DISTRO" in
esac
case "$DISTRO" in
- OxygenOffice*|FSFhu*)
+ OxygenOffice*)
echo "Extracting extension aids..."
unzip -q -o $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip -d $OOBUILDDIR/dictionaries
echo "Copying Magyar Linux Libertine fonts into the tree..."
diff --git a/configure.in b/configure.in
index 80c41b6..f885ca8 100644
--- a/configure.in
+++ b/configure.in
@@ -690,7 +690,6 @@ case $DISTRO in
Slackware*) VENDORNAME="Slackware" ;;
PLD*) VENDORNAME="PLD" ;;
OxygenOffice*) VENDORNAME="OxygenOffice" ;;
- FSFhu*) VENDORNAME="FSFhu" ;;
OOo4Kids*) VENDORNAME="EducOOo" ;;
LibreOffice*|Raw) VENDORNAME="The Document Foundation" ;;
*) AC_MSG_WARN([Cannot guess vendor from distro - please add it to configure.in]) ;;
@@ -1664,9 +1663,6 @@ distro-configs/DroplineGNOME64.conf
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/OOo4Kids.conf
distro-configs/OxygenOfficeLinux.conf
distro-configs/OxygenOfficeWindows.conf
diff --git a/distro-configs/FSFhuLinux.conf.in b/distro-configs/FSFhuLinux.conf.in
deleted file mode 100644
index 6969b4e..0000000
--- a/distro-configs/FSFhuLinux.conf.in
+++ /dev/null
@@ -1,36 +0,0 @@
---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-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-gnome-vfs
---enable-symbols
---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
---enable-minimizer
---enable-presenter-console
---enable-pdfimport
---enable-wiki-publisher
---enable-report-builder
---with-extension-integration
---with-myspell-dicts
---without-unix-wrapper
---without-junit
diff --git a/distro-configs/FSFhuMacOSX.conf.in b/distro-configs/FSFhuMacOSX.conf.in
deleted file mode 100644
index a4b9a72..0000000
--- a/distro-configs/FSFhuMacOSX.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
---with-intro-bitmaps=\"$TOOLSDIR/src/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
diff --git a/distro-configs/FSFhuWindows.conf.in b/distro-configs/FSFhuWindows.conf.in
deleted file mode 100644
index 7b9986e..0000000
--- a/distro-configs/FSFhuWindows.conf.in
+++ /dev/null
@@ -1,16 +0,0 @@
---with-intro-bitmaps=\"$TOOLSDIR/src/openintro_fsfhu.bmp\"
---with-vendor=\"FSF.hu AlapÃtvány\"
---disable-activex-component
---without-agfa-monotype-fonts
---with-magyarlinuxlibertine-fonts
---with-java-target-version=1.5
---disable-odk
---disable-xrender-link
---disable-layout
---with-extension-integration
---with-lang=\"hu\"
---enable-minimizer
---enable-presenter-console
---enable-pdfimport
---enable-wiki-publisher
---enable-report-builder
diff --git a/download.in b/download.in
index 8f9738f..4fcd86e 100755
--- a/download.in
+++ b/download.in
@@ -128,7 +128,7 @@ sub download_tests_dependencies() {
# Prebuilt dictionaries for Novell Windows builds
'writingaids.*\.zip' => '@MIRROR@/SRC680',
-# Prebuilt extension dictionaries for OxygenOffice and FSFhu builds
+# Prebuilt extension dictionaries for OxygenOffice builds
'extensionaids.*\.zip' => 'http://ftp.devall.hu/kami/go-oo/',
# FIXME: Hacky packinfo from setup_native; is needed in bootstrap for the split build
@@ -448,10 +448,10 @@ else
source_file( 'writingaids- at PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
source_file( 'writingaids-doc- at PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
-source_file( 'extensionaids- at PREBUILT_EXTENSIONAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOfficeLinux|OxygenOfficeWindows|FSFhu/;
+source_file( 'extensionaids- at PREBUILT_EXTENSIONAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOfficeLinux|OxygenOfficeWindows/;
# Magyar Linux Libertine fonts
-source_file( 'MagyarLinLibertine- at MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOffice|FSFhu/;
+source_file( 'MagyarLinLibertine- at MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOffice/;
if ('@CAIRO_ENABLED@' eq 'TRUE' && '@SYSTEM_CAIRO@' ne 'TRUE') {
source_file( 'cairo- at CAIRO_VER@.tar.gz' );
@@ -602,7 +602,6 @@ if ($distro eq 'ArchLinux' ||
$distro eq 'Slackware' ||
$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') {
source_file_ooo( "libs_extern_sys" ) if !$SPLIT;
}
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0948246..9c41a1d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -138,10 +138,6 @@ OxygenOfficeWin32Common : Common, Win32Only, NotDebian, LiberationFontsOnWindows
OxygenOfficeLinux: OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeLinuxOnly
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
-# FSFhu
-FSFhuWindows : Win32Common, FSFhuOnly, CustomUserConfig, LiberationFontsOnWindows, MagyarLinuxLibertineFonts
-FSFhuLinux : LinuxCommon, Shrink, CustomUserConfig, FSFhuOnly, LiberationFontsOnWindows
-FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig
# Plain build; just with base build fixes
PlainLinux: PlainBuildFixes
# Experimental crosscompile support
@@ -2855,18 +2851,6 @@ border-types-dotted-dashed.diff, fate#307731, fate 307730
# Better mapping of cell border thickness & inner padding.
calc-xls-import-cell-border.diff, n#636691, kohei
-[ FSFhuOnly ]
-SectionOwner => timar
-
-fsfhu-instset.diff
-fsfhu-splash.diff
-fsfhu-vendor-win32.diff
-fsfhu-win32-installer-branding.diff
-# Make CaptionOrderNumberingFirst true for Hungarian
-captionnumbering-hu.diff, i#110273, timar
-win32-gw-send-mail.diff, i#34264, n#418407, tml
-mail-document-subject.diff, n#459176
-
[ MagyarLinuxLibertineFonts ]
SectionOwner => timar
diff --git a/patches/dev300/fsfhu-instset.diff b/patches/dev300/fsfhu-instset.diff
deleted file mode 100644
index 23102e6..0000000
--- a/patches/dev300/fsfhu-instset.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- instsetoo_native/util/makefile.mk 30 Jul 2008 13:30:16 -0000 1.90.8.1
-+++ instsetoo_native/util/makefile.mk 29 Sep 2008 12:24:56 -0000
-@@ -102,9 +102,9 @@ ALLTAR : $(LOCALPYFILES)
- .ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
- .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
- .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
--ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
-+ALLTAR : openoffice_hu
- .ELSE
--ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
-+ALLTAR : openoffice_hu sdkoo_en-US ure_en-US
- .ENDIF
- .ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
- ALLTAR : updatepack
diff --git a/patches/dev300/fsfhu-revert-scp2-3layer-nicer-paths.diff b/patches/dev300/fsfhu-revert-scp2-3layer-nicer-paths.diff
deleted file mode 100644
index 1afedfb..0000000
--- a/patches/dev300/fsfhu-revert-scp2-3layer-nicer-paths.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
-index 5e29ab3..8d268c1 100644
---- scp2/source/ooo/common_brand.scp
-+++ scp2/source/ooo/common_brand.scp
-@@ -323,7 +323,7 @@ Unixlink gid_Brand_Unixlink_BasisLink
- // Styles = (LAYERLINK);
- Name = "basis-link";
- Dir = gid_Dir_Brand_Root;
-- Target = "basis${OOOBASEVERSION}";
-+ Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
- End
- #endif
-diff --git scp2/source/ooo/directory_ooo.scp scp2/source/ooo/directory_ooo.scp
-index 354f8c0..95f4c17 100644
---- scp2/source/ooo/directory_ooo.scp
-+++ scp2/source/ooo/directory_ooo.scp
-@@ -93,7 +93,7 @@ Directory gid_Dir_Ooo_Openofficeorg
- #ifdef WNT
- HostName = "${BASISROOTNAME}";
- #else
-- HostName = ".";
-+ HostName = "${UNIXBASISROOTNAME}";
- #endif
- End
- #endif
-diff --git scp2/source/ooo/ooo_brand.scp scp2/source/ooo/ooo_brand.scp
-index 663ce28..ecc87d2 100644
---- scp2/source/ooo/ooo_brand.scp
-+++ scp2/source/ooo/ooo_brand.scp
-@@ -36,7 +36,7 @@ Directory gid_Dir_Brand_Root
- #ifdef WNT
- HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
- #else
-- HostName = ".";
-+ HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
- #endif
- Styles = (OFFICEDIRECTORY);
- End
---- scp2/source/sdkoo/sdkoo.scp-old 2008-07-16 20:49:43.000000000 +0200
-+++ scp2/source/sdkoo/sdkoo.scp 2008-07-16 20:50:36.000000000 +0200
-@@ -55,7 +55,7 @@
- #ifdef WNT
- HostName = "${BASISROOTNAME}";
- #else
-- HostName = ".";
-+ HostName = "${UNIXBASISROOTNAME}";
- #endif
- End
- #endif
diff --git a/patches/dev300/fsfhu-splash.diff b/patches/dev300/fsfhu-splash.diff
deleted file mode 100644
index ff53f1e..0000000
--- a/patches/dev300/fsfhu-splash.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- instsetoo_native/util/openoffice.lst.old 2010-04-13 17:48:03.000000000 +0200
-+++ instsetoo_native/util/openoffice.lst 2010-04-14 17:29:11.000000000 +0200
-@@ -25,10 +25,10 @@ Globals
- POOLPRODUCT 1
- REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
- REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
-- PROGRESSBARCOLOR 14,133,205
-- PROGRESSSIZE 320,7
-- PROGRESSPOSITION 185,206
-- PROGRESSFRAMECOLOR 207,208,211
-+ PROGRESSBARCOLOR 14,133,206
-+ PROGRESSSIZE 280,7
-+ PROGRESSPOSITION 60,200
-+ PROGRESSFRAMECOLOR 207,208,212
- NATIVEPROGRESS true
- REGISTRYLAYERNAME Layers
- SERVICEPACK 1
diff --git a/patches/dev300/fsfhu-vendor-win32.diff b/patches/dev300/fsfhu-vendor-win32.diff
deleted file mode 100644
index 763cf7d..0000000
--- a/patches/dev300/fsfhu-vendor-win32.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- l10n/source/hu/localize.sdf 2010-04-23 21:13:50.939000000 +0200
-+++ l10n/source/hu/localize.sdf 2010-04-23 10:30:26.681000000 +0200
-@@ -49237,7 +49237,7 @@
- instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_121 0 hu Egy szinttel feljebb| 2002-02-02 02:02:02
- instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_122 0 hu < &Vissza 2002-02-02 02:02:02
- instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_123 0 hu Mégse 2002-02-02 02:02:02
--instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_124 0 hu A buildet a közösséggel együttműködésben az FSFhu készÃtette. A stáblista itt található: http://www.openoffice.org/welcome/credits.html 2002-02-02 02:02:02
-+instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_124 0 hu A buildet a közösséggel együttműködésben az FSF.hu AlapÃtvány készÃtette. A stáblista itt található: http://www.openoffice.org/welcome/credits.html 2002-02-02 02:02:02
- instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_125 0 hu &Tovább > 2002-02-02 02:02:02
- instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_126 0 hu {&TahomaBold10}Ãœdvözli az [ProductName] TelepÃtÅ‘je 2002-02-02 02:02:02
- instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_127 0 hu A TelepÃtÅ‘ telepÃteni fogja az [ProductName] alkalmazást a számÃtógépére. A folytatáshoz kattintson a Tovább gombra. 2002-02-02 02:02:02
diff --git a/patches/dev300/fsfhu-win32-installer-branding.diff b/patches/dev300/fsfhu-win32-installer-branding.diff
deleted file mode 100644
index 5dc1929..0000000
--- a/patches/dev300/fsfhu-win32-installer-branding.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- instsetoo_native/util/makefile.mk.old 2006-01-16 15:10:22.000000000 +0200
-+++ instsetoo_native/util/makefile.mk 2006-01-17 12:58:26.000000000 +0200
-@@ -408,9 +408,9 @@
- $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_fsfhu.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_fsfhu.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_fsfhu.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_fsfhu.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-
-
-
---- instsetoo_native/util/openoffice.lst.old 2010-05-13 07:59:38.161250000 +0200
-+++ instsetoo_native/util/openoffice.lst 2010-05-16 14:27:06.231375000 +0200
-@@ -91,7 +91,7 @@
- LIBRARYVERSION 9.3.0
- PATCHCODEFILE ooo_patchcodes.txt
- DOWNLOADBANNER ooobanner.bmp
-- DOWNLOADBITMAP ooobitmap.bmp
-+ DOWNLOADBITMAP ooobitmap_fsfhu.bmp
- DOWNLOADSETUPICO ooosetup.ico
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
-@@ -157,7 +157,7 @@
- PATCHCODEFILE ooo_patchcodes.txt
- JAVAPRODUCT 1
- DOWNLOADBANNER ooobanner.bmp
-- DOWNLOADBITMAP ooobitmap.bmp
-+ DOWNLOADBITMAP ooobitmap_fsfhu.bmp
- DOWNLOADSETUPICO ooosetup.ico
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
-@@ -228,7 +228,7 @@
- PATCHCODEFILE ooodev_patchcodes.txt
- CODEFILENAME codes_ooodev.txt
- DOWNLOADBANNER ooobanner.bmp
-- DOWNLOADBITMAP ooobitmap.bmp
-+ DOWNLOADBITMAP ooobitmap_fsfhu.bmp
- DOWNLOADSETUPICO ooosetup.ico
- LOCALUSERDIR $ORIGIN/..
- RELATIVE_PATHES_IN_DDF 1
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a6d7b7..1a2db09 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,9 +34,6 @@ EXTRA_DIST=\
openabout_translateorgza.png \
openintro_pld.bmp \
openabout_pld.bmp \
- openintro_fsfhu.bmp \
- nologoinstall_fsfhu.bmp \
- ooobitmap_fsfhu.bmp \
patchability-extras.zip \
sg3.sdg sg3.sdv sg3.thm \
sofficerc-upstream \
diff --git a/src/nologoinstall_fsfhu.bmp b/src/nologoinstall_fsfhu.bmp
deleted file mode 100755
index e09620d..0000000
Binary files a/src/nologoinstall_fsfhu.bmp and /dev/null differ
diff --git a/src/ooobitmap_fsfhu.bmp b/src/ooobitmap_fsfhu.bmp
deleted file mode 100755
index e875ab6..0000000
Binary files a/src/ooobitmap_fsfhu.bmp and /dev/null differ
diff --git a/src/openintro_fsfhu.bmp b/src/openintro_fsfhu.bmp
deleted file mode 100644
index 538e137..0000000
Binary files a/src/openintro_fsfhu.bmp and /dev/null differ
More information about the ooo-build-commit
mailing list