[Pkg-owncloud-commits] [owncloud-client] 332/333: Updated patches
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:17:11 UTC 2014
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 8d930962e4760c6c35ef6dc3059a6f3fad259295
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Fri Apr 18 01:13:49 2014 +0200
Updated patches
---
debian/patches/0001-disable-updatecheck.patch | 12 ++++++-----
...error-instead-of-a-crash-when-dav_connect.patch | 25 ----------------------
debian/patches/0006-Fix-build-on-FreeBSD.patch | 24 ---------------------
.../0007-And-make-it-runnable-on-FreeBSD-too.patch | 22 -------------------
debian/patches/series | 3 ---
5 files changed, 7 insertions(+), 79 deletions(-)
diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index c746df1..398c78c 100644
--- a/debian/patches/0001-disable-updatecheck.patch
+++ b/debian/patches/0001-disable-updatecheck.patch
@@ -7,9 +7,9 @@ Last-Update: 2014-02-17
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: owncloud-client/src/mirall/mirallconfigfile.cpp
===================================================================
---- owncloud-client.orig/src/mirall/mirallconfigfile.cpp 2014-02-25 11:25:40.889067403 +0100
-+++ owncloud-client/src/mirall/mirallconfigfile.cpp 2014-02-25 11:25:40.879067312 +0100
-@@ -344,11 +344,14 @@
+--- owncloud-client.orig/src/mirall/mirallconfigfile.cpp 2014-04-17 23:51:40.480083411 +0200
++++ owncloud-client/src/mirall/mirallconfigfile.cpp 2014-04-17 23:51:40.473416677 +0200
+@@ -341,11 +341,14 @@
QString con( connection );
if( connection.isEmpty() ) con = defaultConnection();
@@ -26,8 +26,10 @@ Index: owncloud-client/src/mirall/mirallconfigfile.cpp
}
void MirallConfigFile::setSkipUpdateCheck( bool skip, const QString& connection )
---- a/src/mirall/generalsettings.cpp
-+++ b/src/mirall/generalsettings.cpp
+Index: owncloud-client/src/mirall/generalsettings.cpp
+===================================================================
+--- owncloud-client.orig/src/mirall/generalsettings.cpp 2014-04-17 23:51:40.480083411 +0200
++++ owncloud-client/src/mirall/generalsettings.cpp 2014-04-17 23:51:40.473416677 +0200
@@ -76,17 +76,7 @@
void GeneralSettings::slotUpdateInfo()
diff --git a/debian/patches/0005-Make-it-an-error-instead-of-a-crash-when-dav_connect.patch b/debian/patches/0005-Make-it-an-error-instead-of-a-crash-when-dav_connect.patch
deleted file mode 100644
index 841856c..0000000
--- a/debian/patches/0005-Make-it-an-error-instead-of-a-crash-when-dav_connect.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Make it an error instead of a crash when dav_connect fails.
- Fixes #1591
-Author: Olivier Goffart <ogoffart at woboq.com>
-Origin: upstream, https://github.com/owncloud/mirall/commit/922e004fc6a1b8e02968f349ff512d972a0bdef2
-Bug-Debian: https://bugs.debian.org/742064
-Date: 20134-03-21
-Last-Update: 2014-03-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/csync/src/csync_owncloud.c
-===================================================================
---- owncloud-client.orig/csync/src/csync_owncloud.c 2014-03-21 17:29:14.581655104 +0100
-+++ owncloud-client/csync/src/csync_owncloud.c 2014-03-21 17:29:14.568321636 +0100
-@@ -979,7 +979,10 @@
-
- DEBUG_WEBDAV("opendir method called on %s", uri );
-
-- dav_connect( uri );
-+ if (dav_connect( uri ) < 0) {
-+ DEBUG_WEBDAV("connection failed");
-+ return NULL;
-+ }
-
- curi = _cleanPath( uri );
- if (is_first_propfind && !dav_session.no_recursive_propfind) {
diff --git a/debian/patches/0006-Fix-build-on-FreeBSD.patch b/debian/patches/0006-Fix-build-on-FreeBSD.patch
deleted file mode 100644
index a55f74b..0000000
--- a/debian/patches/0006-Fix-build-on-FreeBSD.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Mathieu Arnold <mat at mat.cc>
-Date: Tue, 25 Mar 2014 17:19:19 +0100
-Subject: Fix build on FreeBSD.
-
-We use libinotify, so the linux folderwatcher works.
-
-Based on a patch by: Tobias Berner
----
- src/mirall/folderwatcher.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mirall/folderwatcher.cpp b/src/mirall/folderwatcher.cpp
-index 2db8e78..8043700 100644
---- a/src/mirall/folderwatcher.cpp
-+++ b/src/mirall/folderwatcher.cpp
-@@ -29,7 +29,7 @@
- #include "mirall/folderwatcher_win.h"
- #elif defined(Q_OS_MAC)
- #include "mirall/folderwatcher_mac.h"
--#elif defined(Q_OS_LINUX)
-+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
- #include "mirall/folderwatcher_linux.h"
- #endif
-
diff --git a/debian/patches/0007-And-make-it-runnable-on-FreeBSD-too.patch b/debian/patches/0007-And-make-it-runnable-on-FreeBSD-too.patch
deleted file mode 100644
index 9aff5cd..0000000
--- a/debian/patches/0007-And-make-it-runnable-on-FreeBSD-too.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mathieu Arnold <mat at mat.cc>
-Date: Tue, 25 Mar 2014 17:20:05 +0100
-Subject: And make it runnable on FreeBSD too.
-
-Patch by: Tobias Berner
----
- src/mirall/application.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
-index 6c51aac..4615402 100644
---- a/src/mirall/application.cpp
-+++ b/src/mirall/application.cpp
-@@ -64,7 +64,7 @@ static const char optionsC[] =
-
- QString applicationTrPath()
- {
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
- return QString::fromLatin1(DATADIR"/"APPLICATION_EXECUTABLE"/i18n/");
- #endif
- #ifdef Q_OS_MAC
diff --git a/debian/patches/series b/debian/patches/series
index 519565e..a52131e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,3 @@
0002-create-manpage.patch
0003-respect-the-XDG_CONFIG_HOME-env-variable.patch
0004-debian_version.patch
-0005-Make-it-an-error-instead-of-a-crash-when-dav_connect.patch
-0006-Fix-build-on-FreeBSD.patch
-0007-And-make-it-runnable-on-FreeBSD-too.patch
--
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