[Pkg-owncloud-commits] [owncloud-client] 164/164: Use own translation dir.

[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 edbef6f346f2a3ce35560055aafd05f8f8a68383
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sun Mar 22 12:32:23 2015 +0100

    Use own translation dir.
    
    owncloud server and client should use different translation dirs.
    
    BUG: 780057
---
 debian/owncloud-client-l10n.install    |  2 +-
 debian/patches/move_translations.patch | 35 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/owncloud-client-l10n.install b/debian/owncloud-client-l10n.install
index 1efa35e..31ff696 100644
--- a/debian/owncloud-client-l10n.install
+++ b/debian/owncloud-client-l10n.install
@@ -1 +1 @@
-usr/share/owncloud/i18n
+usr/share/owncloud-client/i18n
diff --git a/debian/patches/move_translations.patch b/debian/patches/move_translations.patch
new file mode 100644
index 0000000..d1e87e6
--- /dev/null
+++ b/debian/patches/move_translations.patch
@@ -0,0 +1,35 @@
+Description: Move translation dir
+ owncloud server and client should use different dirs for there translations to
+ make sure they to not disturb each other.
+Author: Sandro Knauß <bugs at sandroknauss.de>
+Origin: Debian
+Bug-Debian: https://bugs.debian.org/780057
+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
+@@ -76,7 +76,7 @@
+ #elif defined(Q_OS_MAC)
+     return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
+ #elif defined(Q_OS_UNIX)
+-    return QString::fromLatin1(DATADIR "/" APPLICATION_EXECUTABLE "/i18n/");
++    return QString::fromLatin1(DATADIR "/" APPLICATION_EXECUTABLE "-client/i18n/");
+ #endif
+ }
+ }
+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 @@
+         endforeach( _file )
+     endif(NOT WIN32)
+ 
+-    install(FILES ${client_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}/i18n)
++    install(FILES ${client_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}-client/i18n)
+ 
+     # we may not add MACOSX_BUNDLE here, if not building one
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 91badc1..ef26114 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-shell_integration_copyright.patch
 0005-remove_admin.patch
 fix-configfile.patch
+move_translations.patch

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