[Pkg-owncloud-commits] [owncloud-client] 01/02: Update patch hunks

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 17 15:07:07 UTC 2015


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 a0896fc3d6806af083b6c1f9ed086b7b9b63a847
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Oct 17 16:39:20 2015 +0200

    Update patch hunks
---
 debian/patches/0001-disable-updatecheck.patch | 12 ++++++------
 debian/patches/0007-move-translations.patch   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index 48ebb51..be4a7dc 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-08-28 02:16:50.393951058 +0200
-+++ owncloud-client/src/libsync/configfile.cpp	2015-08-28 02:16:50.387284327 +0200
+--- 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
 @@ -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-08-28 02:16:50.393951058 +0200
-+++ owncloud-client/src/gui/generalsettings.cpp	2015-08-28 02:16:50.390617693 +0200
-@@ -105,6 +105,7 @@
+--- 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 @@
  
  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);
-@@ -112,9 +113,12 @@
+@@ -121,9 +122,12 @@
          _ui->updateStateLabel->setText(updater->statusString());
          _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
      } else {
diff --git a/debian/patches/0007-move-translations.patch b/debian/patches/0007-move-translations.patch
index ee2a8b4..b6ceac4 100644
--- a/debian/patches/0007-move-translations.patch
+++ b/debian/patches/0007-move-translations.patch
@@ -9,9 +9,9 @@ Last-Update: 2015-03-22
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/src/gui/application.cpp
 ===================================================================
---- owncloud-client.orig/src/gui/application.cpp	2015-08-11 14:55:26.323559095 +0200
-+++ owncloud-client/src/gui/application.cpp	2015-08-11 14:57:07.117968626 +0200
-@@ -76,7 +76,7 @@
+--- owncloud-client.orig/src/gui/application.cpp	2015-10-17 16:38:18.614227976 +0200
++++ owncloud-client/src/gui/application.cpp	2015-10-17 16:38:18.604227888 +0200
+@@ -82,7 +82,7 @@
  #elif defined(Q_OS_MAC)
      return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
  #elif defined(Q_OS_UNIX)
@@ -22,9 +22,9 @@ Index: owncloud-client/src/gui/application.cpp
  }
 Index: owncloud-client/src/gui/CMakeLists.txt
 ===================================================================
---- owncloud-client.orig/src/gui/CMakeLists.txt	2015-08-11 14:55:26.323559095 +0200
-+++ owncloud-client/src/gui/CMakeLists.txt	2015-08-11 14:58:11.568657552 +0200
-@@ -222,7 +222,7 @@
+--- owncloud-client.orig/src/gui/CMakeLists.txt	2015-10-17 16:38:18.614227976 +0200
++++ owncloud-client/src/gui/CMakeLists.txt	2015-10-17 16:38:18.604227888 +0200
+@@ -221,7 +221,7 @@
          endforeach( _file )
      endif(NOT WIN32)
  

-- 
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