[minetest-v04x] 05/10: update our patches

[Martin Quinson]

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

mquinson pushed a commit to branch master
in repository minetest-v04x.

commit 2d6879487a13ed94e49974e774377e703201f00e
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Tue May 17 07:18:41 2016 +0200

    update our patches
---
 debian/patches/i18n.patch | 28 ++++++++++++----------------
 debian/patches/series     |  2 +-
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/debian/patches/i18n.patch b/debian/patches/i18n.patch
index 569bb15..f144256 100644
--- a/debian/patches/i18n.patch
+++ b/debian/patches/i18n.patch
@@ -1,23 +1,19 @@
-From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Date: Sun, 4 Jan 2015 22:05:51 +0100
-Subject: i18n
-
 Search for translation in the default path
 Forwarded: not-needed
 ---
- src/main.cpp |    2 +-
+ CMakeLists.txt |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: b/src/main.cpp
+Index: b/CMakeLists.txt
 ===================================================================
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -475,7 +475,7 @@ static bool init_common(int *log_level,
- 	init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),
- 		g_settings->get("language"), argc, argv);
- #else
--	init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),
-+	init_gettext("/usr/share/locale",
- 		g_settings->get("language"));
- #endif
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,7 +94,7 @@ elseif(UNIX) # Linux, BSD etc
+ 		set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
+ 		set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
+ 		set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
+-		set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/locale")
++		set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
+ 	endif()
+ endif()
  
diff --git a/debian/patches/series b/debian/patches/series
index 55015c8..981c6ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ kfreebsd-gettext.patch
 i18n.patch
 mapper.patch
 shared_mods.patch
-rawlua.patch
+# rawlua.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-v04x.git