[Pkg-owncloud-commits] [owncloud-client] 01/01: Updated patches

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 80fed79c18674f1b89e6c10b9e3f9b1484f4ef98
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue Feb 25 11:33:54 2014 +0100

    Updated patches
    
    Git-Dch: ignore
---
 debian/patches/0001-disable-updatecheck.patch | 17 +++++++++++--
 debian/patches/0004-debian_version.patch      | 36 +++++++++++----------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index 5ca1728..90cb152 100644
--- a/debian/patches/0001-disable-updatecheck.patch
+++ b/debian/patches/0001-disable-updatecheck.patch
@@ -7,8 +7,8 @@ Last-Update: 2014-02-17
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/src/mirall/mirallconfigfile.cpp
 ===================================================================
---- owncloud-client.orig/src/mirall/mirallconfigfile.cpp	2014-02-17 18:55:05.443108112 +0100
-+++ owncloud-client/src/mirall/mirallconfigfile.cpp	2014-02-17 18:57:13.177276556 +0100
+--- owncloud-client.orig/src/mirall/mirallconfigfile.cpp	2014-02-25 11:25:40.889067403 +0100
++++ owncloud-client/src/mirall/mirallconfigfile.cpp	2014-02-25 11:25:40.879067312 +0100
 @@ -344,11 +344,14 @@
      QString con( connection );
      if( connection.isEmpty() ) con = defaultConnection();
@@ -26,3 +26,16 @@ Index: owncloud-client/src/mirall/mirallconfigfile.cpp
  }
  
  void MirallConfigFile::setSkipUpdateCheck( bool skip, const QString& connection )
+Index: owncloud-client/src/updater/ocupdater.cpp
+===================================================================
+--- owncloud-client.orig/src/updater/ocupdater.cpp	2014-02-25 11:25:40.889067403 +0100
++++ owncloud-client/src/updater/ocupdater.cpp	2014-02-25 11:25:40.879067312 +0100
+@@ -84,7 +84,7 @@
+     case UpdateOnlyAvailableThroughSystem:
+         return tr("New version %1 available. Please use the systems update tool to install it.").arg(updateVersion);
+     case Unknown:
+-        return tr("Checking update server...");
++        return tr("Disabled for Debian. You hve to use your package management to update.");
+     case UpToDate:
+         // fall through
+     default:
diff --git a/debian/patches/0004-debian_version.patch b/debian/patches/0004-debian_version.patch
index 8be62c8..23be5da 100644
--- a/debian/patches/0004-debian_version.patch
+++ b/debian/patches/0004-debian_version.patch
@@ -4,8 +4,8 @@ Last-Update: 2014-02-21
 ---
 Index: owncloud-client/OWNCLOUD.cmake
 ===================================================================
---- owncloud-client.orig/OWNCLOUD.cmake	2014-02-24 20:34:20.082416525 +0100
-+++ owncloud-client/OWNCLOUD.cmake	2014-02-24 20:45:35.701682285 +0100
+--- owncloud-client.orig/OWNCLOUD.cmake	2014-02-25 10:59:58.901652748 +0100
++++ owncloud-client/OWNCLOUD.cmake	2014-02-25 10:59:58.888319295 +0100
 @@ -2,6 +2,8 @@
  #set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
  set( APPLICATION_EXECUTABLE "owncloud" )
@@ -17,8 +17,17 @@ Index: owncloud-client/OWNCLOUD.cmake
  
 Index: owncloud-client/src/mirall/owncloudtheme.cpp
 ===================================================================
---- owncloud-client.orig/src/mirall/owncloudtheme.cpp	2014-02-24 20:34:20.082416525 +0100
-+++ owncloud-client/src/mirall/owncloudtheme.cpp	2014-02-24 20:41:36.912948743 +0100
+--- owncloud-client.orig/src/mirall/owncloudtheme.cpp	2014-02-25 10:59:58.901652748 +0100
++++ owncloud-client/src/mirall/owncloudtheme.cpp	2014-02-25 11:03:57.863806840 +0100
+@@ -43,7 +43,7 @@
+     QString devString;
+ #ifdef GIT_SHA1
+     const QString githubPrefix(QLatin1String(
+-                                   "https://github.com/owncloud/mirall/commit/"));
++                                   "http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud-client.git;a=commit;h="));
+     const QString gitSha1(QLatin1String(GIT_SHA1));
+     devString = QCoreApplication::translate("ownCloudTheme::about()",
+                    "<p><small>Built from Git revision <a href=\"%1\">%2</a>"
 @@ -60,9 +60,9 @@
                 "Based on Mirall by Duncan Mac-Vicar P.</small></p>"
                 "%7"
@@ -32,25 +41,10 @@ Index: owncloud-client/src/mirall/owncloudtheme.cpp
              .arg(devString);
  
  }
-Index: owncloud-client/src/mirall/theme.cpp
-===================================================================
---- owncloud-client.orig/src/mirall/theme.cpp	2014-02-24 20:34:20.082416525 +0100
-+++ owncloud-client/src/mirall/theme.cpp	2014-02-24 20:44:40.034536147 +0100
-@@ -207,8 +207,8 @@
-               "<p>Distributed by %4 and licensed under the GNU Public License (GPL) Version 2.0.<br>"
-               "%5 and the %5 logo are registered trademarks of %4 in the<br>"
-               "United States, other countries, or both.</p>")
--            .arg(MIRALL_VERSION_STRING).arg("http://"MIRALL_STRINGIFY(APPLICATION_DOMAIN))
--            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
-+            .arg(DEBIAN_VERSION).arg(DEBIAN_URL)
-+            .arg(MIRALL_STRINGIFY(DEBIAN_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
- }
- 
- QVariant Theme::customMedia( CustomMediaType type )
 Index: owncloud-client/config.h.in
 ===================================================================
---- owncloud-client.orig/config.h.in	2014-02-17 18:20:11.286787740 +0100
-+++ owncloud-client/config.h.in	2014-02-24 21:18:14.033480075 +0100
+--- owncloud-client.orig/config.h.in	2014-02-25 10:59:58.901652748 +0100
++++ owncloud-client/config.h.in	2014-02-25 10:59:58.891652658 +0100
 @@ -19,6 +19,11 @@
  #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
  #cmakedefine DATADIR "@DATADIR@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git