Conflicts:
	shell/source/backends/gconfbe/gconfbackend.cxx

Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

Change-Id: I882c04fd3a255f55511b1884157de26e7574e6db
Reviewed-on: https://gerrit.libreoffice.org/18262Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

i.e. "don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabled"

seeing as setup_native/source/packinfo/packinfo_office.txt references
find-requires-gnome.sh and doesn't have conditional support revert the split
and put the the conditional into find-requires-gnome.sh

Change-Id: I34bd37c4fd252f2175ff055024293dea946b4881

Change-Id: I689783e176921ea03475d3e113426563bf20b9d7

Change-Id: I543a561fc7fa1213c8e319f227b761f6328a6eaa

only used for upstream packages/when epm is used (any auto-dependency
creation is disabled for those). Add two that might be missing in
barebone installations

Change-Id: I97c3af8cc8622c63ac831701e509097711822098

Change-Id: I91806c3a55905dfd1ae90a10bc890cc526ff3270
Reviewed-on: https://gerrit.libreoffice.org/11908Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

Removes:
 * instsetoo_native/util/update.xml
      - gen_update_info.pl can be removed ?

      On Windows the binary artifacts are created now in:
      workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259eeeed49
Reviewed-on: https://gerrit.libreoffice.org/2242Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>

    Patches contributed by: Armin Le Grand.
    #118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task.
    http://svn.apache.org/viewvc?view=revision&revision=1195906
    #118485# - Styles for OLEs are not saved.
    http://svn.apache.org/viewvc?view=revision&revision=1182166
    #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles
    http://svn.apache.org/viewvc?view=revision&revision=1293316
    #119337# Solves the wrong get/setPropertyValue calls in
    SvxShapeText (and thus in SvxOle2Shape)
    http://svn.apache.org/viewvc?view=revision&revision=1344156

    Patches contributed by Mathias Bauer (and others)
    gnumake4 work variously
    http://svn.apache.org/viewvc?view=revision&revision=1394707
    http://svn.apache.org/viewvc?view=revision&revision=1394326
    cws mba34issues01: #i117717#: remove wrong assertion
    http://svn.apache.org/viewvc?view=revision&revision=1172349

    Patch contributed by Herbert Duerr
    goodbye Registration and License dialogs, don't let the door hit you
    http://svn.apache.org/viewvc?view=revision&revision=1172613
    help gcc 4.6.0 on 32bit ubuntu 11.10"
    http://svn.apache.org/viewvc?view=revision&revision=1245357

    Do not add targets for junit tests when junit is disabled.
    Patch contributed by Andre Fischer
    http://svn.apache.org/viewvc?view=revision&revision=1241508

Revert "sb140: #i117082# avoid unncessary static class data members
    commit 21d97438.
remove obsolete FreeBSD visibility special case.
retain consolidated BSD bridge code, remove OS/2 pieces.

Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2008/06/04 04:52:53 obr 1.5.36.1: #i52026# faked RPM dependency for libfreetype

2008/06/04 04:52:53 obr 1.1.2.1: #i52026# faked RPM dependency for libfreetype

2008/05/28 08:23:56 obr 1.2.550.1: #i89711# 64 bit dependencies

2008/03/31 16:03:33 rt 1.4.40.1: #i87441# Change license header to LPGL v3.

2007/12/14 12:00:52 hjs 1.3.376.1: #i84299# remove packtools.mk

2005/09/05 17:30:10 rt 1.2.90.1: #i54170# Change license header: remove SISSL

2005/02/28 12:54:37 obr 1.1.2.1: #120027# don't use external packages in >>requires<<