fix for https://github.com/owncloud/client/issues/1251

diff --git a/admin/osx/macosx.pkgproj b/admin/osx/macosx.pkgproj
index 9b9b891bc8c2ed3ad7340b2e15473911c9518286..4883a4e9047b024a8582fea96ba92f971553c207 100644 (file)
--- a/admin/osx/macosx.pkgproj
+++ b/admin/osx/macosx.pkgproj
@@ -22,7 +22,7 @@
                                                                        <key>GID</key>
                                                                        <integer>80</integer>
                                                                        <key>PATH</key>
-                                                                       <string>@APPLICATION_EXECUTABLE@.app</string>
+                                                                       <string>owncloud.app</string>
                                                                        <key>PATH_TYPE</key>
                                                                        <integer>3</integer>
                                                                        <key>PERMISSIONS</key>
@@ -474,14 +474,14 @@
                  <key>POSTINSTALL_PATH</key>
                  <dict>
                          <key>PATH</key>
-                         <string>@CMAKE_CURRENT_BINARY_DIR@/post_install.sh</string>
+                         <string>/Users/jonathankawohl/github/client/admin/osx/post_install.sh</string>
                          <key>PATH_TYPE</key>
                          <integer>0</integer>
                  </dict>
                  <key>PREINSTALL_PATH</key>
                  <dict>
                          <key>PATH</key>
-                         <string>@CMAKE_CURRENT_BINARY_DIR@/pre_install.sh</string>
+                         <string>/Users/jonathankawohl/github/client/admin/osx/pre_install.sh</string>
                          <key>PATH_TYPE</key>
                          <integer>0</integer>
                  </dict>
@@ -495,13 +495,13 @@
                                <key>CONCLUSION_ACTION</key>
                                <integer>0</integer>
                                <key>IDENTIFIER</key>
-                               <string>@APPLICATION_REV_DOMAIN_INSTALLER@</string>
+                               <string>com.ownCloud.client</string>
                                <key>NAME</key>
-                               <string>@APPLICATION_NAME_XML_ESCAPED@</string>
+                               <string>ownCloud</string>
                                <key>OVERWRITE_PERMISSIONS</key>
                                <false/>
                                <key>VERSION</key>
-                               <string>@MIRALL_VERSION_FULL@</string>
+                               <string>2.3.0.0</string>
                        </dict>
                        <key>UUID</key>
                        <string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
@@ -1029,7 +1029,7 @@
                                <key>OVERWRITE_PERMISSIONS</key>
                                <false/>
                                <key>VERSION</key>
-                               <string>@MIRALL_VERSION_FULL@</string>
+                               <string>2.3.0.0</string>
                        </dict>
                        <key>TYPE</key>
                        <integer>0</integer>
@@ -1065,12 +1065,12 @@
                                <key>BACKGROUND_PATH</key>
                                <dict>
                                        <key>PATH</key>
-                                       <string>@MAC_INSTALLER_BACKGROUND_FILE@</string>
+                                       <string>/Users/jonathankawohl/github/client/admin/osx/installer-background.png</string>
                                        <key>PATH_TYPE</key>
                                        <integer>0</integer>
                                </dict>
                                <key>CUSTOM</key>
-                               <integer>@MAC_INSTALLER_DO_CUSTOM_BACKGROUND@</integer>
+                               <integer>1</integer>
                                <key>SCALING</key>
                                <integer>0</integer>
                        </dict>
@@ -1245,7 +1245,7 @@
                                                <key>LANGUAGE</key>
                                                <string>English</string>
                                                <key>VALUE</key>
-                                               <string>@APPLICATION_NAME_XML_ESCAPED@ Client</string>
+                                               <string>ownCloud Client</string>
                                        </dict>
                                </array>
                        </dict>
@@ -1445,9 +1445,9 @@
                                </dict>
                        </array>
                        <key>NAME</key>
-                       <string>@APPLICATION_NAME_XML_ESCAPED@ Installer</string>
+                       <string>ownCloud Installer</string>
                        <key>REFERENCE_FOLDER_PATH</key>
-                       <string>@CMAKE_INSTALL_DIR@</string>
+                       <string></string>
                </dict>
        </dict>
                <key>SHARED_GLOBAL_DATA</key>

diff --git a/src/libsync/owncloudtheme.cpp b/src/libsync/owncloudtheme.cpp
index 09121acd612ee9eeb0abdb4c001ffcfc56c38838..6809d04268bdee16f5ade8a83ecef7d9539350f3 100644 (file)
--- a/src/libsync/owncloudtheme.cpp
+++ b/src/libsync/owncloudtheme.cpp
@@ -45,8 +45,9 @@ QString ownCloudTheme::about() const
 {
     QString devString;
     devString = trUtf8("<p>Version %2. For more information visit <a href=\"%3\">%4</a></p>"
-               "<p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, "
-               "Olivier Goffart, Markus Götz and others.</small></p>"
+               "<p>For known issues and help, please visit: <a href=https://central.owncloud.org/c/help/desktop-file-sync>central.owncloud.org</a></p>"
+               "<p><small>By Klaas Freitag, Daniel Molkentin,Olivier Goffart, Markus Götz"
+               ", Jan-Christoph Borchardt, and others.</small></p>"
                "<p>Copyright ownCloud GmbH</p>"
                "<p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>"
                "ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH "

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 53e850b99997fdc2d3818fbb0cdd6c6ea6470243..9b67f88f8143be4d400b674bbbdc563a3176ace3 100644 (file)
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -285,7 +285,8 @@ QString Theme::gitSHA1() const
     const QString gitSha1(QLatin1String(GIT_SHA1));
     devString = QCoreApplication::translate("ownCloudTheme::about()",
                    "<p><small>Built from Git revision <a href=\"%1\">%2</a>"
-                   " on %3, %4 using Qt %5, %6</small></p>")
+                   " on %3, %4 using Qt %5, %6")
+
             .arg(githubPrefix+gitSha1).arg(gitSha1.left(6))
             .arg(__DATE__).arg(__TIME__)
             .arg(QT_VERSION_STR)
@@ -300,11 +301,11 @@ QString Theme::about() const
     re = tr("<p>Version %1. For more information please visit <a href='%2'>%3</a>.</p>")
             .arg(MIRALL_VERSION_STRING).arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
             .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN));
-
+    
     re += tr("<p>Copyright ownCloud GmbH</p>");
     re += tr("<p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>"
              "%2 and the %2 logo are registered trademarks of %1 in the "
-             "United States, other countries, or both.</p>")
+             "United States, other countries, or both. <br> ")
             .arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
 
     re += gitSHA1();