[minetest-v04x] 01/01: Add FindIrrlicht.cmake.patch as a replacement for debianization.patch.

[Markus Koschany]

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 3a2ea6f6d98830641c46cc8f07fb34a779c0f0e5
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Feb 21 16:47:09 2015 +0100

    Add FindIrrlicht.cmake.patch as a replacement for debianization.patch.
    
    This patch appends libIrrlicht.so to the search path instead of replacing other
    alternatives and might be easier to accept for upstream.
---
 debian/changelog                        |  3 ++-
 debian/patches/FindIrrlicht.cmake.patch | 21 +++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d5a99ef..d3946d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,8 @@ minetest (0.4.12+repack-1) UNRELEASED; urgency=medium
   * Remove dh_auto_build override. Use --parallel with main dh invocation.
   * Use dh_auto_configure command to pass on build flags. Do not call cmake
     manually.
-  * Drop debianization.patch. It is not needed to find the Irrlicht library.
+  * Rename debianization.patch to FindIrrlicht.cmake.patch. Append
+    libIrrlicht.so to search patch instead of replacing other alternatives.
   * Drop dynamic-link.patch. Add FindJson.cmake.patch instead.
     - Remove unnecessary hunks and patch only FindJson.cmake module. This
       ensures that Debian's system json library will be used and simplifies
diff --git a/debian/patches/FindIrrlicht.cmake.patch b/debian/patches/FindIrrlicht.cmake.patch
new file mode 100644
index 0000000..97c55b5
--- /dev/null
+++ b/debian/patches/FindIrrlicht.cmake.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sat, 21 Feb 2015 16:45:20 +0100
+Subject: FindIrrlicht.cmake
+
+---
+ cmake/Modules/FindIrrlicht.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
+index dce78fb..bc781a2 100644
+--- a/cmake/Modules/FindIrrlicht.cmake
++++ b/cmake/Modules/FindIrrlicht.cmake
+@@ -44,7 +44,7 @@ else()
+ 		/usr/include/irrlicht
+ 	)
+ 
+-	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
++	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so libIrrlicht.a Irrlicht
+ 		PATHS
+ 		/usr/local/lib
+ 		/usr/lib
diff --git a/debian/patches/series b/debian/patches/series
index 42b42dc..db94311 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ mapper.patch
 shared_mods.patch
 FindJson.cmake.patch
 rawlua.patch
+FindIrrlicht.cmake.patch

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