Commit graph

883 commits

Author SHA1 Message Date
Jan Holesovsky
a95376174e Merge commit 'libreoffice-3.4.2.3'
Conflicts:
	Makefile.in
	configure.in
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	set_soenv.in
	solenv/inc/minor.mk
2011-07-28 18:33:58 +02:00
Petr Mladek
f97edd0dbc bump product version to 3.4.2-rc3, release number to 203 2011-07-25 20:06:05 +02:00
Petr Mladek
0bd12a3f5f bump product version to 3.4.2-rc2, release number to 202 2011-07-19 15:46:22 +02:00
Petr Mladek
02772509b9 bump product version to 3.4.2-rc1, release number to 201 2011-07-12 13:14:24 +02:00
Fridrich Strba
115d15ace9 Build multi-lingual LO and SDK installers for Windows
From instsetoo_native-win32-packaging.diff in the build repo.

Signed-off-by: Tor Lillqvist <tlillqvist@novell.com>
2011-07-01 16:40:11 +03:00
Tor Lillqvist
ce31567afb Goodbye to CWS_WORK_STAMP 2011-07-01 15:37:03 +03:00
Tor Lillqvist
f975a503fc USE_PACKAGER is not set anywhere, so factor it out 2011-07-01 14:59:06 +03:00
Petr Mladek
d13971d27c bump product version to 3.5.0-alpha0, release number to 0 2011-06-23 14:45:23 +02:00
Jan Holesovsky
e3d5d7185d Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
	Makefile.in
	bootstrap.1
	configure.in
	solenv/inc/minor.mk
2011-06-17 13:44:18 +02:00
Christian Lohmaier
8fe135c7b9 don't complain about nonexisting directory building en-US only 2011-06-16 20:26:08 +02:00
Petr Mladek
e36ff0f1c8 bump product version to 3.4.1-rc1, release number to 101 2011-06-14 16:18:47 +02:00
Andras Timar
9d9634f264 fix Y coordinate in previous commit
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-06-13 12:48:21 +02:00
Andras Timar
9cd3cd1f60 fdo#36990 fix layout of MSI Custom Install dialog (esp. German)
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-06-13 12:48:09 +02:00
Andras Timar
89ddefa31d fix Y coordinate in previous commit 2011-06-07 20:28:21 +02:00
Andras Timar
8285640f58 fdo#36990 fix layout of MSI Custom Install dialog (esp. German) 2011-06-07 20:11:26 +02:00
Tor Lillqvist
64a5712e6f Drop %_EXT% which was always empty 2011-06-03 13:30:38 +03:00
Jan Holesovsky
07c1d34ec7 Merge commit 'libreoffice-3.4.0.2'
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-31 10:45:37 +02:00
Jan Holesovsky
ca907e0220 Merge remote-tracking branch 'origin/integration/dev300_m106'
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-27 20:39:04 +02:00
Petr Mladek
00a5e20188 bump product version to 3.4.0-rc2, release number to 12 2011-05-24 19:14:13 +02:00
Petr Mladek
4ba26e3dd2 bump product version to 3.4.0-rc1, release number to 11 2011-05-17 19:38:48 +02:00
Petr Mladek
949434f57e bump product version to 3.4.0-beta5, release number to 5 2011-05-10 18:03:46 +02:00
Petr Mladek
49eaf3b867 use build id for the release number also for deb packages
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-10 19:37:31 +02:00
Kalman Szalai - KAMI
b734a9a41a OxygenOffice progressbar 2011-05-09 11:00:52 +02:00
Kalman Szalai - KAMI
63b5cc9dc2 OxygenOffice progressbar 2011-05-09 10:59:19 +02:00
Kalman Szalai - KAMI
0d9ae1db55 Additional settings for OxygenOffice product 2011-05-09 10:49:54 +02:00
Kalman Szalai - KAMI
e654b65df1 Additional settings for OxygenOffice product 2011-05-08 23:00:44 +02:00
Petr Mladek
73a6f18a50 allow to install LO-3.3 and LO-3.4 in parallel on Linux (fdo#36551)
* rename the branding packages from libreoffice3 to libreoffice3.4
* move the default root dir from /opt/libreoffice to /opt/libreoffice3.4
2011-05-06 19:35:13 +02:00
Michael Meeks
a1d3641e9c install the new msgbox.py helper 2011-05-06 14:52:18 +01:00
Petr Mladek
643e82382d bump product version to 3.4.0-beta4, release number to 4 2011-05-03 20:00:22 +02:00
Tor Lillqvist
b6af8380db Remove BrOffice branding 2011-05-03 01:38:59 +03:00
Tor Lillqvist
a13f6922e8 Kill BrOffice artwork 2011-05-03 01:25:31 +03:00
Tor Lillqvist
76f8eb4681 "Lightweight" removal of BrOffice branding here in this branch 2011-05-02 16:33:46 +03:00
Andras Timar
140e2dc70c introducing --enable-release-build configure switch - fdo#36437
and default is dev build
2011-04-30 22:09:17 +02:00
Andras Timar
f4d3f06dc9 do not pack empty help packs 2011-04-29 16:41:42 +02:00
Andras Timar
0e20915091 do not pack empty help packs 2011-04-29 08:09:29 +02:00
Andras Timar
63e01f7408 do not pack JRE with LibreOffice_Dev 2011-04-27 20:31:54 +02:00
Petr Mladek
b23846d15e bump product version to 3.4.0-beta3, release number to 3 2011-04-26 17:08:19 +02:00
Tor Lillqvist
97bfc27b4b Kill BrOffice, fdo#36262 2011-04-26 14:27:20 +03:00
Jan Holesovsky
fc1e9f253d Merge branch 'DEV300_m106' into libreoffice-3-4
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-22 15:07:18 +02:00
Petr Mladek
c3bcb02fb8 bump product version to 3.4.0beta2, release number to 2 2011-04-19 18:13:06 +02:00
Andras Timar
e3861932fb remove unnecessary \r characters from en-US message 2011-04-19 15:02:01 +02:00
Petr Mladek
52d7f2fd88 set SHORT_PRODUCTEXTENSION to beta1 2011-04-11 16:19:54 +02:00
Petr Mladek
51c05e1cf9 Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
	instsetoo_native/util/openoffice.lst
	solenv/inc/minor.mk
2011-04-05 17:48:49 +02:00
Petr Mladek
586fc09447 bump product version to 3.3.2rc2, release number to 202 2011-04-05 16:52:52 +02:00
Andras Timar
e5858fef19 fix language codes: be-BY -> be, ns -> nso 2011-03-25 13:19:18 +01:00
Petr Mladek
d9aaf20177 set build depencencies against the new "translations" module 2011-03-25 12:13:50 +01:00
Jan Holesovsky
d1862bfe1a Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap 2011-03-23 17:13:20 +01:00
Jan Holesovsky
5f08d6e5a4 Merge commit 'ooo/DEV300_m103'
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-23 16:58:44 +01:00
Petr Mladek
4889cd73e7 build fix: find intro.zip when generating installation sets
intro.zip is not longer in the brand subdirectory
2011-03-22 17:58:51 +01:00
Vladimir Glazunov
8ac8e8624b CWS-TOOLING: integrate CWS native361 2011-03-21 17:59:11 +01:00