[Pkg-owncloud-commits] [owncloud-client] 103/103: Removed 0003-respect-the-XDG_CONFIG_HOME-env-variable.patch (is now upstream)

[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 834a6675c3982706095c725974872c115a077f1d
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Wed Apr 30 19:51:45 2014 +0200

    Removed 0003-respect-the-XDG_CONFIG_HOME-env-variable.patch (is now upstream)
---
 ...-respect-the-XDG_CONFIG_HOME-env-variable.patch | 46 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 47 deletions(-)

diff --git a/debian/patches/0003-respect-the-XDG_CONFIG_HOME-env-variable.patch b/debian/patches/0003-respect-the-XDG_CONFIG_HOME-env-variable.patch
deleted file mode 100644
index 0351caf..0000000
--- a/debian/patches/0003-respect-the-XDG_CONFIG_HOME-env-variable.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Respect XDG_CONFIG_DIR env variable
- On Linux you can set the config dir to store configfiles via the XDG_CONFIG_DIR.
-Author: Sandro Knauß <bugs at sandroknauss.de>
-Origin: debian
-Forwarded: https://github.com/owncloud/mirall/pull/1324
-Last-Update: 2013-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/src/mirall/utility_unix.cpp
-===================================================================
---- owncloud-client.orig/src/mirall/utility_unix.cpp	2013-12-30 21:53:33.306904018 +0100
-+++ owncloud-client/src/mirall/utility_unix.cpp	2013-12-30 22:08:03.739334896 +0100
-@@ -26,17 +26,30 @@
-     }
- }
- 
-+// returns the autostart directory the linux way
-+// and respects the XDG_CONFIG_HOME env variable
-+// can be replaces for qt5 with QStandardPaths
-+QString getUserAutostartDir_private()
-+{
-+    QString config = QLatin1String(qgetenv("XDG_CONFIG_HOME"));
-+
-+    if (config.isEmpty()) {
-+        config = QDir::homePath()+QLatin1String("/.config");
-+    }
-+    config += QLatin1String("/autostart/");
-+    return config;
-+}
-+
- bool hasLaunchOnStartup_private(const QString &appName)
- {
--    QString userAutoStartPath = QDir::homePath()+QLatin1String("/.config/autostart/");
--    QString desktopFileLocation = userAutoStartPath+appName+QLatin1String(".desktop");
-+    QString desktopFileLocation = getUserAutostartDir_private()+appName+QLatin1String(".desktop");
-     return QFile::exists(desktopFileLocation);
- }
- 
- 
- void setLaunchOnStartup_private(const QString &appName, const QString& guiName, bool enable)
- {
--    QString userAutoStartPath = QDir::homePath()+QLatin1String("/.config/autostart/");
-+    QString userAutoStartPath = getUserAutostartDir_private();
-     QString desktopFileLocation = userAutoStartPath+appName+QLatin1String(".desktop");
-     if (enable) {
-         if (!QDir().exists(userAutoStartPath) && !QDir().mkdir(userAutoStartPath)) {
diff --git a/debian/patches/series b/debian/patches/series
index 0ea8022..f059c93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-disable-updatecheck.patch
 0002-create-manpage.patch
-0003-respect-the-XDG_CONFIG_HOME-env-variable.patch
 0004-debian_version.patch
 freebsd.patch

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