[Pkg-owncloud-commits] [owncloud-client] 02/04: Added dep3 header to freebsd.patch

Sandro Knauß hefee-guest at moszumanska.debian.org
Wed May 7 18:29:22 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 d0a91808554e86f4023220e553f078b4daa2a93a
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Wed May 7 20:23:47 2014 +0200

    Added dep3 header to freebsd.patch
    
    git-dch: ignore
---
 debian/patches/freebsd.patch | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/patches/freebsd.patch b/debian/patches/freebsd.patch
index 55ffb1d..8463c03 100644
--- a/debian/patches/freebsd.patch
+++ b/debian/patches/freebsd.patch
@@ -1,7 +1,14 @@
+Description: Make Debian GNU/kFreeBSD compile
+Author: Sandro Knauß <bugs at sandroknauss.de>
+Origin: debian
+Bug:  https://github.com/owncloud/mirall/pull/1726
+Last-Update: 2014-05-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/src/mirall/folderwatcher.cpp
 ===================================================================
---- owncloud-client.orig/src/mirall/folderwatcher.cpp	2014-04-23 12:21:50.760565989 +0200
-+++ owncloud-client/src/mirall/folderwatcher.cpp	2014-04-23 18:24:03.378650910 +0200
+--- owncloud-client.orig/src/mirall/folderwatcher.cpp	2014-04-30 19:43:20.848684999 +0200
++++ owncloud-client/src/mirall/folderwatcher.cpp	2014-05-07 19:49:54.000000000 +0200
 @@ -29,7 +29,7 @@
  #include "mirall/folderwatcher_win.h"
  #elif defined(Q_OS_MAC)
@@ -13,8 +20,8 @@ Index: owncloud-client/src/mirall/folderwatcher.cpp
  
 Index: owncloud-client/src/mirall/application.cpp
 ===================================================================
---- owncloud-client.orig/src/mirall/application.cpp	2014-04-23 12:20:32.508158583 +0200
-+++ owncloud-client/src/mirall/application.cpp	2014-04-23 18:25:36.649218667 +0200
+--- owncloud-client.orig/src/mirall/application.cpp	2014-04-30 19:47:39.267789831 +0200
++++ owncloud-client/src/mirall/application.cpp	2014-05-07 19:49:54.000000000 +0200
 @@ -64,7 +64,7 @@
  
  QString applicationTrPath()
@@ -26,9 +33,9 @@ Index: owncloud-client/src/mirall/application.cpp
  #ifdef Q_OS_MAC
 Index: owncloud-client/src/mirall/utility.cpp
 ===================================================================
---- owncloud-client.orig/src/mirall/utility.cpp	2014-04-22 19:38:44.769059208 +0200
-+++ owncloud-client/src/mirall/utility.cpp	2014-04-23 18:26:25.019513848 +0200
-@@ -140,7 +140,7 @@
+--- owncloud-client.orig/src/mirall/utility.cpp	2014-04-30 19:47:39.291123384 +0200
++++ owncloud-client/src/mirall/utility.cpp	2014-05-07 19:49:54.000000000 +0200
+@@ -143,7 +143,7 @@
      return QLatin1String("Linux");
  #elif defined(__DragonFly__) // Q_OS_FREEBSD also defined
      return QLatin1String("DragonFlyBSD");
@@ -37,7 +44,7 @@ Index: owncloud-client/src/mirall/utility.cpp
      return QLatin1String("FreeBSD");
  #elif defined(Q_OS_NETBSD)
      return QLatin1String("NetBSD");
-@@ -193,7 +193,7 @@
+@@ -199,7 +199,7 @@
  
  qint64 Utility::freeDiskSpace(const QString &path, bool *ok)
  {

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