[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - scp2/source solenv/inc

[Petr Mladek]

 scp2/source/ooo/makefile.mk          |    4 ++++
 scp2/source/ooo/module_systemint.scp |   14 ++++++++++++++
 solenv/inc/productversion.mk         |    2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit e1f9bc93fd1e1757b837b4b31a47fc2f90cee727
Author: Petr Mladek <pmladek at suse.cz>
Date:   Sun Dec 12 21:07:14 2010 +0100

    add broffice dekstop integration to the install set on Linux (fdo#32229)
    
    Signed off by Fridrich Strba <fridrich.strba at bluewin.ch>

diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index fc2ebdd..8256abb 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -108,6 +108,10 @@ SCPDEFS+=-DSYSTEM_CAIRO
 SCPDEFS+=-DENABLE_CAIRO
 .ENDIF
 
+.IF "$(ENABLE_BROFFICE)" == "TRUE"
+SCPDEFS+=-DENABLE_BROFFICE
+.ENDIF
+
 .IF "$(SYSTEM_LIBXML)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBXML
 .ENDIF
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index 12ccef4..c9ce35e 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -48,3 +48,17 @@ Module gid_Module_Optional_Systemintegration
 	InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250, redhat-menus:1260";
 End
 
+#ifdef ENABLE_BROFFICE
+#ifdef UNX
+
+Module gid_Module_Optional_Systemintegration_Br
+    ParentID = gid_Module_Optional;
+    Sortkey = "800";
+    MOD_NAME_DESC(MODULE_OPTIONAL_SYSTEMINTEGRATION);
+    Styles = (SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
+    PackageName = "broffice-desktop-integration.tar.gz";
+    InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250, redhat-menus:1260";
+End
+
+#endif
+#endif
commit c0ea827ccfa95959998dc37293eb64b8c88eab7e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Sun Dec 12 21:05:43 2010 +0100

    we use broffice instead of broffice.org (fdo#32229)
    
    PRODUCTLIST is used in sysui to generate the desktop integration
    
    Signed off by Fridrich Strba <fridrich.strba at bluewin.ch>

diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index 7be758f..bba3d4c 100644
--- a/solenv/inc/productversion.mk
+++ b/solenv/inc/productversion.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-PRODUCTLIST = libreoffice broffice.org
+PRODUCTLIST = libreoffice broffice
 
 # default values to minimize maintainance effort
 PRODUCTVERSION = 3.3