[Pkg-owncloud-commits] [owncloud-client] 69/70: Update patches (moved lines).

[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 46d5b13250e08900aab84dd3590e9b380e53bd55
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat May 17 21:41:14 2014 +0200

    Update patches (moved lines).
    
    Git-dch: ignore
---
 debian/patches/0001-disable-updatecheck.patch | 10 +++++-----
 debian/patches/0002-debian_version.patch      | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index 726bb0e..be5943d 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-04-17 23:51:40.480083411 +0200
-+++ owncloud-client/src/mirall/mirallconfigfile.cpp	2014-04-17 23:51:40.473416677 +0200
-@@ -341,11 +341,14 @@
+--- owncloud-client.orig/src/mirall/mirallconfigfile.cpp	2014-05-17 21:39:50.565920057 +0200
++++ owncloud-client/src/mirall/mirallconfigfile.cpp	2014-05-17 21:39:50.559253321 +0200
+@@ -352,11 +352,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-04-17 23:51:40.480083411 +0200
-+++ owncloud-client/src/mirall/generalsettings.cpp	2014-04-17 23:51:40.473416677 +0200
+--- owncloud-client.orig/src/mirall/generalsettings.cpp	2014-05-17 21:39:50.565920057 +0200
++++ owncloud-client/src/mirall/generalsettings.cpp	2014-05-17 21:39:50.559253321 +0200
 @@ -76,17 +76,7 @@
  
  void GeneralSettings::slotUpdateInfo()
diff --git a/debian/patches/0002-debian_version.patch b/debian/patches/0002-debian_version.patch
index f5cf6f5..f62a276 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-02-25 12:41:25.407616613 +0100
-+++ owncloud-client/OWNCLOUD.cmake	2014-02-25 12:41:25.394283157 +0100
+--- owncloud-client.orig/OWNCLOUD.cmake	2014-05-17 21:39:58.399335538 +0200
++++ owncloud-client/OWNCLOUD.cmake	2014-05-17 21:39:58.386002065 +0200
 @@ -2,6 +2,8 @@
  #set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
  set( APPLICATION_EXECUTABLE "owncloud" )
@@ -19,9 +19,9 @@ Index: owncloud-client/OWNCLOUD.cmake
  
 Index: owncloud-client/src/mirall/owncloudtheme.cpp
 ===================================================================
---- owncloud-client.orig/src/mirall/owncloudtheme.cpp	2014-02-25 12:41:25.407616613 +0100
-+++ owncloud-client/src/mirall/owncloudtheme.cpp	2014-02-25 12:41:58.877924624 +0100
-@@ -60,9 +60,9 @@
+--- owncloud-client.orig/src/mirall/owncloudtheme.cpp	2014-05-17 21:39:58.399335538 +0200
++++ owncloud-client/src/mirall/owncloudtheme.cpp	2014-05-17 21:39:58.386002065 +0200
+@@ -62,9 +62,9 @@
                 "Based on Mirall by Duncan Mac-Vicar P.</small></p>"
                 "%7"
                 )
@@ -36,8 +36,8 @@ Index: owncloud-client/src/mirall/owncloudtheme.cpp
  }
 Index: owncloud-client/config.h.in
 ===================================================================
---- owncloud-client.orig/config.h.in	2014-02-25 12:41:25.407616613 +0100
-+++ owncloud-client/config.h.in	2014-02-25 12:41:25.394283157 +0100
+--- owncloud-client.orig/config.h.in	2014-05-17 21:39:58.399335538 +0200
++++ owncloud-client/config.h.in	2014-05-17 21:39:58.386002065 +0200
 @@ -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