Commit graph

10 commits

Author SHA1 Message Date
Baptiste Daroussin
03996d64c7 Use PREFIXDIR each time possible to allow installing where /usr is not the prefix 2011-09-19 20:33:55 +02:00
Tomas Chvatal
1dfe0e7c8d Env.Set.sh -> Env.Host.sh 2011-09-17 18:57:43 +02:00
Petr Mladek
484b5d7406 use /usr/bin/libreoffice symlink
it is used by UNO to find the installed LO
2011-08-23 20:28:59 +02:00
Tomas Chvatal
1fceff3d25 distro-install-desktop-integration: use "sed -i"
use the more elegant "sed -i" instead of "sed+mv"

Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-08-23 20:28:19 +02:00
Petr Mladek
9602fbb21b distro-install-desktop-integration: create temp files in $TMPDIR
do not hardcode /tmp

Signed-off-by: scarabeus@gentoo.org
2011-08-23 20:26:11 +02:00
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
e85a7e8c44 distro-install-desktop-integration: put $PREFIXDIR/bin/soffice into file list
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Andreas Radke <a.radke@arcor.de>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
2011-07-19 15:16:03 +02:00
Petr Mladek
aa12415249 distro-install-desktop-integration: do not pack libreoffice-base.desktop twice
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Andreas Radke <a.radke@arcor.de>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
2011-07-19 15:14:50 +02:00
Petr Mladek
1bca77c8e6 distro-install-desktop-integration: work with normal user
+ alllow to overwrite the readonly desktop files
+ create the compat soffice symlink in DESTDIR

Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Andreas Radke <a.radke@arcor.de>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
2011-07-19 15:13:38 +02:00
Petr Mladek
8124bdf39b better support for distro packaging
This is port from the build repo. The main differences are:

    + splits package-ooo into several scripts (bin/distro-install-*)

    + renames many variables to avoid OOO prefix and to better fit
      the variables produced by the current bootstrap configure.in

    + uses OOO_VENDOR from bootstrap/configure.in to add distro specific hacks;
      the conditions have been updated only for "Novell, inc."

    + install most of the desktop integration from sysui using
      sysui/desktop/share/create_tree.sh

    + do not install two extra templates:

         $OOINSTBASE/basis$VERSION/share/template/en-US/forms/resume.ott
         $OOINSTBASE/basis$VERSION/share/template/en-US/officorr/project-proposal.ott

      should get merged with other templates

    + do not install pyunorc-update64;

      it is needed only when you want to run 32-bit LO on 64-bit system;
      is anyone using it?

    + do not call install-dictionaries:
    + do not call build-galleries:

      is anyone using them?

    + do not install ootool and ooconfig

      is anyone using them? are they still working?

Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@gmail.com>
2011-07-11 20:30:31 +02:00