[Pkg-owncloud-commits] [owncloud-client] 173/175: patches: Updated 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 5a6f066a35bc599ede2003d46766d52c08ff1bfa
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Aug 8 10:22:00 2015 +0200

    patches: Updated hunks
---
 debian/patches/0001-disable-updatecheck.patch | 10 +++++-----
 debian/patches/0002-debian_version.patch      | 14 +++++++-------
 debian/patches/0006-move-configfile.patch     | 10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index 3fa7189..798a748 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/libsync/configfile.cpp
 ===================================================================
---- owncloud-client.orig/src/libsync/configfile.cpp	2015-05-01 13:19:44.407780748 +0200
-+++ owncloud-client/src/libsync/configfile.cpp	2015-05-01 13:19:44.394447295 +0200
-@@ -371,11 +371,14 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp	2015-08-07 08:37:25.211486090 +0200
++++ owncloud-client/src/libsync/configfile.cpp	2015-08-07 08:37:25.201485988 +0200
+@@ -386,11 +386,14 @@
      QString con( connection );
      if( connection.isEmpty() ) con = defaultConnection();
  
@@ -29,8 +29,8 @@ Index: owncloud-client/src/libsync/configfile.cpp
  void ConfigFile::setSkipUpdateCheck( bool skip, const QString& connection )
 Index: owncloud-client/src/gui/generalsettings.cpp
 ===================================================================
---- owncloud-client.orig/src/gui/generalsettings.cpp	2015-05-01 13:19:44.407780748 +0200
-+++ owncloud-client/src/gui/generalsettings.cpp	2015-05-01 13:19:44.397780659 +0200
+--- owncloud-client.orig/src/gui/generalsettings.cpp	2015-08-07 08:37:25.211486090 +0200
++++ owncloud-client/src/gui/generalsettings.cpp	2015-08-07 08:37:25.204819356 +0200
 @@ -85,17 +85,7 @@
  
  void GeneralSettings::slotUpdateInfo()
diff --git a/debian/patches/0002-debian_version.patch b/debian/patches/0002-debian_version.patch
index 8b10806..1ad9851 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	2015-03-22 14:28:48.639865886 +0100
-+++ owncloud-client/OWNCLOUD.cmake	2015-03-22 14:28:48.633199155 +0100
+--- owncloud-client.orig/OWNCLOUD.cmake	2015-08-07 08:37:32.631561883 +0200
++++ owncloud-client/OWNCLOUD.cmake	2015-08-07 08:37:32.628228515 +0200
 @@ -1,6 +1,8 @@
  set( APPLICATION_NAME       "ownCloud" )
  set( APPLICATION_EXECUTABLE "owncloud" )
@@ -19,9 +19,9 @@ Index: owncloud-client/OWNCLOUD.cmake
  
 Index: owncloud-client/config.h.in
 ===================================================================
---- owncloud-client.orig/config.h.in	2015-03-22 14:28:48.639865886 +0100
-+++ owncloud-client/config.h.in	2015-03-22 14:28:48.633199155 +0100
-@@ -22,6 +22,11 @@
+--- owncloud-client.orig/config.h.in	2015-08-07 08:37:32.631561883 +0200
++++ owncloud-client/config.h.in	2015-08-07 08:37:32.628228515 +0200
+@@ -24,6 +24,11 @@
  #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
  #cmakedefine DATADIR "@DATADIR@"
  
@@ -35,8 +35,8 @@ Index: owncloud-client/config.h.in
  #endif
 Index: owncloud-client/src/libsync/owncloudtheme.cpp
 ===================================================================
---- owncloud-client.orig/src/libsync/owncloudtheme.cpp	2015-03-22 14:28:48.639865886 +0100
-+++ owncloud-client/src/libsync/owncloudtheme.cpp	2015-03-22 14:28:48.633199155 +0100
+--- owncloud-client.orig/src/libsync/owncloudtheme.cpp	2015-08-07 08:37:32.631561883 +0200
++++ owncloud-client/src/libsync/owncloudtheme.cpp	2015-08-07 08:37:32.628228515 +0200
 @@ -52,9 +52,9 @@
                 "ownCloud and the ownCloud Logo are registered trademarks of ownCloud, "
                 "Inc. in the United States, other countries, or both.</p>"
diff --git a/debian/patches/0006-move-configfile.patch b/debian/patches/0006-move-configfile.patch
index 9293b5b..e6e4e02 100644
--- a/debian/patches/0006-move-configfile.patch
+++ b/debian/patches/0006-move-configfile.patch
@@ -8,8 +8,8 @@ Last-Update: 2015-03-22
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/CMakeLists.txt
 ===================================================================
---- owncloud-client.orig/CMakeLists.txt	2015-05-01 13:19:56.397888238 +0200
-+++ owncloud-client/CMakeLists.txt	2015-05-01 13:19:56.391221511 +0200
+--- owncloud-client.orig/CMakeLists.txt	2015-08-07 08:37:42.608330461 +0200
++++ owncloud-client/CMakeLists.txt	2015-08-07 08:37:42.601663726 +0200
 @@ -205,6 +205,6 @@
  if(BUILD_OWNCLOUD_OSX_BUNDLE)
      install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
@@ -20,9 +20,9 @@ Index: owncloud-client/CMakeLists.txt
  endif()
 Index: owncloud-client/src/libsync/configfile.cpp
 ===================================================================
---- owncloud-client.orig/src/libsync/configfile.cpp	2015-05-01 13:19:56.397888238 +0200
-+++ owncloud-client/src/libsync/configfile.cpp	2015-05-01 13:19:56.391221511 +0200
-@@ -245,7 +245,7 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp	2015-08-07 08:37:42.608330461 +0200
++++ owncloud-client/src/libsync/configfile.cpp	2015-08-07 08:37:42.601663726 +0200
+@@ -260,7 +260,7 @@
      fi.setFile( QCoreApplication::applicationDirPath(), exclFile );
  #endif
  #ifdef Q_OS_UNIX

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