[Libreoffice-commits] .: 9 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 03430475fd920276dde1ea7ceb069c732c7221fe
Merge: 69c410c... 894f121...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue May 31 14:31:47 2011 +0200

    Merge commit 'libreoffice-3.4.0.2'
    
    Conflicts:
    	postprocess/packcomponents/makefile.mk

commit 894f121eef4a9b5403c9b9b2c5f9a0a07fbf9d87
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue May 24 19:29:14 2011 +0200

    Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
commit 90ea94c87639055e8a77b970d3b047f8136a9750
Author: Radek Doulik <rodo at novell.com>
Date:   Fri May 20 10:37:50 2011 +0200

    add sdfilt component
    
    Signed-off-by: Katarina Machalkova <kmachalkova at suse.cz>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Fridrich Strba <fstrba at novell.com>

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1a60d20..82ff84d 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -152,6 +152,7 @@ my_components = \
     sdbc2 \
     sdbt \
     sdd \
+    sdfilt \
     simplecanvas \
     slideshow \
     $(SM_COMPONENTS)\
commit 2f9df7fd356014ff30ff0db20c7f211ef2299258
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue May 17 20:49:48 2011 +0200

    Branch libreoffice-3-4-0
    
    This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.4.x release,
    please use the 'libreoffice-3-4' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit 2fe327299620ccc65ccf1c11a62c4e39a330a47f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue May 17 19:55:37 2011 +0200

    Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)
commit 0b1e3f6ada3d155efc8028e86cebf595ba44399e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue May 10 20:01:44 2011 +0200

    Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)
commit f3de22e2b4df1114aaed7ca8fa33af968bb893ea
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue May 3 20:01:38 2011 +0200

    Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)
commit c18afa1df03e001bd70e73762cd742ffd00b37be
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 26 17:09:16 2011 +0200

    Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3)
commit e9e01f3bb18eefe011df3a1c14a62e55bec055a8
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Mon Apr 25 22:05:31 2011 +0200

    Update '--disable-python' to disable only Python UNO API.
    
    * postprocess/packcomponents/makefile.mk:

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 0f97b77..1a60d20 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -140,7 +140,6 @@ my_components = \
     placeware \
     preload \
     protocolhandler \
-    pythonloader \
     res \
     rpt \
     rptui \
@@ -193,6 +192,10 @@ my_components = \
     xsltfilter \
     xstor
 
+.IF "$(DISABLE_PYTHON)" != "TRUE"
+my_components += pythonloader
+.ENDIF
+
 .IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
 my_components += splash
 .ENDIF