[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 12 commits - instsetoo_native/util
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Apr 6 05:09:41 PDT 2011
instsetoo_native/util/makefile.mk | 41 +++++++++-
instsetoo_native/util/openoffice.lst | 141 ++++++++++++++++++++++++++++++++++-
2 files changed, 180 insertions(+), 2 deletions(-)
New commits:
commit 74fa8f56016d815d8f7c04786b5a6cc33d755150
Merge: db3b9f2... 6b2e030...
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 5 20:20:37 2011 +0200
Merge branch 'libreoffice-3-4' of ssh://git.freedesktop.org/git/libreoffice/bootstrap into libreoffice-3-4
commit db3b9f257d716239cb73fa6a1cd866b0c6ff771b
Merge: bd88391... 1492720...
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 5 17:48:49 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
instsetoo_native/util/openoffice.lst
solenv/inc/minor.mk
diff --cc instsetoo_native/util/makefile.mk
index d478d07,7951ff6..470d562
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@@ -293,9 -332,8 +332,9 @@@ openoffice
.ENDIF # "$(alllangiso)"!=""
+.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(LOCALPYFILES)"!=""
- $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+ $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
diff --cc instsetoo_native/util/openoffice.lst
index 0b3043c,ba63550..15288af
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@@ -4,9 -4,9 +4,9 @@@ Global
{
variables
{
- OOOBASEVERSION 3.3
- OOOPACKAGEVERSION 3.3.2
- UREPACKAGEVERSION 1.7.0
+ OOOBASEVERSION 3.4
- OOOPACKAGEVERSION 3.4.0
++ OOOPACKAGEVERSION 3.4.0
+ UREPACKAGEVERSION 3.4.0
URELAYERVERSION 1
BASISROOTNAME LibreOffice
UNIXBASISROOTNAME libreoffice
@@@ -389,6 -392,145 +389,145 @@@ LibreOffice_Dev_SD
active 1
compression 5
script sdkoo
- include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
+ include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
}
}
+
+ OxygenOffice
+ {
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OxygenOffice
+ PRODUCTNAME_BR OxygenOffice
+ PRODUCTVERSION 3.3
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION rc2
+ POSTVERSIONEXTENSION
+ POSTVERSIONEXTENSIONUNIX
+ BRANDPACKAGEVERSION 3
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.3.2
+ BASEPRODUCTVERSION 3.3
+ PCPFILENAME openoffice.pcp
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
+ REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+ ADDSYSTEMINTEGRATION 1
+ EVAL
+ FILEFORMATNAME OpenOffice.org
+ FILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ PACKAGEVERSION 3.3.2
+ PACKAGEREVISION {milestone}
+ LICENSENAME LGPL
+ SERVICESPROJEKT 1
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ OPENSOURCE 1
+ SETSTATICPATH 1
+ OOODOWNLOADNAME 1
+ XPDINSTALLER 0
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.3.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ DOWNLOADBANNER ooobanner_ooop.bmp
+ DOWNLOADBITMAP ooobitmap_ooop.bmp
+ DOWNLOADBANNER_BR ooobanner_ooop.bmp
+ DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
+ STARTCENTER_LAYOUT_STYLE 0
+ REGISTRATION_PRODUCT OxygenOffice
+ REGISTRATION_CID 926117
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname OOOP_{productversion}_{os}_install_{languages}
+ langpackdownloadname OOOP_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname OOOP_{productversion}_helppack_{os}_install_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
+ }
+ }
+
+ OxygenOffice_wJRE
+ {
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OxygenOffice
+ PRODUCTNAME_BR OxygenOffice
+ PRODUCTVERSION 3.3
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION rc2
+ POSTVERSIONEXTENSION
+ POSTVERSIONEXTENSIONUNIX
+ BRANDPACKAGEVERSION 3
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.3.2
+ BASEPRODUCTVERSION 3.3
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+ REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+ ADDSYSTEMINTEGRATION 1
+ EVAL
+ FILEFORMATNAME OpenOffice.org
+ FILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ PACKAGEVERSION 3.3.2
+ PACKAGEREVISION {milestone}
+ LICENSENAME LGPL
+ SERVICESPROJEKT 1
+ WITHJREPRODUCT 1
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ OPENSOURCE 1
+ SETSTATICPATH 1
+ OOODOWNLOADNAME 1
+ XPDINSTALLER 1
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.3.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ JAVAPRODUCT 1
+ DOWNLOADBANNER ooobanner_ooop.bmp
+ DOWNLOADBITMAP ooobitmap_ooop.bmp
+ DOWNLOADBANNER_BR ooobanner_ooop.bmp
+ DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
+ STARTCENTER_LAYOUT_STYLE 0
+ REGISTRATION_PRODUCT OxygenOffice
+ REGISTRATION_CID 926117
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
+ }
+ active 1
+ compression 5
+ script setup_osljre
+ downloadname OOOP_{productversion}_{os}_installwjre_{languages}
+ langpackdownloadname OOOP_{productversion}_languagepack_{os}_installwjre_{languages}
+ helppackdownloadname OOOP_{productversion}_helppack_{os}_installwjre_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
+ }
+ }
commit 1492720646d125b338fd341f756afdf78a145401
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Mar 15 17:40:07 2011 +0100
bump product version to 3.3.2rc2, release number to 202
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index e29898b..ba63550 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -126,7 +126,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -191,7 +191,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -269,7 +269,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -310,7 +310,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@@ -355,7 +355,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
@@ -407,7 +407,7 @@ OxygenOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -476,7 +476,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 1183fa2..7c2afe6 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m19(Build:201)
-BUILD=201
+RSCREVISION=330m19(Build:202)
+BUILD=202
LAST_MINOR=m19
SOURCEVERSION=OOO330
commit 4215649b045643e8153f2f26c79479aa81dd7e07
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Mar 8 15:31:08 2011 +0100
Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)
commit 7028491d34028c7fa3575a4b5ffa97a5653fa429
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Mar 8 13:56:55 2011 +0100
do not create OxygeOffice rpms for LibreOffice build
there was a cut&paste problem in the previous commit
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 02dd229..7951ff6 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -319,11 +319,11 @@ oxygenofficewithjre_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-ooolanguagepack_%{$(PKGFORMAT:^".")} :
+oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
-ooohelppack_%{$(PKGFORMAT:^".")} :
+oxygenofficehelppack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
.ELSE # "$(alllangiso)"!=""
commit d1cd295b211d0be02aa9c4bfc297e38c1d06a39d
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Mon Mar 7 07:14:00 2011 +0100
Introduce OxygenOffice as a product
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 2388d31..02dd229 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -147,6 +147,14 @@ brofficewithjre: $(foreach,i,$(alllangiso) brofficewithjre_$i)
broolanguagepack : $(foreach,i,$(alllangiso) broolanguagepack_$i)
+oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
+
+oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
+
+oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i)
+
+oxygenofficehelppack : $(foreach,i,$(alllangiso) oxygenofficehelppack_$i)
+
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
@@ -202,6 +210,14 @@ $(foreach,i,$(alllangiso) brofficewithjre_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) broolanguagepack_$i) : $(ADDDEPS)
+$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
+
.IF "$(MAKETARGETS)"!=""
$(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS)"!=""
@@ -287,6 +303,29 @@ $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
broolanguagepack_%{$(PKGFORMAT:^".")} :
+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+$(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
+.IF "$(MAKETARGETS)"!=""
+.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
+$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
+$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
+.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
+.ENDIF # "$(MAKETARGETS)"!=""
+oxygenoffice_%{$(PKGFORMAT:^".") .archive} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OxygenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+oxygenofficewithjre_%{$(PKGFORMAT:^".")} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+ooolanguagepack_%{$(PKGFORMAT:^".")} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
+ooohelppack_%{$(PKGFORMAT:^".")} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
+
.ELSE # "$(alllangiso)"!=""
openoffice:
@echo cannot pack nothing...
@@ -294,7 +333,7 @@ openoffice:
.ENDIF # "$(alllangiso)"!=""
.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index ecf6326..e29898b 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -395,3 +395,142 @@ LibreOffice_Dev_SDK
include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
}
}
+
+OxygenOffice
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OxygenOffice
+ PRODUCTNAME_BR OxygenOffice
+ PRODUCTVERSION 3.3
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta1
+ POSTVERSIONEXTENSION
+ POSTVERSIONEXTENSIONUNIX
+ BRANDPACKAGEVERSION 3
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.3.2
+ BASEPRODUCTVERSION 3.3
+ PCPFILENAME openoffice.pcp
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
+ REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+ ADDSYSTEMINTEGRATION 1
+ EVAL
+ FILEFORMATNAME OpenOffice.org
+ FILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ PACKAGEVERSION 3.3.2
+ PACKAGEREVISION {milestone}
+ LICENSENAME LGPL
+ SERVICESPROJEKT 1
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ OPENSOURCE 1
+ SETSTATICPATH 1
+ OOODOWNLOADNAME 1
+ XPDINSTALLER 0
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.3.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ DOWNLOADBANNER ooobanner_ooop.bmp
+ DOWNLOADBITMAP ooobitmap_ooop.bmp
+ DOWNLOADBANNER_BR ooobanner_ooop.bmp
+ DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
+ STARTCENTER_LAYOUT_STYLE 0
+ REGISTRATION_PRODUCT OxygenOffice
+ REGISTRATION_CID 926117
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname OOOP_{productversion}_{os}_install_{languages}
+ langpackdownloadname OOOP_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname OOOP_{productversion}_helppack_{os}_install_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
+ }
+}
+
+OxygenOffice_wJRE
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OxygenOffice
+ PRODUCTNAME_BR OxygenOffice
+ PRODUCTVERSION 3.3
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta1
+ POSTVERSIONEXTENSION
+ POSTVERSIONEXTENSIONUNIX
+ BRANDPACKAGEVERSION 3
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.3.2
+ BASEPRODUCTVERSION 3.3
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+ REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+ ADDSYSTEMINTEGRATION 1
+ EVAL
+ FILEFORMATNAME OpenOffice.org
+ FILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ PACKAGEVERSION 3.3.2
+ PACKAGEREVISION {milestone}
+ LICENSENAME LGPL
+ SERVICESPROJEKT 1
+ WITHJREPRODUCT 1
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ OPENSOURCE 1
+ SETSTATICPATH 1
+ OOODOWNLOADNAME 1
+ XPDINSTALLER 1
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.3.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ JAVAPRODUCT 1
+ DOWNLOADBANNER ooobanner_ooop.bmp
+ DOWNLOADBITMAP ooobitmap_ooop.bmp
+ DOWNLOADBANNER_BR ooobanner_ooop.bmp
+ DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
+ STARTCENTER_LAYOUT_STYLE 0
+ REGISTRATION_PRODUCT OxygenOffice
+ REGISTRATION_CID 926117
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
+ }
+ active 1
+ compression 5
+ script setup_osljre
+ downloadname OOOP_{productversion}_{os}_installwjre_{languages}
+ langpackdownloadname OOOP_{productversion}_languagepack_{os}_installwjre_{languages}
+ helppackdownloadname OOOP_{productversion}_helppack_{os}_installwjre_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
+ }
+}
commit ef7505a3338038cdb9c4bb653ca456e09cc97926
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Mar 7 12:12:18 2011 +0100
bump product version to 3.3.2rc1, release number to 201
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index c70448f..ecf6326 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
variables
{
OOOBASEVERSION 3.3
- OOOPACKAGEVERSION 3.3.1
+ OOOPACKAGEVERSION 3.3.2
UREPACKAGEVERSION 1.7.0
URELAYERVERSION 1
BASISROOTNAME LibreOffice
@@ -57,12 +57,12 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.1
+ ABOUTBOXPRODUCTVERSION 3.3.2
BASEPRODUCTVERSION 3.3
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -74,7 +74,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.1
+ PACKAGEVERSION 3.3.2
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -126,12 +126,12 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.1
+ ABOUTBOXPRODUCTVERSION 3.3.2
BASEPRODUCTVERSION 3.3
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -142,7 +142,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.1
+ PACKAGEVERSION 3.3.2
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -191,14 +191,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.1
+ ABOUTBOXPRODUCTVERSION 3.3.2
BASEPRODUCTVERSION 3.3
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX libobasis-dev
@@ -213,7 +213,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.1
+ PACKAGEVERSION 3.3.2
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -269,7 +269,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -310,11 +310,11 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.3.1
+ PACKAGEVERSION 3.3.2
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -355,13 +355,13 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.3.1
+ PACKAGEVERSION 3.3.2
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX libobasis-dev
UREPACKAGEPREFIX lodev
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index b539511..1183fa2 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m19(Build:8)
-BUILD=8
+RSCREVISION=330m19(Build:201)
+BUILD=201
LAST_MINOR=m19
SOURCEVERSION=OOO330
commit 27f27535d5e008e375c1d61a8bb25dea63c94ddf
Author: Andras Timar <timar at fsf.hu>
Date: Tue Feb 22 18:59:27 2011 +0100
l10n: add Breton spelling dictionary
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 0abcfc6..08bf8da 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -221,6 +221,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Af
DosName = "dict-af";
End
+Directory gid_Brand_Dir_Share_Extensions_Dict_Br
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "dict-br";
+End
+
Directory gid_Brand_Dir_Share_Extensions_Dict_Ca
ParentID = gid_Brand_Dir_Share_Extensions;
DosName = "dict-ca";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d33d2ff..5db2e8c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1913,6 +1913,15 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Br
+ Dir = gid_Brand_Dir_Share_Extensions_Dict_Br;
+ Name = "dict-br.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Ca
Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca;
Name = "dict-ca.oxt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 9118cd3..3142ac6 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -67,6 +67,17 @@ Module gid_Module_Root_Extension_Dictionary_Af
Styles = ();
End
+Module gid_Module_Root_Extension_Dictionary_Br
+ MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
+ Files = (gid_File_Extension_Dictionary_Br);
+ InstallOrder = "2000";
+ Sortkey = "515";
+ Spellcheckerlanguage = "br";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Dictionaries;
+ Styles = ();
+End
+
Module gid_Module_Root_Extension_Dictionary_Ca
MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CA );
Files = (gid_File_Extension_Dictionary_Ca);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 339d849..49219cf 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -55,6 +55,12 @@ en-US = "Afrikaans"
[STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
en-US = "Afrikaans spell checker"
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BR]
+en-US = "Breton spell checker"
+
[STR_NAME_MODULE_EXTENSION_DICTIONARY_CA]
en-US = "Catalan"
commit 2118de2768280e3cb4fb27f74a65211833f71155
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Feb 15 16:33:28 2011 +0100
bump product version to 3.3.1rc2, release number to 8
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 232ad78..c70448f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -126,7 +126,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -191,7 +191,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -269,7 +269,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -310,7 +310,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@@ -355,7 +355,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index dc03e46..b539511 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m19(Build:7)
-BUILD=7
+RSCREVISION=330m19(Build:8)
+BUILD=8
LAST_MINOR=m19
SOURCEVERSION=OOO330
commit 8df6667e9f53e8b006dff98004be5ecf71bab3ce
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Feb 8 15:36:06 2011 +0100
bump product version to 3.3.1rc1, widnows build version to 6
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 2ab17bf..232ad78 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
variables
{
OOOBASEVERSION 3.3
- OOOPACKAGEVERSION 3.3.0
+ OOOPACKAGEVERSION 3.3.1
UREPACKAGEVERSION 1.7.0
URELAYERVERSION 1
BASISROOTNAME LibreOffice
@@ -57,12 +57,12 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.0
+ ABOUTBOXPRODUCTVERSION 3.3.1
BASEPRODUCTVERSION 3.3
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -74,7 +74,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.0
+ PACKAGEVERSION 3.3.1
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -126,12 +126,12 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.0
+ ABOUTBOXPRODUCTVERSION 3.3.1
BASEPRODUCTVERSION 3.3
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -142,7 +142,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.0
+ PACKAGEVERSION 3.3.1
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -191,14 +191,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
+ SHORT_PRODUCTEXTENSION rc1
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.0
+ ABOUTBOXPRODUCTVERSION 3.3.1
BASEPRODUCTVERSION 3.3
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX libobasis-dev
@@ -213,7 +213,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.0
+ PACKAGEVERSION 3.3.1
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -269,7 +269,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
+ SHORT_PRODUCTEXTENSION rc1
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -310,11 +310,11 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.3.0
+ PACKAGEVERSION 3.3.1
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -355,13 +355,13 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
+ SHORT_PRODUCTEXTENSION rc1
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.3.0
+ PACKAGEVERSION 3.3.1
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX libobasis-dev
UREPACKAGEPREFIX lodev
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 3e2745f..dc03e46 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m19(Build:6)
-BUILD=6
+RSCREVISION=330m19(Build:7)
+BUILD=7
LAST_MINOR=m19
SOURCEVERSION=OOO330
commit b57fb0749c5011ac679bc92ffa3047ed70941b8d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon Feb 14 12:30:07 2011 +0100
multilingual sdk build targets
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 2befb3e..2388d31 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -365,5 +365,9 @@ openofficeall: hack_msitemplates $(LOCALPYFILES) openoffice_$(ALLLANGSTRING:s/ /
openofficedevall: hack_msitemplates $(LOCALPYFILES) openofficedev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+sdkooall: hack_msitemplates $(LOCALPYFILES) sdkoo_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+
+sdkoodevall: hack_msitemplates $(LOCALPYFILES) sdkoodev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+
.ENDIF # "$(OS)" == "WNT"
commit a4848e8cebe712f96f409f8687fc76cef22b640f
Author: Jesús Corrius <jesus at softcatala.org>
Date: Thu Feb 3 17:37:52 2011 +0100
fdo#33785: install mtfrenderer.uno.dll in the correct directory
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
old mode 100644
new mode 100755
index b8867ca..fa2a3f9
--- a/scp2/source/canvas/mtfrenderer.scp
+++ b/scp2/source/canvas/mtfrenderer.scp
@@ -31,7 +31,7 @@ File gid_File_Lib_MtfRenderer
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libmtfrenderer.uno,UNXSUFFIX));
#else
More information about the Libreoffice-commits
mailing list