[Pkg-owncloud-commits] [owncloud-client] 05/06: Updated patch hunks

[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 86b588872d7d980770034529efbcd3fc15601b09
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Oct 27 19:18:06 2014 +0100

    Updated patch hunks
---
 debian/patches/0001-disable-updatecheck.patch | 10 +++++-----
 debian/patches/0002-debian_version.patch      | 14 +++++++-------
 debian/patches/0005-remove_admin.patch        |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index e067756..21915f5 100644
--- a/debian/patches/0001-disable-updatecheck.patch
+++ b/debian/patches/0001-disable-updatecheck.patch
@@ -8,9 +8,9 @@ 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-10-11 16:28:12.171627403 +0200
-+++ owncloud-client/src/mirall/mirallconfigfile.cpp	2014-10-11 16:28:12.164960403 +0200
-@@ -372,11 +372,14 @@
+--- owncloud-client.orig/src/mirall/mirallconfigfile.cpp	2014-10-27 18:16:18.330944363 +0100
++++ owncloud-client/src/mirall/mirallconfigfile.cpp	2014-10-27 18:16:18.324277634 +0100
+@@ -378,11 +378,14 @@
      QString con( connection );
      if( connection.isEmpty() ) con = defaultConnection();
  
@@ -29,8 +29,8 @@ Index: owncloud-client/src/mirall/mirallconfigfile.cpp
  void MirallConfigFile::setSkipUpdateCheck( bool skip, const QString& connection )
 Index: owncloud-client/src/mirall/generalsettings.cpp
 ===================================================================
---- owncloud-client.orig/src/mirall/generalsettings.cpp	2014-10-11 16:28:12.171627403 +0200
-+++ owncloud-client/src/mirall/generalsettings.cpp	2014-10-11 16:28:12.164960403 +0200
+--- owncloud-client.orig/src/mirall/generalsettings.cpp	2014-10-27 18:16:18.330944363 +0100
++++ owncloud-client/src/mirall/generalsettings.cpp	2014-10-27 18:16:18.324277634 +0100
 @@ -77,17 +77,7 @@
  
  void GeneralSettings::slotUpdateInfo()
diff --git a/debian/patches/0002-debian_version.patch b/debian/patches/0002-debian_version.patch
index c017408..7d400c5 100644
--- a/debian/patches/0002-debian_version.patch
+++ b/debian/patches/0002-debian_version.patch
@@ -6,8 +6,8 @@ Last-Update: 2014-02-21
 ---
 Index: owncloud-client/OWNCLOUD.cmake
 ===================================================================
---- owncloud-client.orig/OWNCLOUD.cmake	2014-08-29 23:47:12.017385588 +0200
-+++ owncloud-client/OWNCLOUD.cmake	2014-08-29 23:47:12.004051521 +0200
+--- owncloud-client.orig/OWNCLOUD.cmake	2014-10-27 18:16:28.357705313 +0100
++++ owncloud-client/OWNCLOUD.cmake	2014-10-27 18:16:28.354371948 +0100
 @@ -2,6 +2,8 @@
  #set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
  set( APPLICATION_EXECUTABLE "owncloud" )
@@ -19,8 +19,8 @@ Index: owncloud-client/OWNCLOUD.cmake
  
 Index: owncloud-client/config.h.in
 ===================================================================
---- owncloud-client.orig/config.h.in	2014-08-29 23:47:12.017385588 +0200
-+++ owncloud-client/config.h.in	2014-08-29 23:47:12.007385038 +0200
+--- owncloud-client.orig/config.h.in	2014-10-27 18:16:28.357705313 +0100
++++ owncloud-client/config.h.in	2014-10-27 18:16:28.354371948 +0100
 @@ -19,6 +19,11 @@
  #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
  #cmakedefine DATADIR "@DATADIR@"
@@ -35,11 +35,11 @@ Index: owncloud-client/config.h.in
  #endif
 Index: owncloud-client/src/mirall/owncloudtheme.cpp
 ===================================================================
---- owncloud-client.orig/src/mirall/owncloudtheme.cpp	2014-08-29 23:47:12.017385588 +0200
-+++ owncloud-client/src/mirall/owncloudtheme.cpp	2014-08-29 23:48:19.360676820 +0200
+--- owncloud-client.orig/src/mirall/owncloudtheme.cpp	2014-10-27 18:16:28.357705313 +0100
++++ owncloud-client/src/mirall/owncloudtheme.cpp	2014-10-27 18:16:28.354371948 +0100
 @@ -54,9 +54,9 @@
                 "ownCloud and the ownCloud Logo are registered trademarks of ownCloud, "
-                "Inc. in the United States, other countries, or both</p>"
+                "Inc. in the United States, other countries, or both.</p>"
                 )
 -            .arg(MIRALL_VERSION_STRING)
 -            .arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
diff --git a/debian/patches/0005-remove_admin.patch b/debian/patches/0005-remove_admin.patch
index ad74421..a9c7262 100644
--- a/debian/patches/0005-remove_admin.patch
+++ b/debian/patches/0005-remove_admin.patch
@@ -8,9 +8,9 @@ Last-Update: 2014-10-11
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/CMakeLists.txt
 ===================================================================
---- owncloud-client.orig/CMakeLists.txt	2014-10-07 01:49:50.566249389 +0200
-+++ owncloud-client/CMakeLists.txt	2014-10-07 01:55:37.249616610 +0200
-@@ -149,7 +149,6 @@
+--- owncloud-client.orig/CMakeLists.txt	2014-10-27 18:16:42.564505570 +0100
++++ owncloud-client/CMakeLists.txt	2014-10-27 18:16:42.557838840 +0100
+@@ -155,7 +155,6 @@
  add_subdirectory(src)
  add_subdirectory(shell_integration)
  add_subdirectory(doc)

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