[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 2 commits - officecfg/registry setup_native/source

[Andras Timar]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |    6 ++++++
 setup_native/source/packinfo/packinfo_brand.txt                |    7 +++++++
 setup_native/source/packinfo/packinfo_office.txt               |    2 ++
 3 files changed, 15 insertions(+)

New commits:
commit 895e91d8aeaf77dc38fe14ad165b6f7ad5272491
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Nov 28 17:09:59 2015 +0100

    Ctrl+3 keyboard shortcut for Set Optimal Column Width in Calc
    
    Change-Id: I1e218a429b509fda35accc832d01fc1f12e8dddd
    (cherry picked from commit fc53041c0387388f1275abf7beefea4d80d5ee3b)

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index ab773b6..30a67d8 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -531,6 +531,12 @@
             <value xml:lang="en-US">.uno:NumberFormatScientific</value>
           </prop>
         </node>
+        <node oor:name="3_MOD1" oor:op="replace">
+          <prop oor:name="Command">
+            <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+            <value xml:lang="en-US">.uno:SetOptimalColumnWidthDirect</value>
+          </prop>
+        </node>
         <node oor:name="3_SHIFT_MOD1" oor:op="replace">
           <prop oor:name="Command">
             <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
commit ddb987c79a3852cfb552f10b1beca03f419879c2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Oct 2 14:18:26 2015 +0200

    provide libreoffice-writer, libreoffice-calc etc. metapackages
    
    Change-Id: Ibadbcb45eb0cacd8f26e7bfed3cff794a7ce88f1
    (cherry picked from commit d151f43cdb0e7735d267115868a9dac9f45bb6b2)

diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index 4284ad0..cefb654 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -28,6 +28,7 @@ vendor = "The Document Foundation"
 description = "Brand module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
+provides = "libreoffice"
 End
 
 Start
@@ -42,6 +43,7 @@ vendor = "The Document Foundation"
 description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-writer"
 End
 
 Start
@@ -56,6 +58,7 @@ vendor = "The Document Foundation"
 description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-calc"
 End
 
 Start
@@ -70,6 +73,7 @@ vendor = "The Document Foundation"
 description = "Impress brand module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-impress"
 End
 
 Start
@@ -84,6 +88,7 @@ vendor = "The Document Foundation"
 description = "Draw brand module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-draw"
 End
 
 Start
@@ -98,6 +103,7 @@ vendor = "The Document Foundation"
 description = "Math brand module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-math"
 End
 
 Start
@@ -112,6 +118,7 @@ vendor = "The Document Foundation"
 description = "Base brand module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-base"
 End
 
 Start
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 8bc7ed8..e6564c3 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -48,6 +48,7 @@ vendor = "The Document Foundation"
 description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-evolution libreoffice-gnome"
 End
 
 Start
@@ -95,6 +96,7 @@ vendor = "The Document Foundation"
 description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-common"
 End
 
 Start