setup_native/source/packinfo/packinfo_office.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 036741bc209a620f05a4fd45461d717f801056c2
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Wed Sep 16 10:35:21 2015 +0200

    cp#1000138 obsolete the kde integration package, which we don't build any 
more
    
    Change-Id: Ifab30a0af8b9cca342b3d392c14c30beb4c18b25

diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index c17c4c7..f908cd2 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -84,7 +84,7 @@ Start
 module = "gid_Module_Root"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core02, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core03, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core04, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core05, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core06, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
+linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core02, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core03, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core04, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core05, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core06, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core07, 
%BASISPACKAGEPREFIX%PRODUCTVERSION-kde-integration"
 requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, 
SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
 freebsdrequires = ""
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to