[ooo-build-commit] .: 6 commits - patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 08:00:51 PDT 2010
patches/dev300/apply | 40 --
patches/dev300/extensions_configure.diff | 309 ----------------
patches/dev300/extensions_deliver.diff | 31 -
patches/dev300/extensions_packinfo.diff | 261 -------------
patches/dev300/premium-splitted-language-packages.diff | 111 -----
patches/dev300/scp2_accessories_templates.diff | 220 -----------
patches/dev300/scp2_accessories_templates_makefile.diff | 12
7 files changed, 14 insertions(+), 970 deletions(-)
New commits:
commit 62be7feee42c9c974765d43b3f07b7e42c8f1246
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 17:00:10 2010 +0200
The section IntegrateExtensions gone into git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 75d3534..3b5b977 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -108,7 +108,7 @@ Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, No
# openmamba
openmamba: LinuxCommon, GlobalDesktopFiles
#Gentoo
-GentooBase : LinuxCommon, GentooOnly, NotDebian, BerkeleyDB43, IntegrateExtensions
+GentooBase : LinuxCommon, GentooOnly, NotDebian, BerkeleyDB43
GentooUnstable: GentooBase, GentooExperimental
Gentoo : GentooBase
Gentoo64: GentooBase
@@ -126,34 +126,34 @@ translate-org-za-win32: translate-org-za-common, Win32Common, Common
NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, \
CustomUserConfig, LiberationFontsOnWindows
# Novell
-NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, IntegrateExtensions, NovellWin32WritingAids
+NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellEvaluation
-NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, IntegrateExtensions, NovellWin32WritingAids
+NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
# go-oo.org Win32
GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, GoOoSplash
# Mac OS X
MacOSX : MacOSXCommon, MacOSXOnly
-GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash
+GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
# Pardus
Pardus2007: PardusOnly, LinuxCommon, NotDebian
Pardus2008: PardusOnly, LinuxCommon, NotDebian
# Solaris
Solaris: NovellBase, UnstableExtensions
# Universal Upstream-like packages
-GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash
+GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
# OxygenOffice Professional
OxygenOfficeLinuxCommon : Common, EMFPlus, FontConfigTemporaryHacks, LinuxOnly, SystemBits, \
msaccess, OpenGLTransitions, Mono, AddressBooks, QuickStarter, KDE4,\
- GlobalNSPluginSupport, IntegrateExtensions, LiberationFontsOnWindows
-OxygenOfficeMacOSXCommon : Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows
-OxygenOfficeWin32Common : Common, Win32Only, NotDebian, IntegrateExtensions, LiberationFontsOnWindows
+ GlobalNSPluginSupport, LiberationFontsOnWindows
+OxygenOfficeMacOSXCommon : Common, SystemBits, LiberationFontsOnWindows
+OxygenOfficeWin32Common : Common, Win32Only, NotDebian, LiberationFontsOnWindows
OxygenOfficeLinux: OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeLinuxOnly
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
# FSFhu
-FSFhuWindows : Win32Common, FSFhuOnly, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions, MagyarLinuxLibertineFonts
-FSFhuLinux : LinuxCommon, Shrink, CustomUserConfig, FSFhuOnly, EMFPlus, LiberationFontsOnWindows, IntegrateExtensions
-FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions
+FSFhuWindows : Win32Common, FSFhuOnly, CustomUserConfig, LiberationFontsOnWindows, MagyarLinuxLibertineFonts
+FSFhuLinux : LinuxCommon, Shrink, CustomUserConfig, FSFhuOnly, EMFPlus, LiberationFontsOnWindows
+FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig
# Plain build; just with base build fixes
PlainLinux: PlainBuildFixes
# Experimental crosscompile support
@@ -2400,6 +2400,9 @@ icu-arm.diff, doko
svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
goodies-eps-filter-unix.diff, n#200053, rodo
+# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
+scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
+
[ EMFPlus ]
SectionOwner => rodo
emf+-cppcanvas-renderer.diff
@@ -2417,13 +2420,6 @@ emf+-embedded-mf-image.diff, rodo
vcl-pluggable-mtf-renderer.diff, thorsten
emf+-cppcanvas-input-validation.diff, thorsten
-[ IntegrateExtensions ]
-# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
-scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
-
-extensions_deliver.diff
-
-
[ CT2NBits ]
# ConvertTextToNumber extension build bits (fate#307906)
ct2n-build.diff, pmladek
@@ -2479,7 +2475,6 @@ scp2_directory_accessories.diff
scp2_makefile_accessories.diff
# Splitting new contents into new packages
-# NOTE: premium-splitted-language-packages.diff moved to IntegrateExtensions section, but it contains all required function for OOOP too.
premium-splitted-language-pack-solenv.diff
premium-splitted-packages.diff
diff --git a/patches/dev300/extensions_deliver.diff b/patches/dev300/extensions_deliver.diff
deleted file mode 100644
index 86c079b..0000000
--- a/patches/dev300/extensions_deliver.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- sdext/prj/d.lst.orig 2007-10-11 14:10:27.000000000 +0200
-+++ sdext/prj/d.lst 2008-04-01 22:11:56.000000000 +0200
-@@ -1,6 +1,9 @@
- mkdir: %_DEST%\bin%_EXT%\minimizer
- mkdir: %_DEST%\bin%_EXT%\presenter
- mkdir: %_DEST%\bin%_EXT%\pdfimport
-+..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\presentation-minimizer.oxt
-+..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter-screen.oxt
-+..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt
- ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
- ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
- ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
---- swext/prj/d.lst.orig 2007-10-11 14:10:27.000000000 +0200
-+++ swext/prj/d.lst 2008-04-01 22:11:56.000000000 +0200
-@@ -1,4 +1,5 @@
- mkdir: %_DEST%\bin%_EXT%\swext
- ..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\swext\wiki-publisher.oxt
-+..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\wiki-publisher.oxt
- ..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin%_EXT%\swext\mediawiki_develop.zip
-
---- extras/prj/d.lst.orig 2008-09-25 16:32:31.000000000 +0200
-+++ extras/prj/d.lst 2008-09-25 16:34:34.000000000 +0200
-@@ -4,6 +4,7 @@
- mkdir: %COMMON_DEST%\pck%_EXT%\openoffice
-
- ..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck%_EXT%\*.zip
-+..\source\extensions\*.oxt %COMMON_DEST%\bin%_EXT%\*.oxt
- ..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_ja.zip
- ..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_ko.zip
- ..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_zh-CN.zip
-
commit 90348255445111b4de5e1f8956200ea8783025ea
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 16:55:20 2010 +0200
scp2_accessories_templates_makefile.diff: migrate to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b168bd0..75d3534 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2421,8 +2421,6 @@ emf+-cppcanvas-input-validation.diff, thorsten
# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
-scp2_accessories_templates_makefile.diff
-
extensions_deliver.diff
diff --git a/patches/dev300/scp2_accessories_templates_makefile.diff b/patches/dev300/scp2_accessories_templates_makefile.diff
deleted file mode 100644
index fca3bd4..0000000
--- a/patches/dev300/scp2_accessories_templates_makefile.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- scp2/source/templates/makefile.mk
-+++ scp2/source/templates/makefile.mk
-@@ -44,7 +44,7 @@
- COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
- .EXPORT : COMPLETELANGISO_VAR
-
--ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
-+ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/alllangmodules_extensions_lightproof.inc
-
- .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
- .IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
-
commit 60d0fb19d35ab2e5ae2a65c9b8f4a6631bb863b6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 16:51:39 2010 +0200
scp2_accessories_templates.diff: Migrate to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b50c3d6..b168bd0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2421,7 +2421,6 @@ emf+-cppcanvas-input-validation.diff, thorsten
# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
-scp2_accessories_templates.diff
scp2_accessories_templates_makefile.diff
extensions_deliver.diff
diff --git a/patches/dev300/scp2_accessories_templates.diff b/patches/dev300/scp2_accessories_templates.diff
deleted file mode 100644
index 7c83e89..0000000
--- a/patches/dev300/scp2_accessories_templates.diff
+++ /dev/null
@@ -1,220 +0,0 @@
-diff -Naur scp2.old/source/templates/module_langpack_accessories_samples_root.sct scp2/source/templates/module_langpack_accessories_samples_root.sct
---- scp2.old/source/templates/module_langpack_accessories_samples_root.sct 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/templates/module_langpack_accessories_samples_root.sct 2008-12-19 15:05:02.000000000 +0100
-@@ -0,0 +1,56 @@
-+/*************************************************************************
-+*
-+ * 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
-+ *
-+ * $RCSfile: module_langpack_accessories_root.sct,v $
-+ * $Revision: 1.4 $
-+ *
-+ * 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.
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+Module gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>
-+ ParentID = gid_Module_Optional_Accessories_Advertisement;
-+ Sortkey = "<SORTKEY>";
-+ Language = "<LANGUAGE>";
-+ MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-+ Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-+End
-+
-+Module gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>
-+ ParentID = gid_Module_Optional_Accessories_Documentations;
-+ Sortkey = "<SORTKEY>";
-+ Language = "<LANGUAGE>";
-+ MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-+ Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-+End
-+
-+Module gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>
-+ ParentID = gid_Module_Optional_Accessories_Samples;
-+ Sortkey = "<SORTKEY>";
-+ Language = "<LANGUAGE>";
-+ MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-+ Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-+End
-+
-diff -Naur scp2.old/source/templates/module_langpack_accessories_samples.sct scp2/source/templates/module_langpack_accessories_samples.sct
---- scp2.old/source/templates/module_langpack_accessories_samples.sct 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/templates/module_langpack_accessories_samples.sct 2008-12-19 15:05:07.000000000 +0100
-@@ -0,0 +1,65 @@
-+/*************************************************************************
-+*
-+ * 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
-+ *
-+ * $RCSfile: module_langpack_accessories_samples.sct,v $
-+ * $Revision: 1.4 $
-+ *
-+ * 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.
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+Module gid_Module_Optional_Accessories_Adv_<LANGUAGE_>
-+ ParentID = gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>;
-+ Sortkey = "300";
-+ Language = "<LANGUAGE>";
-+ Assigns = gid_Module_Optional_Accessories_Adv_Template;
-+ Name = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
-+ Description = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
-+ PackageInfo = "packinfo_office_lang.txt";
-+ Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-+End
-+
-+Module gid_Module_Optional_Accessories_Doc_<LANGUAGE_>
-+ ParentID = gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>;
-+ Sortkey = "200";
-+ Language = "<LANGUAGE>";
-+ Assigns = gid_Module_Optional_Accessories_Doc_Template;
-+ Name = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
-+ Description = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
-+ PackageInfo = "packinfo_office_lang.txt";
-+ Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-+End
-+
-+Module gid_Module_Optional_Accessories_Sam_<LANGUAGE_>
-+ ParentID = gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>;
-+ Sortkey = "100";
-+ Language = "<LANGUAGE>";
-+ Assigns = gid_Module_Optional_Accessories_Sam_Template;
-+ Name = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
-+ Description = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
-+ PackageInfo = "packinfo_office_lang.txt";
-+ Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-+End
-+
-diff -Naur scp2.old/source/templates/module_langpack_accessories_templates_root.sct scp2/source/templates/module_langpack_accessories_templates_root.sct
---- scp2.old/source/templates/module_langpack_accessories_templates_root.sct 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/templates/module_langpack_accessories_templates_root.sct 2008-12-19 15:05:16.000000000 +0100
-@@ -0,0 +1,40 @@
-+/*************************************************************************
-+*
-+ * 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
-+ *
-+ * $RCSfile: module_langpack_accessories_root.sct,v $
-+ * $Revision: 1.4 $
-+ *
-+ * 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.
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+Module gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>
-+ ParentID = gid_Module_Optional_Accessories_Templates;
-+ Sortkey = "<SORTKEY>";
-+ Language = "<LANGUAGE>";
-+ MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-+ Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-+End
-+
-diff -Naur scp2.old/source/templates/module_langpack_accessories_templates.sct scp2/source/templates/module_langpack_accessories_templates.sct
---- scp2.old/source/templates/module_langpack_accessories_templates.sct 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/templates/module_langpack_accessories_templates.sct 2008-12-19 15:05:22.000000000 +0100
-@@ -0,0 +1,43 @@
-+/*************************************************************************
-+*
-+ * 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
-+ *
-+ * $RCSfile: module_langpack_accessories_templates.sct,v $
-+ * $Revision: 1.4 $
-+ *
-+ * 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.
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+Module gid_Module_Optional_Accessories_Tem_<LANGUAGE_>
-+ ParentID = gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>;
-+ Sortkey = "50";
-+ Language = "<LANGUAGE>";
-+ Assigns = gid_Module_Optional_Accessories_Tem_Template;
-+ Name = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
-+ Description = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
-+ PackageInfo = "packinfo_office_lang.txt";
-+ Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-+End
-+
commit e41cb1bb286c8cc0bc694e0983f882737e8ecf75
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 16:46:33 2010 +0200
premium-splitted-language-packages.diff: migrate to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 51bcc74..b50c3d6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2421,8 +2421,6 @@ emf+-cppcanvas-input-validation.diff, thorsten
# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
-# Originally, it was for OxygenOffice but the language depended Sun Templates Pack also require this changes
-premium-splitted-language-packages.diff
scp2_accessories_templates.diff
scp2_accessories_templates_makefile.diff
diff --git a/patches/dev300/premium-splitted-language-packages.diff b/patches/dev300/premium-splitted-language-packages.diff
deleted file mode 100644
index d7b0541..0000000
--- a/patches/dev300/premium-splitted-language-packages.diff
+++ /dev/null
@@ -1,111 +0,0 @@
---- setup_native/source/packinfo/packinfo_office_lang.txt.orig 2010-03-15 09:44:22.000000000 +0100
-+++ setup_native/source/packinfo/packinfo_office_lang.txt 2010-03-15 09:45:14.000000000 +0100
-@@ -207,3 +207,108 @@
- packageversion = "%OOOPACKAGEVERSION"
- pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"
- End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_Sun_T_Pack"
-+script = "shellscripts_extensions.txt"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-%LANGUAGESTRING"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-sun-templates-pack-%LANGUAGESTRING"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "SUN Template Pack (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%OOOPACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_LightProof_M"
-+script = "shellscripts_extensions.txt"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-lightproof-%LANGUAGESTRING"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-lightproof-%LANGUAGESTRING"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Lightproof (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%OOOPACKAGEVERSION"
-+End
-+
-+# Language depended package definitions for OxygenOffice Professional
-+
-+# 1/4 Templates
-+
-+Start
-+module = "gid_Module_Optional_Accessories_Tem"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-templates"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-templates"
-+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-templates"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-+copyright = "1999-2008 by %PRODUCTNAME"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "%PRODUCTNAME"
-+description = "Extra templates for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt"
-+packageversion = "%OOOPACKAGEVERSION"
-+End
-+
-+# 2/4 Samples
-+
-+Start
-+module = "gid_Module_Optional_Accessories_Sam"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-samples"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-samples"
-+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-samples"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-+copyright = "1999-2008 by %PRODUCTNAME"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "%PRODUCTNAME"
-+description = "Extra samples for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt"
-+packageversion = "%OOOPACKAGEVERSION"
-+End
-+
-+# 3/4 Documentations
-+
-+Start
-+module = "gid_Module_Optional_Accessories_Doc"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-documentations"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-documentations"
-+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-documentations"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-+copyright = "1999-2008 by %PRODUCTNAME"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "%PRODUCTNAME"
-+description = "Extra documentations for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt"
-+packageversion = "%OOOPACKAGEVERSION"
-+End
-+
-+# 4/4 Advertisement
-+
-+Start
-+module = "gid_Module_Optional_Accessories_Adv"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-advertisement"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-advertisement"
-+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-advertisement"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-+copyright = "1999-2008 by %PRODUCTNAME"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "%PRODUCTNAME"
-+description = "Extra advertisement for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt"
-+packageversion = "%OOOPACKAGEVERSION"
-+End
-+
-+# END OF Language depended package definitions for OxygenOffice Professional
-+
commit cc5e3f4e0288a4f5cd85621d74ed53830f6b9570
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 16:42:48 2010 +0200
extensions_packinfo.diff: Migrate to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 44e3e75..51bcc74 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2421,7 +2421,6 @@ emf+-cppcanvas-input-validation.diff, thorsten
# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
-extensions_packinfo.diff
# Originally, it was for OxygenOffice but the language depended Sun Templates Pack also require this changes
premium-splitted-language-packages.diff
scp2_accessories_templates.diff
diff --git a/patches/dev300/extensions_packinfo.diff b/patches/dev300/extensions_packinfo.diff
deleted file mode 100644
index 78843df..0000000
--- a/patches/dev300/extensions_packinfo.diff
+++ /dev/null
@@ -1,261 +0,0 @@
---- setup_native/source/packinfo/packinfo_extensions.txt 2008-06-06 22:36:48.000000000 +0200
-+++ setup_native/source/packinfo/packinfo_extensions.txt 2010-03-08 20:27:56.000000000 +0100
-@@ -0,0 +1,258 @@
-+# Format:
-+
-+# Start
-+# scpModule
-+# shellscript file (optional)
-+# solarispackagename
-+# solarisrequires (optional)
-+# solarisprovides (optional)
-+# packagename
-+# linuxreplaces (optional)
-+# requires (optional)
-+# provides (optional)
-+# copyright
-+# vendor
-+# description
-+# destpath
-+# End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_MINIMIZER"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presentation-minimizer"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presentation-minimizer"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Presentation Minimizer extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_REPORTDESIGN"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-report-builder"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-report-builder"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Report Builder extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_MEDIAWIKI"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mediawiki-publisher"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mediawiki-publisher"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "MediaWiki publisher extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_PRESENTER_SCREEN"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presenter-screen"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presenter-screen"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Presenter Screen extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_PDFIMPORT"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-pdf-import"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-pdf-import"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "PDF import extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_LightProof"
-+script = "shellscripts_extensions.txt"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-lightproof"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-lightproof"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2009 by FSF.hu"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Lightproof extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_NumberText"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-numbertext"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-numbertext"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2009 by FSF.hu"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Numbertext extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_HunArt"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-hunart"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-hunart"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2009 by FSF.hu"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Hungarian Cross-reference Toolbar extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_Typo"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-typo"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-typo"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2010 by FSF.hu"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Typography Toolbar extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_CT2N"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-ct2n"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-ct2n"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "Copyright (c) 2008 Cor Nouws"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "ConvertTextToNumber extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_Watch_Window"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-watch-window"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-watch-window"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2009 by Tibor Hornyák"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Watch Window extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_Google_Docs"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-google-docs"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-google-docs"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2009 by Przemyslaw Rumik"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Google Docs extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_NLPSolver"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-nlpsolver"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-nlpsolver"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2009 by Sun Microsystems, Inc."
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "NLPSolver extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_LanguageTool"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-languagetool"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-languagetool"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2005-2009 by Daniel Naber"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "LanguageTool extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_MySQLConnector"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mysql-connector"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mysql-connector"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2008 by Sun Mcrosystems, Inc."
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+module = "gid_Module_Optional_Extensions_OOoBlogger"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-oooblogger"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-oooblogger"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2005 by Caolan McNamara"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "oooblogger extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
commit b4a2d2dfd83392cd84a7536dd27fdd8e37d83e5b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 16:39:02 2010 +0200
extensions_configure.diff: migrate to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index dd55dd6..44e3e75 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2421,7 +2421,6 @@ emf+-cppcanvas-input-validation.diff, thorsten
# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
-extensions_configure.diff
extensions_packinfo.diff
# Originally, it was for OxygenOffice but the language depended Sun Templates Pack also require this changes
premium-splitted-language-packages.diff
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
deleted file mode 100644
index 051eb1c..0000000
--- a/patches/dev300/extensions_configure.diff
+++ /dev/null
@@ -1,309 +0,0 @@
---- configure.in.old 2010-02-02 12:49:41.000000000 +0100
-+++ configure.in 2010-03-08 20:34:21.000000000 +0100
-@@ -71,6 +71,13 @@ AC_ARG_ENABLE(mozilla,
- binary for your platform, to build without this
- version, use this option.
- ],,enable_mozilla="yes")
-+
-+AC_ARG_WITH(extension-integration,
-+[
-+ --with-extension-integration It will integrate the builded extensions
-+ to the installer of the product.],
-+,)
-+
- AC_ARG_WITH(fonts,
- [ --without-fonts OOo includes some third-party fonts to provide a reliable
- basis for help content, templates, samples, etc.
-@@ -797,6 +804,51 @@ AC_ARG_WITH(alloc,
-
- Note that on FreeBSD/NetBSD system==jemalloc
- ],,)
-+AC_ARG_WITH(sun-templates,
-+[
-+ --with-sun-templates Integrate Sun template packages.],
-+,)
-+
-+AC_ARG_WITH(lightproof,
-+[
-+ --with-lightproof Integrate Lightproof extension],
-+,)
-+
-+AC_ARG_WITH(numbertext,
-+[
-+ --with-numbertext Integrate Numbertext extension],
-+,)
-+
-+AC_ARG_WITH(hunart,
-+[
-+ --with-hunart Integrate Hungarian Cross-reference Toolbar extension],
-+,)
-+
-+AC_ARG_WITH(typo,
-+[
-+ --with-typo Integrate Typography Toolbar extension],
-+,)
-+
-+AC_ARG_WITH(watch-window,
-+[
-+ --with-watch-window Integrate Watch Window extension to Calc],
-+,)
-+
-+AC_ARG_WITH(google-docs,
-+[
-+ --with-google-docs Download and integrate Google Documents extension.],
-+,)
-+
-+AC_ARG_WITH(nlpsolver,
-+[
-+ --with-nlpsolver Download and integrate NLPSolver extension.],
-+,)
-+
-+AC_ARG_WITH(oooblogger,
-+[
-+ --with-oooblogger Download and integrate oooblogger extension.],
-+,)
-+
- AC_ARG_ENABLE(verbose,
- [ --enable-verbose Increase build verbosity.
- --disable-verbose Decrease build verbosity.
-@@ -3960,6 +4172,9 @@
- AC_SUBST(ENABLE_MYSQLC)
-
- if test "$ENABLE_MYSQLC" = "YES"; then
-+
-+SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MYSQLC"
-+
- dnl ===================================================================
- dnl Check for system MySQL
- dnl ===================================================================
-@@ -5638,6 +5680,7 @@ if test -n "$enable_minimizer" -a "$enab
- else
- AC_MSG_RESULT([no])
- ENABLE_MINIMIZER=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
- fi
- AC_SUBST(ENABLE_MINIMIZER)
-
-@@ -5648,6 +5691,7 @@ if test -n "$enable_presenter_console" -
- else
- AC_MSG_RESULT([no])
- ENABLE_PRESENTER_SCREEN=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PRESENTER_SCREEN"
- fi
- AC_SUBST(ENABLE_PRESENTER_SCREEN)
-
-@@ -5679,6 +5723,7 @@ if test -n "$enable_pdfimport" -a "$enab
- else
- AC_MSG_RESULT([no])
- ENABLE_PDFIMPORT=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
- fi
- AC_SUBST(ENABLE_PDFIMPORT)
- AC_SUBST(SYSTEM_POPPLER)
-@@ -5709,6 +5754,7 @@ if test -n "$enable_wiki_publisher" -a "
- else
- AC_MSG_RESULT([no])
- ENABLE_MEDIAWIKI=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
- fi
- AC_SUBST(ENABLE_MEDIAWIKI)
-
-@@ -5917,6 +5963,7 @@ if test -n "$enable_report_builder" -a "
- else
- AC_MSG_RESULT([no])
- ENABLE_REPORTBUILDER=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_REPORTDESIGN"
- SYSTEM_JFREEREPORT=NO
- fi
- AC_SUBST(ENABLE_REPORTBUILDER)
-@@ -6609,6 +6644,190 @@ else
- fi
-
- dnl ===================================================================
-+dnl Test whether to integrate extensions into the product's installer
-+dnl ===================================================================
-+AC_MSG_CHECKING([for extensions intergration])
-+if test "z$with_extension_integration" = "z" -o "z$with_extension_integration" = "zno" ; then
-+ WITH_EXTENSION_INTEGRATION=NO
-+ AC_MSG_RESULT([no integration])
-+else
-+ WITH_EXTENSION_INTEGRATION=YES
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_INTEGRATION"
-+ AC_MSG_RESULT([integration])
-+fi
-+AC_SUBST(WITH_EXTENSION_INTEGRATION)
-+
-+dnl ===================================================================
-+dnl Test whether to include Lightproof extensions
-+dnl ===================================================================
-+AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)])
-+if test "z$with_lightproof" = "z" -o "z$with_lightproof" = "zno" ; then
-+ LIGHTPROOF_LANG=""
-+ AC_MSG_RESULT([no integration])
-+else
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
-+ lightproof_supported_langs="hu"
-+ if test "z$with_lightproof" = "zyes" ; then
-+ wanted_lightproof="$lightproof_supported_langs"
-+ else
-+ # check whether the langs are supported by Lightproof
-+ wanted_lightproof=
-+ for lang in $with_lightproof ; do
-+ if test -n "`echo $lightproof_supported_langs | grep "$lang"`" ; then
-+ wanted_lightproof="$wanted_lightproof $lang"
-+ fi
-+ done
-+ fi
-+ LIGHTPROOF_LANG=
-+ # check whether the langs are requested at all
-+ for lang in $wanted_lightproof ; do
-+ if test -n "`echo $with_lang | grep "$lang"`" ; then
-+ LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
-+ fi
-+ done
-+ AC_MSG_RESULT([$LIGHTPROOF_LANG])
-+fi
-+AC_SUBST(LIGHTPROOF_LANG)
-+
-+dnl ===================================================================
-+dnl Test whether to include Watch Window extension
-+dnl ===================================================================
-+AC_MSG_CHECKING([for Watch Window extension integration])
-+if test "z$with_watch_window" = "z" -o "z$with_watch_window" = "zno" ; then
-+ AC_MSG_RESULT([no])
-+else
-+ AC_MSG_RESULT([yes])
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
-+fi
-+AC_SUBST(WITH_WATCH_WINDOW_EXTENSION)
-+
-+dnl ===================================================================
-+dnl Test whether to include ConvertTextToNumber extension
-+dnl ===================================================================
-+AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
-+if test "z$with_ct2n" = "z" -o "z$with_ct2n" = "zno" ; then
-+ AC_MSG_RESULT([no])
-+else
-+ AC_MSG_RESULT([yes])
-+ BUILD_TYPE="$BUILD_TYPE CT2N"
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
-+fi
-+
-+dnl ===================================================================
-+dnl Test whether to include Numbertext extension
-+dnl ===================================================================
-+AC_MSG_CHECKING([for Numbertext extension integration])
-+if test "z$with_numbertext" = "z" -o "z$with_numbertext" = "zno" ; then
-+ AC_MSG_RESULT([no])
-+else
-+ AC_MSG_RESULT([yes])
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
-+fi
-+AC_SUBST(WITH_NUMBERTEXT_EXTENSION)
-+
-+dnl ===================================================================
-+dnl Test whether to include Hungarian Cross-reference Toolbar extension
-+dnl ===================================================================
-+AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
-+if test "z$with_hunart" = "z" -o "z$with_hunart" = "zno" ; then
-+ AC_MSG_RESULT([no])
-+else
-+ AC_MSG_RESULT([yes])
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
-+fi
-+AC_SUBST(WITH_HUNART_EXTENSION)
-+
-+dnl ===================================================================
-+dnl Test whether to include Typography Toolbar extension
-+dnl ===================================================================
-+AC_MSG_CHECKING([for Typography Toolbar extension integration])
-+if test "z$with_typo" = "z" -o "z$with_typo" = "zno" ; then
-+ AC_MSG_RESULT([no])
-+else
-+ AC_MSG_RESULT([yes])
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
-+fi
-+AC_SUBST(WITH_TYPO_EXTENSION)
-+
-+dnl ===================================================================
-+dnl Test whether to include Google Docs extension
-+dnl ===================================================================
-+AC_MSG_CHECKING([for Google Docs extension integration])
-+if test "z$with_google_docs" = "z" -o "z$with_google_docs" = "zno" ; then
-+ AC_MSG_RESULT([no])
-+else
-+ AC_MSG_RESULT([yes])
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
-+fi
-+
-+dnl ===================================================================
-+dnl Test whether to include NLPSolver extension
-+dnl ===================================================================
-+AC_MSG_CHECKING([for NLPSolver extension integration])
-+if test "z$with_nlpsolver" = "z" -o "z$with_nlpsolver" = "zno" ; then
-+ AC_MSG_RESULT([no])
-+else
-+ AC_MSG_RESULT([yes])
-+ BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
-+fi
-+
-+dnl ===================================================================
-+dnl Test whether to include LanguageTool extension
-+dnl ===================================================================
-+AC_MSG_CHECKING([for LanguageTool extension integration])
-+if test "z$with_languagetool" = "z" -o "z$with_languagetool" = "zno" ; then
-+ AC_MSG_RESULT([no])
-+else
-+ AC_MSG_RESULT([yes])
-+ BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
-+fi
-+
-+dnl ===================================================================
-+dnl Test whether to include oooblogger extension
-+dnl ===================================================================
-+AC_MSG_CHECKING([for oooblogger extension integration])
-+if test "z$with_oooblogger" = "z" -o "z$with_oooblogger" = "zno" ; then
-+ AC_MSG_RESULT([no])
-+else
-+ AC_MSG_RESULT([yes])
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
-+fi
-+
-+dnl ===================================================================
-+dnl Test whether to include Sun Professinal Template Pack
-+dnl ===================================================================
-+AC_MSG_CHECKING([for Sun Professinal Template Pack integration (only supported languages displayed)])
-+if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
-+ SUNTEMPLATES_LANG=""
-+ AC_MSG_RESULT([no integration])
-+else
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_SUN_TEMPLATE_PACK"
-+ sun_supported_langs="en-US de it fr es hu"
-+ if test "z$with_sun_templates" = "zyes" ; then
-+ wanted_sun_templates="$sun_supported_langs"
-+ else
-+ # check whether the langs are supported by Sun
-+ wanted_sun_templates=
-+ for lang in $with_sun_templates ; do
-+ if test -n "`echo $sun_supported_langs | grep "$lang"`" ; then
-+ wanted_sun_templates="$wanted_sun_templates $lang"
-+ fi
-+ done
-+ fi
-+ SUNTEMPLATES_LANG=
-+ # check whether the langs are requested at all
-+ for lang in $wanted_sun_templates ; do
-+ if test -n "`echo $with_lang | grep "$lang"`" ; then
-+ SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
-+ fi
-+ done
-+ AC_MSG_RESULT([$SUNTEMPLATES_LANG])
-+fi
-+AC_SUBST(SUNTEMPLATES_LANG)
-+
-+dnl ===================================================================
- dnl Test whether to include fonts
- dnl ===================================================================
- AC_MSG_CHECKING([whether to include third-party fonts])
More information about the ooo-build-commit
mailing list