[sosi2osm] 04/19: fixed patches

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository sosi2osm.

commit 24ecd180b0f9610f7a2d1ef84dc4da757cd0fab4
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Mon Jul 7 16:02:30 2014 +0200

    fixed patches
---
 debian/patches/find_fyba_header_files.patch | 11 +++++++++++
 debian/patches/find_lua_files.patch         | 14 ++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/patches/find_fyba_header_files.patch b/debian/patches/find_fyba_header_files.patch
new file mode 100644
index 0000000..61f8ec2
--- /dev/null
+++ b/debian/patches/find_fyba_header_files.patch
@@ -0,0 +1,11 @@
+--- sosi2osm-20140707git634fc65.orig/Makefile
++++ sosi2osm-20140707git634fc65/Makefile
+@@ -1,7 +1,7 @@
+ PROGNAME=sosi2osm
+ OBJFILES=sosi2osm.o sosi.o tag.o node.o
+ 
+-CPPFLAGS = -I /usr/local/include/fyba/ `pkg-config --cflags lua5.1-c++` -DLINUX -DUNIX -g
++CPPFLAGS = -I /usr/include/fyba/ `pkg-config --cflags lua5.1-c++` -DLINUX -DUNIX -g
+ LDFLAGS = -lfyba -lfygm -lfyut -lproj `pkg-config --libs lua5.1-c++`
+ 
+ all: $(PROGNAME)
diff --git a/debian/patches/find_lua_files.patch b/debian/patches/find_lua_files.patch
index 8280b99..8052393 100644
--- a/debian/patches/find_lua_files.patch
+++ b/debian/patches/find_lua_files.patch
@@ -9,3 +9,17 @@
      
      int r = luaL_loadfile(state, library_filename);
      if (r) {
+@@ -48,8 +48,11 @@ void loadLua(char* filename) {
+     
+     r = luaL_loadfile(state, filename);
+     if (r) {
+-        fprintf(stderr, "Failed to load lua file %s\n", filename);
+-        exit(1);
++        snprintf(library_filename, 256, "/usr/share/sosi2osm/lua/%s",filename);
++        if(r) {
++            fprintf(stderr, "Failed to load lua file %s\n", filename);
++            exit(1);
++        }
+     }
+     
+     
diff --git a/debian/patches/series b/debian/patches/series
index 54c007a..8428d2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 find_lua_files.patch
+find_fyba_header_files.patch

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