[Pkg-owncloud-commits] [owncloud-client] 02/05: Readd removed part of 0006-move-configfile.patch

Sandro Knauß hefee at debian.org
Thu Jun 22 17:30:21 UTC 2017


This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository owncloud-client.

commit 354050bcbe4d8d7c789014bc3633b823780d6654
Author: Sandro Knauß <hefee at debian.org>
Date:   Thu Jun 22 19:02:42 2017 +0200

    Readd removed part of 0006-move-configfile.patch
    
    Closes: 865455
---
 debian/patches/0006-move-configfile.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/patches/0006-move-configfile.patch b/debian/patches/0006-move-configfile.patch
index d39a542..fb47a02 100644
--- a/debian/patches/0006-move-configfile.patch
+++ b/debian/patches/0006-move-configfile.patch
@@ -16,3 +16,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_EXECUTABLE}-client )
      configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
  endif()
+--- a/src/libsync/configfile.cpp
++++ b/src/libsync/configfile.cpp
+@@ -257,7 +257,7 @@ QString ConfigFile::excludeFileFromSyste
+     fi.setFile( QCoreApplication::applicationDirPath(), exclFile );
+ #endif
+ #ifdef Q_OS_UNIX
+-    fi.setFile(QString(SYSCONFDIR "/" + Theme::instance()->appName()), exclFile);
++    fi.setFile(QString(SYSCONFDIR "/" APPLICATION_EXECUTABLE "-client"), exclFile);
+     if ( ! fi.exists() ) {
+         // Prefer to return the preferred path! Only use the fallback location
+         // if the other path does not exist and the fallback is valid.

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