This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository minetest-v04x.
commit aabacf99ca950dea84cae7ec73323844f9c17f91 Author: Markus Koschany <[email protected]> Date: Sun Jan 4 21:16:29 2015 +0100 Update DEP3 headers and remove jthread-changed.patch because it was not applied anyway. --- debian/patches/debianization.patch | 2 ++ debian/patches/dynamic-link.patch | 3 +++ debian/patches/gcc47.patch | 4 +++- debian/patches/hurd.patch | 1 + debian/patches/i18n.patch | 4 +++- debian/patches/kfreebsd-gettext.patch | 3 ++- debian/patches/rawlua.patch | 11 ++++++++++- debian/patches/useless-depends.patch | 7 ++++++- 8 files changed, 30 insertions(+), 5 deletions(-) diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch index a94e9ec..c793fe2 100644 --- a/debian/patches/debianization.patch +++ b/debian/patches/debianization.patch @@ -2,6 +2,8 @@ From: Debian Games Team <[email protected]> Date: Sun, 4 Jan 2015 20:49:22 +0100 Subject: debianization +Link against Debian's Irrlicht engine. + --- cmake/Modules/FindIrrlicht.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/dynamic-link.patch b/debian/patches/dynamic-link.patch index 56a72e4..bbc4416 100644 --- a/debian/patches/dynamic-link.patch +++ b/debian/patches/dynamic-link.patch @@ -2,6 +2,9 @@ From: Debian Games Team <[email protected]> Date: Sun, 4 Jan 2015 20:49:22 +0100 Subject: dynamic-link +Changes the static linking of external libraries to dynamic link +Original patch by Matthew Bekkema <[email protected]> + --- cmake/Modules/FindJson.cmake | 24 +++++++++++------------- src/CMakeLists.txt | 3 --- diff --git a/debian/patches/gcc47.patch b/debian/patches/gcc47.patch index 07ebbff..5affd0b 100644 --- a/debian/patches/gcc47.patch +++ b/debian/patches/gcc47.patch @@ -1,7 +1,9 @@ -From: Debian Games Team <[email protected]> +From: P. J. McDermott" <[email protected]> Date: Sun, 4 Jan 2015 20:49:22 +0100 Subject: gcc47 +Fix FTBFS with gcc-4.7 +Bug: http://bugs.debian.org/667280 --- src/filesys.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch index 64d3f78..d855266 100644 --- a/debian/patches/hurd.patch +++ b/debian/patches/hurd.patch @@ -2,6 +2,7 @@ From: Markus Koschany <[email protected]> Date: Sun, 4 Jan 2015 21:03:07 +0100 Subject: hurd +Make Minetest compile on GNU/Hurd. --- src/cguittfont/irrUString.h | 2 +- src/jthread/jevent.h | 4 ++-- diff --git a/debian/patches/i18n.patch b/debian/patches/i18n.patch index 23e28ea..6c4e79f 100644 --- a/debian/patches/i18n.patch +++ b/debian/patches/i18n.patch @@ -1,7 +1,9 @@ -From: Debian Games Team <[email protected]> +From: Martin Quinson Date: Sun, 4 Jan 2015 20:49:22 +0100 Subject: i18n +Search for translation in the default path +Forwarded: not-needed --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/kfreebsd-gettext.patch b/debian/patches/kfreebsd-gettext.patch index 52fc044..49c07d3 100644 --- a/debian/patches/kfreebsd-gettext.patch +++ b/debian/patches/kfreebsd-gettext.patch @@ -1,7 +1,8 @@ -From: Debian Games Team <[email protected]> +From: Matthew Bekkema <[email protected]> Date: Sun, 4 Jan 2015 20:49:22 +0100 Subject: kfreebsd-gettext +Fix the build on kFreeBSD as it uses glibc --- cmake/Modules/FindGettextLib.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/rawlua.patch b/debian/patches/rawlua.patch index 777937a..ef61f18 100644 --- a/debian/patches/rawlua.patch +++ b/debian/patches/rawlua.patch @@ -1,7 +1,16 @@ -From: Debian Games Team <[email protected]> +From: Martin Quinson Date: Sun, 4 Jan 2015 20:49:23 +0100 Subject: rawlua +use the right version of lua when not using luajit +When available, we use the luajit for performance. But when this is not +available (as on hurd mipsel and other architecture), we fallback to the raw +lua implementation. +Upstream embeeds its own copy of lua implementation for that case, but we prune +it and prefer the system version of lua. This patch is here to use the +correct name of the lua library in that case. + +Forwarded: not-needed --- src/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/useless-depends.patch b/debian/patches/useless-depends.patch index bfba067..5f92e1f 100644 --- a/debian/patches/useless-depends.patch +++ b/debian/patches/useless-depends.patch @@ -1,7 +1,12 @@ -From: Debian Games Team <[email protected]> +From: Matthew Bekkema <[email protected]> Date: Sun, 4 Jan 2015 20:49:22 +0100 Subject: useless-depends +Removes the useless dependancies This was reported by dpkg-shlibs, that warned +that our binary was marked as depending on various libs without any reason as +no symbol were used. + +Forwarded: no --- src/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-v04x.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
