summaryrefslogtreecommitdiff
path: root/instsetoo_native
AgeCommit message (Collapse)Author
2011-06-07fix Y coordinate in previous commitAndras Timar
2011-06-07fdo#36990 fix layout of MSI Custom Install dialog (esp. German)Andras Timar
2011-06-03Drop %_EXT% which was always emptyTor Lillqvist
2011-05-31Merge commit 'libreoffice-3.4.0.2'Jan Holesovsky
Conflicts: configure.in distro-configs/LibreOfficeMacOSX.conf distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf download instsetoo_native/util/openoffice.lst ooo.lst.in set_soenv.in solenv/bin/modules/installer/download.pm solenv/gbuild/CppunitTest.mk solenv/inc/minor.mk solenv/inc/settings.mk
2011-05-27Merge remote-tracking branch 'origin/integration/dev300_m106'Jan Holesovsky
Conflicts: Makefile.in Repository.mk autogen.sh bin/lo-commit-stat configure.in distro-configs/LibreOfficeOpenBSD.conf distro-configs/LibreOfficeWin32.conf instsetoo_native/util/openoffice.lst ooo.lst.in scp2/source/ooo/module_langpack.ulf set_soenv.in solenv/bin/ooinstall solenv/gbuild/CppunitTest.mk solenv/gbuild/Library.mk solenv/gbuild/LinkTarget.mk solenv/gbuild/TargetLocations.mk solenv/gbuild/platform/macosx.mk solenv/gbuild/platform/solaris.mk solenv/gbuild/platform/unxgcc.mk solenv/gbuild/platform/windows.mk solenv/inc/minor.mk solenv/inc/settings.mk tail_build/prj/makefile.mk
2011-05-24bump product version to 3.4.0-rc2, release number to 12Petr Mladek
2011-05-17bump product version to 3.4.0-rc1, release number to 11Petr Mladek
2011-05-10bump product version to 3.4.0-beta5, release number to 5Petr Mladek
2011-05-10use build id for the release number also for deb packagesPetr Mladek
I have just realised that deb packages used milestone as the release number; it is bumped only when we merge changes from OOo; so, we should use the build id that is used as the release number for rpms and windows build for a long time
2011-05-09OxygenOffice progressbarKalman Szalai - KAMI
2011-05-09OxygenOffice progressbarKalman Szalai - KAMI
2011-05-09Additional settings for OxygenOffice productKalman Szalai - KAMI
2011-05-08Additional settings for OxygenOffice productKalman Szalai - KAMI
2011-05-06allow to install LO-3.3 and LO-3.4 in parallel on Linux (fdo#36551)Petr Mladek
* rename the branding packages from libreoffice3 to libreoffice3.4 * move the default root dir from /opt/libreoffice to /opt/libreoffice3.4
2011-05-06install the new msgbox.py helperMichael Meeks
2011-05-03bump product version to 3.4.0-beta4, release number to 4Petr Mladek
2011-05-03Remove BrOffice brandingTor Lillqvist
2011-05-03Kill BrOffice artworkTor Lillqvist
2011-05-02"Lightweight" removal of BrOffice branding here in this branchTor Lillqvist
2011-04-30introducing --enable-release-build configure switch - fdo#36437Andras Timar
and default is dev build
2011-04-29do not pack empty help packsAndras Timar
2011-04-29do not pack empty help packsAndras Timar
2011-04-27do not pack JRE with LibreOffice_DevAndras Timar
2011-04-26bump product version to 3.4.0-beta3, release number to 3Petr Mladek
2011-04-26Kill BrOffice, fdo#36262Tor Lillqvist
2011-04-22Merge branch 'DEV300_m106' into libreoffice-3-4Jan Holesovsky
Conflicts: Module_ooo.mk Repository.mk configure configure.in ooo.lst scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/makefile.mk scp2/source/ooo/module_hidden_ooo.scp solenv/config/sdev300.ini solenv/config/ssolar.cmn solenv/gbuild/AllLangResTarget.mk solenv/gbuild/ComponentTarget.mk solenv/gbuild/CppunitTest.mk solenv/gbuild/Deliver.mk solenv/gbuild/JavaClassSet.mk solenv/gbuild/JunitTest.mk solenv/gbuild/Library.mk solenv/gbuild/LinkTarget.mk solenv/gbuild/Module.mk solenv/gbuild/Output.mk solenv/gbuild/SdiTarget.mk solenv/gbuild/TargetLocations.mk solenv/gbuild/gbuild.mk solenv/gbuild/platform/linux.mk solenv/gbuild/platform/macosx.mk solenv/gbuild/platform/solaris.mk solenv/gbuild/platform/windows.mk solenv/gbuild/platform/winmingw.mk solenv/inc/minor.mk
2011-04-19bump product version to 3.4.0beta2, release number to 2Petr Mladek
2011-04-19remove unnecessary \r characters from en-US messageAndras Timar
2011-04-11set SHORT_PRODUCTEXTENSION to beta1Petr Mladek
2011-04-05Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4Petr Mladek
Conflicts: instsetoo_native/util/openoffice.lst solenv/inc/minor.mk
2011-04-05bump product version to 3.3.2rc2, release number to 202Petr Mladek
2011-03-25fix language codes: be-BY -> be, ns -> nsoAndras Timar
2011-03-25set build depencencies against the new "translations" modulePetr Mladek
2011-03-23Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrapJan Holesovsky
2011-03-23Merge commit 'ooo/DEV300_m103'Jan Holesovsky
Conflicts: configure configure.in instsetoo_native/util/openoffice.lst set_soenv.in solenv/bin/cws.pl solenv/bin/modules/installer/simplepackage.pm solenv/gbuild/LinkTarget.mk solenv/gbuild/extensions/post_PackModule.mk solenv/gbuild/platform/linux.mk solenv/gbuild/platform/macosx.mk solenv/gbuild/platform/windows.mk solenv/inc/installationtest.mk solenv/inc/minor.mk soltools/cpp/_eval.c
2011-03-22build fix: find intro.zip when generating installation setsPetr Mladek
intro.zip is not longer in the brand subdirectory
2011-03-21CWS-TOOLING: integrate CWS native361Vladimir Glazunov
2011-03-17Merge remote-tracking branch 'origin/integration/dev300_m101'Jan Holesovsky
Conflicts: set_soenv.in
2011-03-14Merge Gentoo patches from old build and downstream repositories.Hanno Meyer-Thurow
1. Do not add compiler default include and library path: potentially build against different version of system library than requested by the user. 2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is available for more than two years. Noone cares, therefore rest in peace. Python2 is going to be ditched at some point. Simply do not fail then. Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it handled nowadays? 3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip 4. Add a configure option to search only in one place for JVMs, which is quite interesting for Linux Distributions. Enforce the user to place JVMs in one base directory. 5. Fix build for libxml-2.7.8 with ICU support. * config_office-XINC-XLIB-defaults.diff: (1) * disable-python.diff: (2) * gentoo-sandbox.diff: (3) * jvm-search-path.diff: (4) * libxmlsec_fix_extern_c.diff: (5)
2011-03-08Merge commit 'ooo/DEV300_m101' into integration/dev300_m101Norbert Thiebaud
* commit 'ooo/DEV300_m101': (500 commits) masterfix DEV300: #i10000# remove hard dep masterfix DEV300: #i10000# usage of L10N build_type masterfix DEV300: #i10000# usage of L10N build_type masterfix DEV300: #i100000# dep. fix masterfix DEV300: #i10000# removed one hard dep masterfix DEV300: #i10000# fixed patch handling masterfix DEV300: #i10000# new configure DEV300 masterfix DEV300: #i10000# nawk -> awk l10nmove: adjust repository handling l10nmove: fixed regex l10nmove: minor fixes l10nmove: add l10n repo to gb_REPOS DEV300 masterfix: gnumake3: subsequenttests requires in environment ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300 DEV300 masterfix: #i10000#: windows: more bizare hacks ... locales34: have a matching configure as well DEV300 locales34: back out change from autoreconf gnumake3: JunitTest.mk: bizarre hacks to make it work on windows ... Conflicts: configure configure.in instsetoo_native/prj/build.lst instsetoo_native/util/makefile.mk instsetoo_native/util/openoffice.lst instsetoo_native/util/pack.lst ooo.lst scp2/source/canvas/canvascommons.scp scp2/source/canvas/mtfrenderer.scp scp2/source/ooo/common_brand.scp scp2/source/ooo/directory_ooo.scp scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_ooo.scp scp2/source/ooo/makefile.mk scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_langpack.ulf scp2/source/ooo/ure.scp scp2/source/python/file_python.scp scp2/source/sdkoo/sdkoo.scp scp2/source/templates/module_langpack_accessories_templates.sct scp2/source/templates/module_langpack_accessories_templates_root.sct set_soenv.in soldep/bootstrp/appdef.cxx soldep/bootstrp/dep.cxx soldep/bootstrp/hashtbl.cxx soldep/bootstrp/makefile.mk soldep/bootstrp/minormk.cxx soldep/bootstrp/prj.cxx soldep/bootstrp/prodmap.cxx soldep/inc/dep.hxx soldep/inc/minormk.hxx soldep/inc/prodmap.hxx soldep/inc/soldep/appdef.hxx soldep/inc/soldep/connctr.hxx soldep/inc/soldep/depper.hxx soldep/inc/soldep/depwin.hxx soldep/inc/soldep/hashtbl.hxx soldep/inc/soldep/objwin.hxx soldep/inc/soldep/prj.hxx soldep/inc/soldep/sdtresid.hxx soldep/inc/soldep/soldep.hxx soldep/inc/soldep/soldlg.hxx soldep/inc/soldep/tbox.hxx soldep/prj/d.lst soldep/source/connctr.cxx soldep/source/depapp.hxx soldep/source/depper.cxx soldep/source/depwin.cxx soldep/source/makefile.mk soldep/source/objwin.cxx soldep/source/soldep.cxx soldep/source/soldlg.cxx soldep/source/soldlg.src soldep/source/tbox.cxx solenv/bin/build.pl solenv/bin/cws.pl solenv/bin/make_installer.pl solenv/bin/mhids.pl solenv/bin/modules/CwsConfig.pm solenv/bin/modules/RepositoryHelper.pm solenv/bin/modules/installer/regmerge.pm solenv/bin/modules/installer/scriptitems.pm solenv/bin/modules/installer/servicesfile.pm solenv/bin/modules/installer/simplepackage.pm solenv/bin/modules/installer/substfilenamefiles.pm solenv/config/ssolar.cmn solenv/inc/_tg_rslb.mk solenv/inc/extension_post.mk solenv/inc/libs.mk solenv/inc/minor.mk solenv/inc/postset.mk solenv/inc/settings.mk solenv/inc/tg_rslb.mk solenv/inc/unxlng.mk solenv/inc/wntmsc.mk soltools/HIDCompiler/hidclex.l stlport/prj/d.lst stlport/systemstlguards/postextstl.h
2011-03-08do not create OxygeOffice rpms for LibreOffice buildPetr Mladek
there was a cut&paste problem in the previous commit
2011-03-07Introduce OxygenOffice as a productKalman Szalai - KAMI
2011-03-07CWS-TOOLING: integrate CWS native364Ivo Hinkelmann
2011-03-07bump product version to 3.3.2rc1, release number to 201Petr Mladek
2011-02-22masterfix DEV300: #i10000# usage of L10N build_typeIvo Hinkelmann
2011-02-19I fixed this properly in libs-core/scriptingDavid Tardon
This reverts commit ba1da290bd44677bdf3576e6b3fcd02a102ed667.
2011-02-18Fix build of master without Python scripting.Jan Holesovsky
2011-02-17bump product version to 3.3.1rc2, release number to 8Petr Mladek
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-02-17bump product version to 3.3.1rc1, widnows build version to 6Petr Mladek
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-02-14native364: #i116893# new ure versionIngo Schmidt