strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15501 commits 9 branches 795 tags 2.1 GiB
Commit graph

878 commits

Author SHA1 Message Date
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
Jan Holesovsky
61a4bf5a07 Merge remote-tracking branch 'origin/integration/dev300_m101' 
Conflicts:
	set_soenv.in
 2011-03-17 16:06:07 +01:00
Hanno Meyer-Thurow
ff33fd9d5d Merge Gentoo patches from old build and downstream repositories. 
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-14 18:47:10 +01:00
Norbert Thiebaud
f0e5895d5b Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 
* 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-08 19:43:29 -06:00
Petr Mladek
38319486b7 do not create OxygeOffice rpms for LibreOffice build 
there was a cut&paste problem in the previous commit
 2011-03-08 13:56:55 +01:00
Kalman Szalai - KAMI
642b89e8fe Introduce OxygenOffice as a product 2011-03-07 15:58:27 +01:00