[Pkg-owncloud-commits] [owncloud-client] 159/159: Update patch hunks.
Sandro Knauß
hefee-guest at moszumanska.debian.org
Fri May 1 13:05:40 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 a50b28a8b007079e7b8970dbce5c7017dd499e37
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Fri May 1 13:44:16 2015 +0200
Update patch hunks.
---
debian/patches/0001-disable-updatecheck.patch | 10 ++---
debian/patches/0006-move-configfile.patch | 10 ++---
debian/patches/0007-move-translations.patch | 10 ++---
.../patches/0008-fix-python3-syntax-errors.patch | 43 ----------------------
debian/patches/series | 1 -
5 files changed, 15 insertions(+), 59 deletions(-)
diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index 9696a7c..3fa7189 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-02-20 00:57:12.329259789 +0100
-+++ owncloud-client/src/libsync/configfile.cpp 2015-02-20 00:57:12.322593059 +0100
-@@ -383,11 +383,14 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp 2015-05-01 13:19:44.407780748 +0200
++++ owncloud-client/src/libsync/configfile.cpp 2015-05-01 13:19:44.394447295 +0200
+@@ -371,11 +371,14 @@
QString con( connection );
if( connection.isEmpty() ) con = defaultConnection();
@@ -29,8 +29,8 @@ 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-02-20 00:57:12.329259789 +0100
-+++ owncloud-client/src/gui/generalsettings.cpp 2015-02-20 00:57:12.325926424 +0100
+--- owncloud-client.orig/src/gui/generalsettings.cpp 2015-05-01 13:19:44.407780748 +0200
++++ owncloud-client/src/gui/generalsettings.cpp 2015-05-01 13:19:44.397780659 +0200
@@ -85,17 +85,7 @@
void GeneralSettings::slotUpdateInfo()
diff --git a/debian/patches/0006-move-configfile.patch b/debian/patches/0006-move-configfile.patch
index 6e3ae93..9293b5b 100644
--- a/debian/patches/0006-move-configfile.patch
+++ b/debian/patches/0006-move-configfile.patch
@@ -8,8 +8,8 @@ Last-Update: 2015-03-22
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: owncloud-client/CMakeLists.txt
===================================================================
---- owncloud-client.orig/CMakeLists.txt 2015-03-22 11:49:21.000000000 +0100
-+++ owncloud-client/CMakeLists.txt 2015-03-22 11:49:21.000000000 +0100
+--- owncloud-client.orig/CMakeLists.txt 2015-05-01 13:19:56.397888238 +0200
++++ owncloud-client/CMakeLists.txt 2015-05-01 13:19:56.391221511 +0200
@@ -205,6 +205,6 @@
if(BUILD_OWNCLOUD_OSX_BUNDLE)
install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
@@ -20,9 +20,9 @@ Index: owncloud-client/CMakeLists.txt
endif()
Index: owncloud-client/src/libsync/configfile.cpp
===================================================================
---- owncloud-client.orig/src/libsync/configfile.cpp 2015-03-22 11:49:21.000000000 +0100
-+++ owncloud-client/src/libsync/configfile.cpp 2015-03-22 11:58:30.502975192 +0100
-@@ -243,7 +243,7 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp 2015-05-01 13:19:56.397888238 +0200
++++ owncloud-client/src/libsync/configfile.cpp 2015-05-01 13:19:56.391221511 +0200
+@@ -245,7 +245,7 @@
fi.setFile( QCoreApplication::applicationDirPath(), exclFile );
#endif
#ifdef Q_OS_UNIX
diff --git a/debian/patches/0007-move-translations.patch b/debian/patches/0007-move-translations.patch
index d1e87e6..e4853c1 100644
--- a/debian/patches/0007-move-translations.patch
+++ b/debian/patches/0007-move-translations.patch
@@ -9,8 +9,8 @@ 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-03-22 11:54:45.000000000 +0100
-+++ owncloud-client/src/gui/application.cpp 2015-03-22 11:58:43.000000000 +0100
+--- owncloud-client.orig/src/gui/application.cpp 2015-05-01 13:20:02.394608675 +0200
++++ owncloud-client/src/gui/application.cpp 2015-05-01 13:20:02.384608585 +0200
@@ -76,7 +76,7 @@
#elif defined(Q_OS_MAC)
return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
@@ -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-03-22 11:54:45.000000000 +0100
-+++ owncloud-client/src/gui/CMakeLists.txt 2015-03-22 11:58:43.000000000 +0100
-@@ -195,7 +195,7 @@
+--- owncloud-client.orig/src/gui/CMakeLists.txt 2015-05-01 13:20:02.394608675 +0200
++++ owncloud-client/src/gui/CMakeLists.txt 2015-05-01 13:20:02.384608585 +0200
+@@ -204,7 +204,7 @@
endforeach( _file )
endif(NOT WIN32)
diff --git a/debian/patches/0008-fix-python3-syntax-errors.patch b/debian/patches/0008-fix-python3-syntax-errors.patch
deleted file mode 100644
index 0537f8c..0000000
--- a/debian/patches/0008-fix-python3-syntax-errors.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b1100cd9e5cf7748b953e6ccecca8f6e90644f7e Mon Sep 17 00:00:00 2001
-From: Hefee <hefee at netzguerilla.net>
-Date: Sun, 22 Mar 2015 17:49:09 +0100
-Subject: [PATCH] fix python3 syntax errors
-
----
- shell_integration/nautilus/syncstate.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/shell_integration/nautilus/syncstate.py b/shell_integration/nautilus/syncstate.py
-index 0b5e37d..bfa18ee 100755
---- a/shell_integration/nautilus/syncstate.py
-+++ b/shell_integration/nautilus/syncstate.py
-@@ -67,7 +67,7 @@ class SocketConnect(GObject.GObject):
- print("Sending failed.")
- self.reconnect()
- else:
-- print "Cannot send, not connected!"
-+ print("Cannot send, not connected!")
-
- def addListener(self, listener):
- self._listeners.append(listener)
-@@ -85,7 +85,7 @@ class SocketConnect(GObject.GObject):
- self.connected = True
- print("Setting connected to %r" % self.connected )
- self._watch_id = GObject.io_add_watch(self._sock, GObject.IO_IN, self._handle_notify)
-- print "Socket watch id: "+str(self._watch_id)
-+ print("Socket watch id: "+str(self._watch_id))
- return False # don't run again
- except Exception as e:
- print("Could not connect to unix socket." + str(e))
-@@ -175,7 +175,7 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
-
- def menu_share(self, menu, file):
- filename = get_local_path(file.get_uri())
-- print "Share file "+filename
-+ print("Share file "+filename)
- socketConnect.sendCommand("SHARE:"+filename+"\n")
-
-
---
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 6587213..d005e72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
0005-remove_admin.patch
0006-move-configfile.patch
0007-move-translations.patch
-0008-fix-python3-syntax-errors.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