[Pkg-owncloud-commits] [owncloud-client] 496/498: refresh 0001-disable-updatecheck.patch

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:49:23 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 b1e94d11d92d9c04f3a2b1eafc672ce59ed546b9
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue Aug 11 14:53:25 2015 +0200

    refresh 0001-disable-updatecheck.patch
---
 debian/patches/0001-disable-updatecheck.patch | 35 +++++++++++++++------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index 798a748..8b040c5 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-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 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp	2015-08-11 14:47:04.811469894 +0200
++++ owncloud-client/src/libsync/configfile.cpp	2015-08-11 14:47:04.804803154 +0200
+@@ -407,11 +407,14 @@
      QString con( connection );
      if( connection.isEmpty() ) con = defaultConnection();
  
@@ -29,23 +29,26 @@ 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-07 08:37:25.211486090 +0200
-+++ owncloud-client/src/gui/generalsettings.cpp	2015-08-07 08:37:25.204819356 +0200
-@@ -85,17 +85,7 @@
+--- owncloud-client.orig/src/gui/generalsettings.cpp	2015-08-11 14:47:04.811469894 +0200
++++ owncloud-client/src/gui/generalsettings.cpp	2015-08-11 14:50:32.527081678 +0200
+@@ -100,6 +100,7 @@
  
  void GeneralSettings::slotUpdateInfo()
  {
--    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);
--        connect(_ui->restartButton, SIGNAL(clicked()), qApp, SLOT(quit()), Qt::UniqueConnection);
--        _ui->updateStateLabel->setText(updater->statusString());
--        _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
--    } else {
--        // can't have those infos from sparkle currently
++    /* Debian don't want an autoupdater
+     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);
+@@ -107,9 +108,12 @@
+         _ui->updateStateLabel->setText(updater->statusString());
+         _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
+     } else {
++    */
+         // can't have those infos from sparkle currently
          _ui->updatesGroupBox->setVisible(false);
--    }
++    /* Debian don't want an autoupdater
+     }
++    */
  }
  
  void GeneralSettings::saveMiscSettings()

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