From 597fc5504d78ce489c272080a7a3dfb01d091b7b Mon Sep 17 00:00:00 2001 From: kytv Date: Wed, 21 Sep 2011 13:37:44 +0000 Subject: [PATCH] rebase patch due to (my) recent changes in core/c/jbigi/mbuild_jbigi.sh --- debian/patches/0002-jbigi-soname.patch | 30 +++++++++----------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/debian/patches/0002-jbigi-soname.patch b/debian/patches/0002-jbigi-soname.patch index 5d40aa5f0..a361317fd 100644 --- a/debian/patches/0002-jbigi-soname.patch +++ b/debian/patches/0002-jbigi-soname.patch @@ -3,7 +3,7 @@ Date: Wed, 11 May 2011 00:12:04 +0000 Subject: jbigi soname The purpose of this patch is to change the path that mbuild_jbigi.sh -expects to find the source files at. At the same time I'm specifying +expects to find the source files at. At the same time I'm specifying a soname to shut lintian up. --- @@ -12,26 +12,16 @@ a soname to shut lintian up. --- a/core/c/jbigi/mbuild_jbigi.sh +++ b/core/c/jbigi/mbuild_jbigi.sh -@@ -25,14 +25,14 @@ - LIBFILE="libjbigi.jnilib";; - SunOS*) - COMPILEFLAGS="-fPIC -Wall" -- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris" -- LINKFLAGS="-shared -Wl,-soname,libjbigi.so" -+ INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris" -+ LINKFLAGS="-shared -Wl,-soname,libjbigi.so.0" - LIBFILE="libjbigi.so";; - - *) - COMPILEFLAGS="-fPIC -Wall" -- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" -- LINKFLAGS="-shared -Wl,-soname,libjbigi.so" -+ INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" -+ LINKFLAGS="-shared -Wl,-soname,libjbigi.so.0" - LIBFILE="libjbigi.so";; - esac - @@ -47,7 +47,7 @@ + fi + fi + COMPILEFLAGS="-fPIC -Wall" +- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}" ++ INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}" + LINKFLAGS="-shared -Wl,-soname,libjbigi.so" + LIBFILE="libjbigi.so";; + *) +@@ -66,7 +66,7 @@ echo "Compiling C code..." rm -f jbigi.o $LIBFILE