[pkg-java] r5599 - in trunk/charva/debian: . patches

[kumanna-guest at alioth.debian.org]

Author: kumanna-guest
Date: 2008-02-06 09:00:44 +0000 (Wed, 06 Feb 2008)
New Revision: 5599

Added:
   trunk/charva/debian/patches/fix_jnih_location.diff
Modified:
   trunk/charva/debian/changelog
   trunk/charva/debian/control
   trunk/charva/debian/patches/series
Log:
* debian/patches/fix_jnih_location.diff:
  + Fix location of jni.h to build libTerminal.so.
    (Closes: #464266)
* debian/control:
  + Standards Version is now 3.7.3 (no changes needed.)


Modified: trunk/charva/debian/changelog
===================================================================
--- trunk/charva/debian/changelog	2008-02-05 22:15:58 UTC (rev 5598)
+++ trunk/charva/debian/changelog	2008-02-06 09:00:44 UTC (rev 5599)
@@ -1,8 +1,16 @@
-charva (1.1.4-2) UNRELEASED; urgency=low
+charva (1.1.4-2) unstable; urgency=low
 
+  [ Michael Koch ]
   * Updated watch file.
 
- -- Michael Koch <konqueror at gmx.de>  Mon, 21 Jan 2008 12:23:47 +0100
+  [ Kumar Appaiah ]
+  * debian/patches/fix_jnih_location.diff:
+    + Fix location of jni.h to build libTerminal.so.
+      (Closes: #464266)
+  * debian/control:
+    + Standards Version is now 3.7.3 (no changes needed.)
+  
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Wed, 06 Feb 2008 14:32:24 +0530
 
 charva (1.1.4-1) unstable; urgency=low
 

Modified: trunk/charva/debian/control
===================================================================
--- trunk/charva/debian/control	2008-02-05 22:15:58 UTC (rev 5598)
+++ trunk/charva/debian/control	2008-02-06 09:00:44 UTC (rev 5599)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
 Build-Depends: debhelper (>= 5), cdbs, ant-optional, libncurses5-dev, libncursesw5-dev, libcommons-logging-java, liblog4j1.2-java, java-gcj-compat-dev, quilt
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Homepage: http://www.pitman.co.za/projects/charva/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/charva
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/charva

Added: trunk/charva/debian/patches/fix_jnih_location.diff
===================================================================
--- trunk/charva/debian/patches/fix_jnih_location.diff	                        (rev 0)
+++ trunk/charva/debian/patches/fix_jnih_location.diff	2008-02-06 09:00:44 UTC (rev 5599)
@@ -0,0 +1,13 @@
+Index: b/c/src/Makefile.linux.txt
+===================================================================
+--- a/c/src/Makefile.linux.txt
++++ b/c/src/Makefile.linux.txt
+@@ -12,7 +12,7 @@
+ # The file "jni.h" is in ${JAVA_HOME}/include
+ # The file "jni_md.h" (included from jni.h) contains machine-dependent 
+ # type definitions and is in ${JAVA_HOME}/include/${OS}
+-INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include
++INCLUDES = -I/usr/lib/jvm/java-gcj/include -I${JAVA_HOME}/include/${OS} -I../include
+ 
+ # Changed "-lncurses" to "-lncursesw" (Leos Urban)
+ LIBS = -lncursesw

Modified: trunk/charva/debian/patches/series
===================================================================
--- trunk/charva/debian/patches/series	2008-02-05 22:15:58 UTC (rev 5598)
+++ trunk/charva/debian/patches/series	2008-02-06 09:00:44 UTC (rev 5599)
@@ -1 +1,2 @@
 build.diff
+fix_jnih_location.diff