Commit graph

3237 commits

Author SHA1 Message Date
Andras Timar
a2568d4e99 pack binfilter resources together with other binfilter files 2011-07-17 14:30:52 +02:00
Matus Kukan
422dbb5e22 Remove productregistration.jar library related code 2011-07-07 09:46:11 +02:00
Matus Kukan
4846f0d120 Remove preload library related code 2011-07-07 09:40:03 +02:00
Miklos Vajna
d1ed8366af Merge remote-tracking branch 'feature/gsoc2011_rtfimport' 2011-07-02 00:21:16 +02:00
Tor Lillqvist
2cf6cd66a2 We build a static libpixman on Windows, it seems 2011-07-01 11:18:53 +03:00
Caolán McNamara
4e674ab45b make cairo an unconditional requirement for text rendering 2011-06-30 11:32:27 +01:00
Miklos Vajna
fdb6813861 Merge remote-tracking branch 'origin/master' 2011-06-25 01:51:04 +02:00
Petr Mladek
3a6cd71834 install dbgtrace helper file for the the new --backtrace option
see the related changes in libs-core/desktop
2011-06-22 14:51:59 +02:00
Bjoern Michaelsen
182b970b81 gnumake4: adjust scp2 to gbuild 2011-06-22 14:33:53 +02:00
Bjoern Michaelsen
81a1c065fd Merge branch 'master' into feature/gnumake4
Conflicts:
	Repository.mk
	RepositoryFixes.mk
	configure
	configure.in
	set_soenv.in
	solenv/config/sdev300.ini
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/CustomTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/JavaClassSet.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/StaticLibrary.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/gbuild/templates/Executable.mk
	solenv/gbuild/templates/Library.mk
	solenv/inc/libs.mk
	solenv/inc/unxobsd.mk
2011-06-19 11:36:52 +02:00
Michael Stahl
26561e4cee gnumake4: dbaccess: rename stuff so it builds again... [hg:6a688d53e64f] 2011-06-17 18:28:06 +02:00
Philipp Lohmann [pl]
54c611fa45 ooo340fixes: #i117804# differentiate between ENABLE_CAIRO and ENABLE_CAIRO_CANVAS [hg:e09be3339384] 2011-06-17 13:51:41 +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
Jan Holesovsky
d75defa37f Make the online update service configurable (via --enable-online-update).
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-06-17 11:45:12 +02:00
Mathias Bauer
7fce16f0ff CWS gnumake4: convert sax to new build system [hg:389d236eb6b2] 2011-06-17 01:01:09 +02:00
Tor Lillqvist
457c2602bd Mark setup_native and l10ntools as DESKTOP 2011-06-16 21:47:33 +03:00
Mathias Bauer
93b6f9cf29 CWS gnumake4: convert regexp to new build system [hg:56e4316f8d74] 2011-06-16 13:40:39 +02:00
Francois Tigeot
0ac9ee757c Disable Adabas D database driver 2011-06-14 23:55:10 +02:00
Michael Meeks
585cf00348 add missing compile conditional for gtk3 installation 2011-06-14 16:44:32 +01:00
Michael Meeks
5ad60c5d69 more configure, and scp2 pieces for gtk3 integration 2011-06-14 16:30:20 +01:00
Fridrich Štrba
e16b11c181 Some more w4w mentions gone 2011-06-14 12:13:46 +02:00
Caolán McNamara
ac41a4d5f2 gbuildize hwpfilter 2011-06-14 09:53:54 +01:00
Kalman Szalai - KAMI
a0e2d247b7 move default language independent layout templates
from /share/template
to   /share/template/common

Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-06-07 21:52:54 +02:00
Christian Lohmaier
16d69d1dc1 allow to build with internal Python on Mac (Python built as framework) 2011-06-06 20:11:25 +02:00
Fridrich Štrba
f35848e9f5 package the dummy visio importer 2011-06-06 12:53:38 +02:00
Kalman Szalai - KAMI
d41dd4364d move default language independent layout templates
from /share/template
to   /share/template/common
2011-06-04 13:30:37 +02:00
Tor Lillqvist
0f12f0b5b2 Match the change in GLib DLL names 2011-06-03 14:09:57 +03:00
Tor Lillqvist
be75a8b05c Match the change in Pango DLL names 2011-06-03 14:06:07 +03:00
Tor Lillqvist
64a5712e6f Drop %_EXT% which was always empty 2011-06-03 13:30:38 +03:00
Caolán McNamara
c7535fdb46 split ctl sequence check defaults from ctl defaults 2011-06-03 09:38:56 +01:00
Tor Lillqvist
d6f134a32c Define ENABLE_LIBRSVG for the scp processing if ENABLE_LIBRSVG is INTERNAL 2011-06-02 01:05:55 +03:00
Takeshi Abe
699a577ae4 fdo#32263
use $HOME/.config unless XDG_CONFIG_HOME is set with respect to
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
moreover, lose dot so as "$HOME/.config/libreoffice".
2011-05-31 11:20:30 +01: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
Christian Lohmaier
7ba95eda2b pixman is built as static lib on Mac 2011-05-29 18:20:57 +02:00
Norbert Thiebaud
5b9b3e9107 make librsvg a conditional 2011-05-28 05:30:11 -05: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
Miklos Vajna
4480e93ddb Install rtftok library 2011-05-24 17:28:08 +02:00
Tor Lillqvist
5805734abe Don't ship rebaseoo.exe and rebasegui.exe, fdo#36679
These are completely useless executables, and some virus scanners
thinks one of them is infected, so why even ship them...

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-05-12 12:27:50 +02:00
Kalman Szalai - KAMI
c6b0efb648 Fix SUN Template extension configure, download, handling
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-05-12 12:22:35 +02:00
Kalman Szalai - KAMI
b04faf6398 Fix Ligthproof extension integration
* Fix configure and download support
* Extension naming scheme is: <md5>-<extension-name>_<version>.oxt
  - Renamed extensions
* Rename extension version number in download script and scp2 module

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-05-12 12:22:13 +02:00
Tor Lillqvist
1f19cae182 Don't ship rebaseoo.exe and rebasegui.exe, fdo#36679
These are completely useless executables, and some virus scanners
thinks one of them is infected, so why even ship them...
2011-05-12 10:27:34 +03:00
Andras Timar
d97e4098dc Missing bundled English dictionary extension dict-en - fdo#36926 2011-05-08 17:37:27 +02:00
Kalman Szalai - KAMI
9b756202ad Fix SUN Template extension configure, download, handling 2011-05-08 11:14:57 +02:00
Kalman Szalai - KAMI
68b8377eab Fix Ligthproof extension integration
* Fix configure and download support
* Extension naming scheme is: <md5>-<extension-name>_<version>.oxt
  - Renamed extensions
* Rename extension version number in download script and scp2 module
2011-05-08 10:25:25 +02:00
Joseph Powers
b53a86a567 Mac OS X uses .dylib and not .so for python modules.
At least this works better on my system.
2011-05-07 17:56:38 -07:00
Joseph Powers
8c81266fba Add /instsetoo_native to .gitignore 2011-05-07 17:39:13 -07:00
Michael Meeks
a1d3641e9c install the new msgbox.py helper 2011-05-06 14:52:18 +01:00
Michael Meeks
00e5536f42 don't distribute pagein - it is linked into oosplash.bin nowadays 2011-05-04 20:32:31 +01:00
Kalman Szalai - KAMI
fcffdd382b Remove already integrated fonts from extra fonts 2011-05-04 04:56:38 +02:00
Michael Meeks
fc9237d5f6 move all of the gnome and gtk+ related pieces into the -gnome sub package 2011-05-03 21:32:55 +01:00
Petr Mladek
95150a197d writerfilter-module-writer.diff: put libwriterfilter into writer package 2011-04-27 17:27:31 +02:00
Andras Timar
f3abf31526 modify/delete wordbook files for good
* extras/source/wordbook/lang/*/soffice.dic: deleted
  These files were in old binary format and almost all
  language files were replicas of the en-US file. There
  were two exceptions: German and Slovenian. André Schnabel
  checked the German word list and he said that they can be
  deleted. Martin Srebotnjak checked the Slovenian word list
  and he asked me to keep those words -> sl.dic
* extras/source/wordbook/oracle.dic: deleted
  It was not used in the build. It contained Oracle brand
  names, etc.
* extras/source/wordbook/standard.dic: deleted
  It was built and delivered, but not packaged. It was an
  empty dictionary file which would be created anyway when
  the user creates a new empty dictionary.
* extras/source/wordbook/technical.dic:
  Entries were sorted so it will be easier to add new words.
  Some entries were added from lang/en-US/soffice.dic.
* extras/source/wordbook/sl.dic: added Slovenian words
* extras/source/wordbook/en-US.dic: added English words
* extras/source/wordbook/en-GB.dic: added English words
* scp2/source/ooo/ :
  These wordbook files should not depend on the UI language.
  They should not be in language packs but they all should
  be installed for every language like spell checker
  dictionaries.
* officecfg/registry/ :
  Paths adjusted, so application looks for wordbook files
  in the right directory.
  I enabled all dictionaries by default in Linguistic.xcs.
2011-04-26 20:39:58 +02:00
Tor Lillqvist
b3f8d9a9b8 Kill Sun-specific stclient_wrapper 2011-04-26 18:32:27 +03:00
Petr Mladek
ed7b1f1802 do not package transitions-ogl.xml twice (fdo#36493) 2011-04-26 15:03:31 +02:00
Tor Lillqvist
97bfc27b4b Kill BrOffice, fdo#36262 2011-04-26 14:27:20 +03:00
libo32
fb7a9c379b Remove already integrated fonts from extra fonts 2011-04-24 16:19:54 +02:00
Norbert Thiebaud
364dbc666a harmonize OGLTrans.uno library name on MacOs with the rest of the world 2011-04-23 15:25:20 -05: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
Noel Power
2d4d06ff48 fix master install
add missing libraries doctoko ooxml resourcemodel
2011-04-20 18:37:43 +01:00
Andras Timar
e85640d0bb do not ship Letter Wizard templates twice fdo#35722 2011-04-20 15:28:00 +01:00
Andras Timar
5cce753ee1 do not ship Letter Wizard templates twice fdo#35722 2011-04-16 21:59:25 +02:00
Caolán McNamara
e905617ebd these xsl are gone AFAICS 2011-04-15 14:06:39 +01:00
Francois Tigeot
cd78967d03 Remove remaining M1500 and M1600 usage.
Use _MSC_VER instead. This macro is already defined by the compiler, no
need to do it twice.
Since mergemodules_ooo.scp is no longer used, we can simply remove it.
2011-04-12 10:55:08 +02:00
Francois Tigeot
f74e372ac6 Remove more code using M1310 and M1400. 2011-04-12 10:20:46 +02:00
Andras Timar
5aa623271d add the missing strings for Burmese (my) 2011-04-10 10:45:35 +02:00
Andras Timar
f35ba94190 replace NS to NSO (language code changed) 2011-04-10 10:37:58 +02:00
Andras Timar
d159a69472 replace BE_BY to BE (language code changed) 2011-04-10 10:37:09 +02:00
Francois Tigeot
04c1061612 Remove code depending on M1310 and M1400.
These defines are no longer defined anywhere, there's no need to keep
conditionally-compiled code using them.
2011-04-09 09:25:18 +02:00
Tor Lillqvist
bf0d63071d Use less misleading terminology 2011-04-08 13:55:56 +03:00
Tor Lillqvist
cabdacb818 Don't attempt to show release notes after installing, fdo#31023 2011-04-08 11:01:32 +03:00
Tor Lillqvist
05808a2850 chmod -x 2011-04-08 10:56:17 +03:00
Tor Lillqvist
63730107a9 Don't attempt to show release notes after installing, fdo#31023 2011-04-08 10:56:15 +03:00
Bjoern Michaelsen
468ba5cfd6 add lomenubar lib 2011-04-06 18:49:34 +02:00
Bjoern Michaelsen
b76f09e101 add lomenubar lib 2011-04-06 18:49:05 +02:00
Tor Lillqvist
8d1bac154b Add possibility to bundle some Agfa Monotype fonts
Based on the old novell-win32-agfa-monotype-fonts.diff patch.
2011-04-06 15:55:11 +03:00
Tor Lillqvist
2e705f35c2 Add two new lines to .versionrc (version.ini on Windows)
"Vendor" with the value of OOO_VENDOR, and "BuildVersion" with the
value of BUILD_VER_STRING. These get their values from the
--with-vendor and --with-build-version switches of the configure
script.

From the build-identification.diff patch, has been part of distro
OOo/LO builds for long.
2011-04-05 17:56:20 +03:00
Tor Lillqvist
b2c34b75f6 bnc#530872: Save old associations for MS doc types when installing
Then restore them, if still relevant, when uninstalling LibreOffice.

git log from build repository:
commit 1737ec9b6675cc7e30df03fa5537012a429425bb
Author: Tor Lillqvist <tlillqvist@novell.com>
Date:   Thu Oct 14 15:28:55 2010 +0300

    Make win32-restore-associations.diff apply again

commit 72a25ab4a055cd1d3cf5aec627cfe120113bfb34
Author: Tor Lillqvist <tlillqvist@novell.com>
Date:   Thu May 20 10:34:24 2010 +0300

    Make patches apply for a Windows build

commit d635f716a75d8c1648eab0c1d598b390be8c4f07
Author: Tor Lillqvist <tlillqvist@novell.com>
Date:   Thu Sep 17 22:16:40 2009 +0300

    Add new patch to restore MSO file associations on uninstall

    * patches/dev300/apply: Add it to Win32Only

    * patches/dev300/win32-restore-associations.diff: New file. Save
      previous associations of the MS Office file formats on installation
      of OOo. On uninstallation of OOo, restore them. Still a bit
      experimental, but seems to work.
2011-04-05 16:35:22 +03:00
Alexander Thurgood
f958c05128 remove invalid - symbols in par token names 2011-04-04 16:24:49 +01:00
Fridrich Štrba
c525a776b3 sal_textenc3 is not really an uno component, mmeeks dixit 2011-03-31 14:03:41 +02:00
Fridrich Štrba
5c89bdb493 fix windows packaging of sal_textenc3.dll 2011-03-31 13:53:34 +02:00
Tor Lillqvist
a1ce970032 Rename shellnew2 to 2shellnew
The "DosName" property of a directory item must apparently be unique
in first five chars, sigh. See the lovely code in
solenv/bin/modules/installer/windows/directory.pm, the
create_unique_directorynames subroutine, check for $startlength.
2011-03-31 12:47:22 +03:00
Petr Mladek
f2894bf189 sdk-gid-module-name.diff: rename module name to gid_Module_Root_SDK (i#64802)
so the generated list of files does not conflict with the main package
2011-03-30 18:10:54 +02:00
Ivo Hinkelmann
f7b32e6add CWS-TOOLING: integrate CWS rsvglibs 2011-03-29 18:14:38 +02:00
Philipp Lohmann [pl]
a8167e3b55 rsvglibs: conditionally install dependencies 2011-03-29 14:36:53 +02:00
ka
d20e476d1e ka102: rebased to DEV300_m104 2011-03-28 22:51:37 +02:00
Norbert Thiebaud
701049414b harmomized the vbaobj library names with sw use and gnumake expectation 2011-03-26 15:26:28 -05:00
Andras Timar
2bd805cd33 remove localized palettes
they will be localized within the standard l10n framework
2011-03-26 15:32:55 +01:00
Fridrich Štrba
818cc0b97f Unix splash only for Unix 2011-03-25 14:48:07 +01:00
Petr Mladek
d9aaf20177 set build depencencies against the new "translations" module 2011-03-25 12:13:50 +01:00
Michael Meeks
849f137e67 disable spl_unx distribution for mac 2011-03-25 04:45:37 +00:00
Michael Meeks
46a73dead4 merge size-sal-textenc i#70166 2011-03-24 16:21:48 +00:00
Andras Timar
5fa0eba1c2 remove duplicated Occitan entry 2011-03-23 19:07:22 +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
Michael Meeks
38a29942c3 disable pagein and oosplash.bin compile/install for Mac 2011-03-22 10:06:38 +00:00
Michael Meeks
5c3f86934e use the unix quickstarter un-conditionally. 2011-03-21 21:17:57 +00:00
Caolán McNamara
b8665f1e8d missing 'End', which is why the smoketest failed 2011-03-20 21:28:08 +00:00
Thorsten Behrens
043f07134e Remove removed datacarrier from makefile 2011-03-18 17:35:01 +01:00
Thorsten Behrens
f5d9c8570d Remove undefined DataCarrier entries from scp2
Michael's fixes turned those into build breaker
2011-03-18 17:35:01 +01:00
Michael Meeks
b846e8e650 fix scp2 errors, re-factor, accelerate, and add error detection to parser 2011-03-18 17:35:01 +01:00
Thorsten Behrens
bce1f07cac Fix ppt and wpg import
There's no STD_UNO_LIB_FILE_PATCH anymore
2011-03-18 17:35:00 +01:00
Vladimir Glazunov
4809454506 CWS-TOOLING: integrate CWS native367 2011-03-21 18:04:46 +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
Martin Hosken
4140a3a324 graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
f4a5286839 graphite2 consolidated patch 2011-03-10 22:36:32 +07:00
Martin Hosken
ecf0432588 graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
84e65e2613 graphite2 consolidated patch 2011-03-10 22:36:32 +07:00
Martin Hosken
fb298513ba graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
e87464af6a graphite2 consolidated patch 2011-03-10 22:36:32 +07:00
Ingo Schmidt
1138fad1b3 native367: #o11840947# preparing OOO 3.4 2011-03-09 13:43:38 +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
Ivo Hinkelmann
47f8c3989c CWS-TOOLING: integrate CWS native364 2011-03-07 13:18:13 +01:00
Caolán McNamara
03271a21b9 those were the wrong defines 2011-03-01 21:08:30 +00:00
Ivo Hinkelmann
b09657659f masterfix DEV300: #i10000# usage of L10N build_type 2011-02-22 19:07:34 +01:00
Andras Timar
fc19bad5b7 l10n: add Breton spelling dictionary 2011-02-22 18:59:27 +01:00
ka
3cc35e61a4 ka102: no packaging of prebundled librsvg 2011-02-21 23:01:01 +01:00
Francois Tigeot
ab50df50a8 Add DragonFly defines. 2011-02-21 14:37:59 +01:00
ka
1ee91da926 ka102: #i116970# Write extents of exported SVG / syntax 2011-02-21 02:57:37 +01:00
Tor Lillqvist
d8f97bd4c9 Exclude java_uno_accessbridge.jar and .dll if no SOLAR_JAVA 2011-02-18 11:42:15 +02:00
David Tardon
657710a76d configure inclusion/exclusion of scripting providers 2011-02-18 09:47:50 +01:00
ka
a41005410d ka102: type changes nneded for DEV300_m100 2011-02-18 05:20:51 +01:00
David Tardon
399a30d20e fix defs for scripting provider extensions 2011-02-17 16:21:35 +01:00
Ingo Schmidt
b7a6c674bd native364: #i116865# removing update script 2011-02-14 12:40:33 +01:00
sb
54a05a00d7 sb138: merged in re/DEV300_next towards DEV300_m100 2011-02-11 11:00:41 +01:00
Fridrich Štrba
fca25e4c4c Trying to remove the stlport mention from the code 2011-02-09 20:18:11 +01:00
Ingo Schmidt
c166cef203 native361: #i115269# rollback of installation, if unopkg fails 2011-02-08 10:57:27 +01:00
Jan Holesovsky
d856c71a7d Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
	configure.in
	solenv/bin/build.pl
2011-02-08 00:31:41 +01:00
Jesús Corrius
4fe56df1d5 Revert: Use different Windows registry keys than OOo 2011-02-03 18:25:04 +01:00
Jesús Corrius
9e7da97053 Revert: Change registry prefix values loffice, libreoffice -> LibreOffice 2011-02-03 18:22:41 +01:00
Peter Jentsch
8f54c729d0 Removed obsolete flat xml export xslt scripts from packaging 2011-02-03 17:54:58 +01:00
Jesús Corrius
851641916d fdo#33785: install mtfrenderer.uno.dll in the correct directory 2011-02-03 17:39:20 +01:00
Mathias Bauer
5931f39f4f CWS gnumake3: resync to m99 2011-02-03 15:53:56 +01:00
Mathias Bauer
355c0e61ee CWS gnumake3: convert line ends 2011-02-03 15:40:30 +01:00
Andras Timar
07be07c6e6 added Occitan dict pack to scp2 2011-02-01 13:01:07 +01:00
Andras Timar
84c28e1e4b updated description of Russian dict pack in scp2 2011-02-01 13:00:27 +01:00
Andras Timar
aa4e93c532 added Ukrainian dict pack to scp2 2011-02-01 12:56:41 +01:00
Vladimir Glazunov
d713562535 CWS-TOOLING: integrate CWS dba34b 2011-02-01 11:12:15 +01:00
Jesús Corrius
8d439b06de Change registry prefix values loffice, libreoffice -> LibreOffice 2011-01-30 00:27:29 +01:00
Andras Timar
bfd6b1db7b updated description of Russian dict pack in scp2 2011-01-29 13:17:01 +01:00
Andras Timar
5fd6899a65 added Ukrainian dict pack to scp2 2011-01-29 13:15:53 +01:00
Andras Timar
a16e828ad2 added Occitan dict pack to scp2 2011-01-29 13:09:52 +01:00
Mathias Bauer
166738d8ac CWS gnumake3: kill ENABLE_VBA 2011-01-28 13:59:35 +01:00
Hans-Joachim Lankenau
db66b65ad8 gnumake3: remove comphelper version; fix including extract.hxx 2011-01-28 12:49:53 +01:00
Vladimir Glazunov
488c44cd6b CWS-TOOLING: integrate CWS tl84 2011-01-27 16:53:34 +01:00
Mathias Bauer
cd2532a05a CWS gnumake3: remove gengal 2011-01-27 13:08:03 +01:00
Mathias Bauer
a239103a87 CWS gnumake3: fix component location for msforms; change library name for msforms; change file names for gengal 2011-01-26 16:15:19 +01:00
sb
9770f80111 sb138: #i116038# fresh implementation of binary URP bridge 2011-01-26 09:26:59 +01:00
Andras Timar
13239a95ff removed language code 'kid'
kid is not Koshin but key id pseudo language which is good for
debugging UI but should no be included in the product
Signed off by Fridrich on irc.
2011-01-22 16:33:59 +01:00