[Pkg-owncloud-commits] [owncloud-client] 480/484: 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 9fa5a79d35e7efc56bceab81b4297bf4c35d087d
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue Dec 15 19:19:32 2015 +0100

    Updated patch hunks
---
 debian/patches/0001-disable-updatecheck.patch | 12 ++++++------
 debian/patches/0005-remove_admin.patch        |  6 +++---
 debian/patches/0006-move-configfile.patch     | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index be4a7dc..bcb60f9 100644
--- a/debian/patches/0001-disable-updatecheck.patch
+++ b/debian/patches/0001-disable-updatecheck.patch
@@ -8,8 +8,8 @@ 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-10-17 16:37:59.647394804 +0200
-+++ owncloud-client/src/libsync/configfile.cpp	2015-10-17 16:37:59.640728079 +0200
+--- 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 @@
      QString con( connection );
      if( connection.isEmpty() ) con = defaultConnection();
@@ -29,9 +29,9 @@ 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-10-17 16:37:59.647394804 +0200
-+++ owncloud-client/src/gui/generalsettings.cpp	2015-10-17 16:37:59.640728079 +0200
-@@ -114,6 +114,7 @@
+--- 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
+@@ -109,6 +109,7 @@
  
  void GeneralSettings::slotUpdateInfo()
  {
@@ -39,7 +39,7 @@ Index: owncloud-client/src/gui/generalsettings.cpp
      if (OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance())) {
          connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection);
          connect(_ui->restartButton, SIGNAL(clicked()), updater, SLOT(slotStartInstaller()), Qt::UniqueConnection);
-@@ -121,9 +122,12 @@
+@@ -116,9 +117,12 @@
          _ui->updateStateLabel->setText(updater->statusString());
          _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
      } else {
diff --git a/debian/patches/0005-remove_admin.patch b/debian/patches/0005-remove_admin.patch
index 6b4c733..6d2d7a9 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	2015-08-11 14:54:15.076132620 +0200
-+++ owncloud-client/CMakeLists.txt	2015-08-11 14:54:38.146378566 +0200
-@@ -203,7 +203,6 @@
+--- owncloud-client.orig/CMakeLists.txt	2015-12-15 19:10:53.310312533 +0100
++++ owncloud-client/CMakeLists.txt	2015-12-15 19:10:53.306312517 +0100
+@@ -196,7 +196,6 @@
  add_subdirectory(shell_integration)
  add_subdirectory(doc)
  add_subdirectory(doc/dev)
diff --git a/debian/patches/0006-move-configfile.patch b/debian/patches/0006-move-configfile.patch
index 054fc97..05c6e48 100644
--- a/debian/patches/0006-move-configfile.patch
+++ b/debian/patches/0006-move-configfile.patch
@@ -8,9 +8,9 @@ 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-08-11 14:55:10.813393624 +0200
-+++ owncloud-client/CMakeLists.txt	2015-08-11 14:55:10.806726886 +0200
-@@ -215,6 +215,6 @@
+--- 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
+@@ -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)
  else()
@@ -20,8 +20,8 @@ Index: owncloud-client/CMakeLists.txt
  endif()
 Index: owncloud-client/src/libsync/configfile.cpp
 ===================================================================
---- owncloud-client.orig/src/libsync/configfile.cpp	2015-08-11 14:55:10.813393624 +0200
-+++ owncloud-client/src/libsync/configfile.cpp	2015-08-11 14:55:10.806726886 +0200
+--- 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 @@
      fi.setFile( QCoreApplication::applicationDirPath(), exclFile );
  #endif

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