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

Sandro Knauß hefee-guest at moszumanska.debian.org
Fri Feb 5 14:05:09 UTC 2016


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 39ae87538d7ef074e572211ce816c8937f4bfd9c
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Feb 5 14:38:21 2016 +0100

    Updated patch hunks.
---
 debian/patches/0001-disable-updatecheck.patch | 10 +++++-----
 debian/patches/0006-move-configfile.patch     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index bcb60f9..8bcad36 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-12-15 19:09:34.126024034 +0100
-+++ owncloud-client/src/libsync/configfile.cpp	2015-12-15 19:09:34.126024034 +0100
-@@ -407,11 +407,14 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp	2016-02-05 14:36:48.485447473 +0100
++++ owncloud-client/src/libsync/configfile.cpp	2016-02-05 14:36:48.485447473 +0100
+@@ -412,11 +412,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-12-15 19:09:34.126024034 +0100
-+++ owncloud-client/src/gui/generalsettings.cpp	2015-12-15 19:09:34.126024034 +0100
+--- owncloud-client.orig/src/gui/generalsettings.cpp	2016-02-05 14:36:48.485447473 +0100
++++ owncloud-client/src/gui/generalsettings.cpp	2016-02-05 14:36:48.485447473 +0100
 @@ -109,6 +109,7 @@
  
  void GeneralSettings::slotUpdateInfo()
diff --git a/debian/patches/0006-move-configfile.patch b/debian/patches/0006-move-configfile.patch
index 05c6e48..a1a60eb 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-12-15 19:11:01.802344230 +0100
-+++ owncloud-client/CMakeLists.txt	2015-12-15 19:11:01.802344230 +0100
+--- owncloud-client.orig/CMakeLists.txt	2016-02-05 14:37:14.101524409 +0100
++++ owncloud-client/CMakeLists.txt	2016-02-05 14:37:14.097524397 +0100
 @@ -208,6 +208,6 @@
      install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
      configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
@@ -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-12-15 19:11:01.802344230 +0100
-+++ owncloud-client/src/libsync/configfile.cpp	2015-12-15 19:11:01.802344230 +0100
-@@ -263,7 +263,7 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp	2016-02-05 14:37:14.101524409 +0100
++++ owncloud-client/src/libsync/configfile.cpp	2016-02-05 14:37:14.097524397 +0100
+@@ -268,7 +268,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



More information about the Pkg-owncloud-commits mailing list