[Pkg-owncloud-commits] [owncloud-client] 05/06: update hunks for patches

[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 50a0a93aad83a0c301c7d8991cbc7ca2c7f7110c
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Dec 20 17:26:02 2014 +0100

    update hunks for patches
---
 debian/patches/0003-skip_tests_freebsd.patch | 42 ++++++++++++++--------------
 debian/patches/0005-remove_admin.patch       |  6 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/debian/patches/0003-skip_tests_freebsd.patch b/debian/patches/0003-skip_tests_freebsd.patch
index f502b6c..ed76e83 100644
--- a/debian/patches/0003-skip_tests_freebsd.patch
+++ b/debian/patches/0003-skip_tests_freebsd.patch
@@ -8,45 +8,45 @@ Last-Update: 2014-07-29
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/test/testfolderwatcher.h
 ===================================================================
---- owncloud-client.orig/test/testfolderwatcher.h	2014-08-03 22:14:05.610104237 +0200
-+++ owncloud-client/test/testfolderwatcher.h	2014-08-03 22:15:59.697870019 +0200
-@@ -82,6 +82,9 @@
+--- owncloud-client.orig/test/testfolderwatcher.h	2014-12-20 15:44:19.687299728 +0100
++++ owncloud-client/test/testfolderwatcher.h	2014-12-20 15:46:25.141787079 +0100
+@@ -110,6 +110,9 @@
      }
  
      void testCreateADir() {
-+        #if defined(Q_OS_FREEBSD_KERNEL)
++#if defined(Q_OS_FREEBSD_KERNEL)
 +        QSKIP("Test fails on BSD", QTest::SkipSingle);
-+        #endif
-         _checkMark = _root+"/a1/b1";
++#endif
+         _requiredNotifications.insert(_root+"/a1/b1");
+         _skipNotifications.insert(_root + "/a1/b1/new_dir");
          QDir dir;
-         dir.mkdir( _root + "/a1/b1/new_dir");
-@@ -91,6 +94,9 @@
+@@ -120,6 +123,9 @@
      }
  
      void testRemoveADir() {
-+        #if defined(Q_OS_FREEBSD_KERNEL)
++#if defined(Q_OS_FREEBSD_KERNEL)
 +        QSKIP("Test fails on BSD", QTest::SkipSingle);
-+        #endif
-         _checkMark = _root+"/a1/b3";
++#endif
+         _requiredNotifications.insert(_root+"/a1/b3");
          QDir dir;
          QVERIFY(dir.rmdir(_root+"/a1/b3/c3"));
-@@ -99,6 +105,9 @@
+@@ -128,6 +134,9 @@
      }
  
      void testRemoveAFile() {
-+        #if defined(Q_OS_FREEBSD_KERNEL)
++#if defined(Q_OS_FREEBSD_KERNEL)
 +        QSKIP("Test fails on BSD", QTest::SkipSingle);
-+        #endif
-         _checkMark = _root+"/a1/b2";
++#endif
+         _requiredNotifications.insert(_root+"/a1/b2");
          QVERIFY(QFile::exists(_root+"/a1/b2/todelete.bin"));
          QFile::remove(_root+"/a1/b2/todelete.bin");
-@@ -108,6 +117,9 @@
+@@ -146,6 +155,9 @@
      }
  
      void testMoveAFile() {
-+        #if defined(Q_OS_FREEBSD_KERNEL)
++#if defined(Q_OS_FREEBSD_KERNEL)
 +        QSKIP("Test fails on BSD", QTest::SkipSingle);
-+        #endif
-         _checkMark = _root+"/a2";
-         QVERIFY(QFile::exists(_root+"/a2/movefile"));
-         QFile::rename(_root+"/a2/movefile", _root+"/a2/movefile.renamed" );
++#endif
+         _requiredNotifications.insert(_root+"/a1");
+         _requiredNotifications.insert(_root+"/a2");
+         QVERIFY(QFile::exists(_root+"/a1/movefile"));
diff --git a/debian/patches/0005-remove_admin.patch b/debian/patches/0005-remove_admin.patch
index 8597cdc..5c28990 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	2014-11-07 20:03:54.274172246 +0100
-+++ owncloud-client/CMakeLists.txt	2014-11-07 20:03:54.264172126 +0100
-@@ -156,7 +156,6 @@
+--- owncloud-client.orig/CMakeLists.txt	2014-12-20 15:47:17.555602575 +0100
++++ owncloud-client/CMakeLists.txt	2014-12-20 15:47:17.545602483 +0100
+@@ -162,7 +162,6 @@
  add_subdirectory(src)
  add_subdirectory(shell_integration)
  add_subdirectory(doc)

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