[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-4.4' - 3 commits - configure.ac extensions/source sfx2/uiconfig

[Andras Timar]

 configure.ac                                             |    2 +-
 extensions/source/macosx/spotlight/mdimporter/Info.plist |    2 +-
 sfx2/uiconfig/ui/applicationstartupdialog.ui             |    6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1f0c52700149106be3ad9affdb17fe0eeda70372
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jun 21 14:45:40 2015 +0200

    Bump version for next App Store upload
    
    Change-Id: I5627dad07f928d8e735d800a73ad1dc57207dade

diff --git a/configure.ac b/configure.ac
index 67344b6..7471be6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[4.4.4.3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.4.4],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit ffc85dc31f3944914497cdcfee468a929041602e
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jun 21 14:44:15 2015 +0200

    LOfC info screen tweaks
    
    Change-Id: Iae6eb68f19fb936c70b29c6c2e8c92ea7f3b0bb5

diff --git a/sfx2/uiconfig/ui/applicationstartupdialog.ui b/sfx2/uiconfig/ui/applicationstartupdialog.ui
index c2a0436..6b62c8f 100644
--- a/sfx2/uiconfig/ui/applicationstartupdialog.ui
+++ b/sfx2/uiconfig/ui/applicationstartupdialog.ui
@@ -133,7 +133,9 @@
                     <property name="margin_bottom">3</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Collabora provides and maintains LibreOffice products on iTunes. Collabora's enterprise-grade productivity suite LibreOffice-from-Collabora for Mac delivers long term stability and support for demanding environments. Deployment and administration utilities together with fast-response bug-fix support are available for enterprise customers. App Store purchases of LibreOffice-from-Collabora support ongoing development and enhancement of LibreOffice for Mac. Get extended features and stability while funding LibreOffice for Mac development by buying LibreOffice-from-Collabora today.</property>
+                    <property name="label" translatable="yes">Collabora provides and maintains LibreOffice products on iTunes. Collabora's enterprise-grade productivity suite LibreOffice-from-Collabora for Mac delivers long term stability and support for demanding environments. Deployment and administration utilities together with fast-response bug-fix support are available for enterprise customers.
+
+App Store purchases of LibreOffice-from-Collabora support ongoing development and enhancement of LibreOffice for Mac. Get extended features and stability while funding LibreOffice for Mac development by buying LibreOffice-from-Collabora today.</property>
                     <property name="justify">fill</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">70</property>
@@ -173,7 +175,7 @@
                     <property name="hexpand">True</property>
                     <property name="relief">none</property>
                     <property name="xalign">0</property>
-                    <property name="uri">https://libreoffice-from-collabora.com/lofc-mac-app-store/</property>
+                    <property name="uri">https://itunes.apple.com/us/app/libreoffice-from-collabora/id918120011</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
commit 16b0e23f498f6bef26d785cd62946122c12adbfc
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jun 21 14:41:22 2015 +0200

    ERROR ITMS-90511: CFBundleIdentifier Collision
    
    Change-Id: I4413853a2e8c23af770323a1e7b21cedb637cfb1

diff --git a/extensions/source/macosx/spotlight/mdimporter/Info.plist b/extensions/source/macosx/spotlight/mdimporter/Info.plist
index bc48f70..5a60493 100644
--- a/extensions/source/macosx/spotlight/mdimporter/Info.plist
+++ b/extensions/source/macosx/spotlight/mdimporter/Info.plist
@@ -59,7 +59,7 @@
     <key>CFBundleIconFile</key>
     <string></string>
     <key>CFBundleIdentifier</key>
-    <string>org.openoffice.mdimporter</string>
+    <string>org.libreoffice.mdimporter</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleVersion</key>