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

Wed Feb 6 09:40:48 UTC 2008

Author: varun
Date: 2008-02-06 09:40:48 +0000 (Wed, 06 Feb 2008)
New Revision: 5600

Removed:
   trunk/charva/debian/patches/fix_jnih_location.diff
Modified:
   trunk/charva/debian/changelog
   trunk/charva/debian/control
   trunk/charva/debian/patches/build.diff
   trunk/charva/debian/patches/series
   trunk/charva/debian/rules
Log:
* debian/rules: export JAVA_HOME variable which is used in upstream
  Makefiles to build shared libraries
* Remove patches/fix_jnih_location.diff to avoid hard coding JAVA_HOME
* Update patches/build.diff to display 'make' output during build

Modified: trunk/charva/debian/changelog
===================================================================

--- trunk/charva/debian/changelog	2008-02-06 09:00:44 UTC (rev 5599)
+++ trunk/charva/debian/changelog	2008-02-06 09:40:48 UTC (rev 5600)
@@ -1,4 +1,4 @@
-charva (1.1.4-2) unstable; urgency=low
+charva (1.1.4-2) UNRELEASED; urgency=low
 
   [ Michael Koch ]
   * Updated watch file.
@@ -9,9 +9,15 @@
       (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
 
+  [ Varun Hiremath ]
+  * debian/rules: export JAVA_HOME variable which is used in upstream
+    Makefiles to build shared libraries
+  * Remove patches/fix_jnih_location.diff to avoid hard coding JAVA_HOME
+  * Update patches/build.diff to display 'make' output during build
+
+ -- Varun Hiremath <varun at debian.org>  Wed, 06 Feb 2008 15:22:48 +0530
+
 charva (1.1.4-1) unstable; urgency=low
 
   * New upstream release
@@ -102,4 +108,3 @@
   * Initial Release (closes: #203187).
 
  -- Arnaud Vandyck <avdyk at debian.org>  Sun, 16 Nov 2003 23:32:33 +0100
-

Modified: trunk/charva/debian/control
===================================================================
--- trunk/charva/debian/control	2008-02-06 09:00:44 UTC (rev 5599)
+++ trunk/charva/debian/control	2008-02-06 09:40:48 UTC (rev 5600)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 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>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Varun Hiremath <varun at debian.org>, 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.3
 Homepage: http://www.pitman.co.za/projects/charva/

Modified: trunk/charva/debian/patches/build.diff
===================================================================
--- trunk/charva/debian/patches/build.diff	2008-02-06 09:00:44 UTC (rev 5599)
+++ trunk/charva/debian/patches/build.diff	2008-02-06 09:40:48 UTC (rev 5600)
@@ -1,8 +1,8 @@
 Index: charva-1.1.4/build.xml
 ===================================================================
---- charva-1.1.4.orig/build.xml	2007-10-23 19:28:14.000000000 +0530
-+++ charva-1.1.4/build.xml	2007-10-23 19:28:23.000000000 +0530
-@@ -189,12 +189,6 @@
+--- charva-1.1.4.orig/build.xml	2006-09-10 22:10:16.000000000 +0530
++++ charva-1.1.4/build.xml	2008-02-06 15:02:20.000000000 +0530
+@@ -189,16 +189,9 @@
              description="Compile the JNI shared library">
  
          <mkdir dir="${c.home}/lib"/>
@@ -15,3 +15,7 @@
          <echo>Compiling the shared library using "Makefile.${os.type}.txt"</echo>
          <exec executable="make"
                dir="${c.home}/src"
+-              output="${c.home}/lib/make.out.txt"
+               failonerror="true">
+             <arg line="-f Makefile.${os.type}.txt"/>
+         </exec>

Deleted: trunk/charva/debian/patches/fix_jnih_location.diff
===================================================================
--- trunk/charva/debian/patches/fix_jnih_location.diff	2008-02-06 09:00:44 UTC (rev 5599)
+++ trunk/charva/debian/patches/fix_jnih_location.diff	2008-02-06 09:40:48 UTC (rev 5600)
@@ -1,13 +0,0 @@
-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-06 09:00:44 UTC (rev 5599)
+++ trunk/charva/debian/patches/series	2008-02-06 09:40:48 UTC (rev 5600)
@@ -1,2 +1 @@
 build.diff
-fix_jnih_location.diff

Modified: trunk/charva/debian/rules
===================================================================
--- trunk/charva/debian/rules	2008-02-06 09:00:44 UTC (rev 5599)
+++ trunk/charva/debian/rules	2008-02-06 09:40:48 UTC (rev 5600)
@@ -6,7 +6,10 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+# export JAVA_HOME because upstream Makefiles use it
+export JAVA_HOME=/usr/lib/jvm/java-gcj
+
+JAVA_HOME := $(JAVA_HOME)
 ANT_HOME  := /usr/share/ant
 DEB_JARS  := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-nodeps.jar commons-logging commons-logging-api log4j-1.2
 DEB_ANT_BUILD_TARGET   := all -Dos.type=$(DEB_BUILD_ARCH_OS)


