[Pkg-owncloud-commits] [owncloud-client] 06/13: Update patches with new upstream
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue May 10 23:26:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch experimental
in repository owncloud-client.
commit 36a260b2163eb60d967988bfecee5988496e71a3
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Tue May 10 22:06:05 2016 +0200
Update patches with new upstream
---
debian/patches/0001-disable-updatecheck.patch | 18 +++++-----
debian/patches/0003-skip_tests_freebsd.patch | 14 ++++----
debian/patches/0005-remove_admin.patch | 6 ++--
debian/patches/0006-move-configfile.patch | 12 +++----
debian/patches/0007-move-translations.patch | 10 +++---
debian/patches/0008-make-reproducable.patch | 6 ++--
.../0009-fix-installpath-of-dolphin-plugin.patch | 39 +++++++++++-----------
7 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index 8bcad36..80f00c4 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 2016-02-05 14:36:48.485447473 +0100
-+++ owncloud-client/src/libsync/configfile.cpp 2016-02-05 14:36:48.485447473 +0100
-@@ -412,11 +412,14 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp 2016-05-10 16:18:00.208282262 +0200
++++ owncloud-client/src/libsync/configfile.cpp 2016-05-10 16:18:00.204282179 +0200
+@@ -415,11 +415,14 @@
QString con( connection );
if( connection.isEmpty() ) con = defaultConnection();
@@ -29,17 +29,17 @@ 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 2016-02-05 14:36:48.485447473 +0100
-+++ owncloud-client/src/gui/generalsettings.cpp 2016-02-05 14:36:48.485447473 +0100
+--- owncloud-client.orig/src/gui/generalsettings.cpp 2016-05-10 16:18:00.208282262 +0200
++++ owncloud-client/src/gui/generalsettings.cpp 2016-05-10 16:19:30.582159945 +0200
@@ -109,6 +109,7 @@
void GeneralSettings::slotUpdateInfo()
{
+ /* 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);
-@@ -116,9 +117,12 @@
+ OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance());
+ if (ConfigFile().skipUpdateCheck()) {
+ updater = 0; // don't show update info if updates are disabled
+@@ -121,9 +122,12 @@
_ui->updateStateLabel->setText(updater->statusString());
_ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
} else {
diff --git a/debian/patches/0003-skip_tests_freebsd.patch b/debian/patches/0003-skip_tests_freebsd.patch
index 80ce5ad..7a5a7ca 100644
--- a/debian/patches/0003-skip_tests_freebsd.patch
+++ b/debian/patches/0003-skip_tests_freebsd.patch
@@ -6,11 +6,11 @@ Bug-Debian: https://bugs.debian.org/750903
Last-Update: 2014-07-29
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/test/testfolderwatcher.h
+Index: owncloud-client/test/testfolderwatcher.cpp
===================================================================
---- owncloud-client.orig/test/testfolderwatcher.h 2015-02-20 00:59:47.220725178 +0100
-+++ owncloud-client/test/testfolderwatcher.h 2015-02-20 01:00:42.757917410 +0100
-@@ -112,6 +112,9 @@
+--- owncloud-client.orig/test/testfolderwatcher.cpp 2016-05-10 21:49:33.941389153 +0200
++++ owncloud-client/test/testfolderwatcher.cpp 2016-05-10 21:49:33.937389072 +0200
+@@ -109,6 +109,9 @@
}
void testCreateADir() {
@@ -20,7 +20,7 @@ Index: owncloud-client/test/testfolderwatcher.h
QString file(_root+"/a1/b1/new_dir");
_requiredNotifications.insert(file);
//_skipNotifications.insert(_root + "/a1/b1/new_dir");
-@@ -123,6 +126,9 @@
+@@ -120,6 +123,9 @@
}
void testRemoveADir() {
@@ -30,7 +30,7 @@ Index: owncloud-client/test/testfolderwatcher.h
QString file(_root+"/a1/b3/c3");
_requiredNotifications.insert(file);
QDir dir;
-@@ -132,6 +138,9 @@
+@@ -129,6 +135,9 @@
}
void testRemoveAFile() {
@@ -40,7 +40,7 @@ Index: owncloud-client/test/testfolderwatcher.h
QString file(_root+"/a1/b2/todelete.bin");
_requiredNotifications.insert(file);
QVERIFY(QFile::exists(file));
-@@ -154,6 +163,9 @@
+@@ -151,6 +160,9 @@
}
void testMoveAFile() {
diff --git a/debian/patches/0005-remove_admin.patch b/debian/patches/0005-remove_admin.patch
index 6d2d7a9..c2d77c4 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 2015-12-15 19:10:53.310312533 +0100
-+++ owncloud-client/CMakeLists.txt 2015-12-15 19:10:53.306312517 +0100
-@@ -196,7 +196,6 @@
+--- owncloud-client.orig/CMakeLists.txt 2016-05-10 21:49:43.073572898 +0200
++++ owncloud-client/CMakeLists.txt 2016-05-10 21:49:43.069572817 +0200
+@@ -173,7 +173,6 @@
add_subdirectory(shell_integration)
add_subdirectory(doc)
add_subdirectory(doc/dev)
diff --git a/debian/patches/0006-move-configfile.patch b/debian/patches/0006-move-configfile.patch
index a1a60eb..b36bccc 100644
--- a/debian/patches/0006-move-configfile.patch
+++ b/debian/patches/0006-move-configfile.patch
@@ -8,9 +8,9 @@ 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 2016-02-05 14:37:14.101524409 +0100
-+++ owncloud-client/CMakeLists.txt 2016-02-05 14:37:14.097524397 +0100
-@@ -208,6 +208,6 @@
+--- owncloud-client.orig/CMakeLists.txt 2016-05-10 21:49:47.097653904 +0200
++++ owncloud-client/CMakeLists.txt 2016-05-10 21:49:47.093653823 +0200
+@@ -185,6 +185,6 @@
install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
else()
@@ -20,9 +20,9 @@ Index: owncloud-client/CMakeLists.txt
endif()
Index: owncloud-client/src/libsync/configfile.cpp
===================================================================
---- owncloud-client.orig/src/libsync/configfile.cpp 2016-02-05 14:37:14.101524409 +0100
-+++ owncloud-client/src/libsync/configfile.cpp 2016-02-05 14:37:14.097524397 +0100
-@@ -268,7 +268,7 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp 2016-05-10 21:49:47.097653904 +0200
++++ owncloud-client/src/libsync/configfile.cpp 2016-05-10 21:49:47.093653823 +0200
+@@ -255,7 +255,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 e2b6579..6115156 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-12-15 19:12:34.750699715 +0100
-+++ owncloud-client/src/gui/application.cpp 2015-12-15 19:12:34.750699715 +0100
+--- owncloud-client.orig/src/gui/application.cpp 2016-05-10 21:49:51.585744280 +0200
++++ owncloud-client/src/gui/application.cpp 2016-05-10 21:49:51.581744199 +0200
@@ -84,7 +84,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-12-15 19:12:34.750699715 +0100
-+++ owncloud-client/src/gui/CMakeLists.txt 2015-12-15 19:12:51.358764758 +0100
-@@ -237,7 +237,7 @@
+--- owncloud-client.orig/src/gui/CMakeLists.txt 2016-05-10 21:49:51.585744280 +0200
++++ owncloud-client/src/gui/CMakeLists.txt 2016-05-10 21:49:51.581744199 +0200
+@@ -244,7 +244,7 @@
endforeach( _file )
endif(NOT WIN32)
diff --git a/debian/patches/0008-make-reproducable.patch b/debian/patches/0008-make-reproducable.patch
index 4b57e2f..dbe6240 100644
--- a/debian/patches/0008-make-reproducable.patch
+++ b/debian/patches/0008-make-reproducable.patch
@@ -13,9 +13,9 @@ Last-Update: 2015-08-22
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: owncloud-client/src/libsync/theme.cpp
===================================================================
---- owncloud-client.orig/src/libsync/theme.cpp 2015-08-22 16:39:29.591478611 +0200
-+++ owncloud-client/src/libsync/theme.cpp 2015-08-22 16:39:29.584811875 +0200
-@@ -262,20 +262,8 @@
+--- owncloud-client.orig/src/libsync/theme.cpp 2016-05-10 21:49:55.969832589 +0200
++++ owncloud-client/src/libsync/theme.cpp 2016-05-10 21:49:55.965832509 +0200
+@@ -263,20 +263,8 @@
QString Theme::gitSHA1() const
{
diff --git a/debian/patches/0009-fix-installpath-of-dolphin-plugin.patch b/debian/patches/0009-fix-installpath-of-dolphin-plugin.patch
index 804695d..54d80a4 100644
--- a/debian/patches/0009-fix-installpath-of-dolphin-plugin.patch
+++ b/debian/patches/0009-fix-installpath-of-dolphin-plugin.patch
@@ -9,28 +9,27 @@ Last-Update: 2016-02-05
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: owncloud-client/shell_integration/dolphin/CMakeLists.txt
===================================================================
---- owncloud-client.orig/shell_integration/dolphin/CMakeLists.txt 2016-02-05 14:21:33.305527000 +0100
-+++ owncloud-client/shell_integration/dolphin/CMakeLists.txt 2016-02-05 14:21:33.305527000 +0100
-@@ -32,15 +32,20 @@
- add_library(ownclouddolphinpluginhelper SHARED ownclouddolphinpluginhelper.cpp)
- target_link_libraries(ownclouddolphinpluginhelper Qt5::Network)
- generate_export_header(ownclouddolphinpluginhelper)
--install(TARGETS ownclouddolphinpluginhelper LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(TARGETS ownclouddolphinpluginhelper LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
+--- owncloud-client.orig/shell_integration/dolphin/CMakeLists.txt 2016-05-10 21:50:25.770433598 +0200
++++ owncloud-client/shell_integration/dolphin/CMakeLists.txt 2016-05-10 21:53:11.801802552 +0200
+@@ -37,17 +37,19 @@
+ add_library(${OWNCLOUDDOLPHINHELPER} SHARED ownclouddolphinpluginhelper.cpp)
+ target_link_libraries(${OWNCLOUDDOLPHINHELPER} Qt5::Network)
+ generate_export_header(${OWNCLOUDDOLPHINHELPER})
+-install(TARGETS ${OWNCLOUDDOLPHINHELPER} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS ${OWNCLOUDDOLPHINHELPER} LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
#---OVERLAY PLUGIN---
- kcoreaddons_add_plugin(ownclouddolphinoverlayplugin INSTALL_NAMESPACE "kf5/overlayicon"
+ set(OWNCLOUDDOLPHINOVERLAYPLUGIN ${APPLICATION_EXECUTABLE}dolphinoverlayplugin)
+ kcoreaddons_add_plugin(${OWNCLOUDDOLPHINOVERLAYPLUGIN} INSTALL_NAMESPACE "kf5/overlayicon"
JSON ownclouddolphinoverlayplugin.json SOURCES ownclouddolphinoverlayplugin.cpp)
- target_link_libraries(ownclouddolphinoverlayplugin KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ownclouddolphinpluginhelper)
-+set_target_properties(ownclouddolphinoverlayplugin PROPERTIES
-+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
+ target_link_libraries(${OWNCLOUDDOLPHINOVERLAYPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER})
++set_target_properties(${OWNCLOUDDOLPHINOVERLAYPLUGIN} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
#---ACTION PLUGIN---
- add_library(ownclouddolphinactionplugin MODULE ownclouddolphinactionplugin.cpp)
- target_link_libraries(ownclouddolphinactionplugin KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ownclouddolphinpluginhelper)
- install(FILES ownclouddolphinactionplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
--install(TARGETS ownclouddolphinactionplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
-+install(TARGETS ownclouddolphinactionplugin DESTINATION "${PLUGIN_INSTALL_DIR}")
-+
-+set_target_properties(ownclouddolphinactionplugin PROPERTIES
-+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
+ set(OWNCLOUDDOLPHINACTIONPLUGIN ${APPLICATION_EXECUTABLE}dolphinactionplugin)
+ add_library(${OWNCLOUDDOLPHINACTIONPLUGIN} MODULE ownclouddolphinactionplugin.cpp)
+ target_link_libraries(${OWNCLOUDDOLPHINACTIONPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER})
+ install(FILES ownclouddolphinactionplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop)
+-install(TARGETS ${OWNCLOUDDOLPHINACTIONPLUGIN} DESTINATION ${KDE_INSTALL_PLUGINDIR})
++install(TARGETS ${OWNCLOUDDOLPHINACTIONPLUGIN} DESTINATION "${PLUGIN_INSTALL_DIR}")
++set_target_properties(${OWNCLOUDDOLPHINACTIONPLUGIN} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
--
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