Comment 39 for bug 12471

tags 271125 pending
thanks

Author: dwhedon
Date: 2005-07-20 03:32:48 +0000 (Wed, 20 Jul 2005)
New Revision: 330

Added:
   trunk/debian/patches/kaffe-javah.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/kaffe.patch
   trunk/debian/patches/series
   trunk/debian/rules
Log:
+++ debian/changelog (working copy)
+ * Enable javahl bindings by default (closes: #271125)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-20 03:26:30 UTC (rev 329)
+++ trunk/debian/changelog 2005-07-20 03:32:48 UTC (rev 330)
@@ -5,6 +5,7 @@
   * Do not install vc-svn.el (closes: #314213)
   * Autoload psvn.el by default. (closes: #223303, #305953)
   * Remove hard-coded DEB_BUILDDIR from debian/rules.
+ * Enable javahl bindings by default (closes: #271125)

  -- David Kimdon <email address hidden> Thu, 14 Jul 2005 20:50:11 -0700

Added: trunk/debian/patches/kaffe-javah.patch
===================================================================
--- trunk/debian/patches/kaffe-javah.patch 2005-07-20 03:26:30 UTC (rev 329)
+++ trunk/debian/patches/kaffe-javah.patch 2005-07-20 03:32:48 UTC (rev 330)
@@ -0,0 +1,13 @@
+Index: build.conf
+===================================================================
+--- build.conf (revision 14202)
++++ build.conf (working copy)
+@@ -410,7 +410,7 @@
+ sources = *.java
+ add-deps = $(javahl_java_DEPS)
+ install = javahl-javah
+-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
++link-cmd = $(COMPILE_JAVAHL_JAVAH)
+
+ [libsvnjavahl]
+ description = Subversion Java HighLevel binding

Modified: trunk/debian/patches/kaffe.patch
===================================================================
--- trunk/debian/patches/kaffe.patch 2005-07-20 03:26:30 UTC (rev 329)
+++ trunk/debian/patches/kaffe.patch 2005-07-20 03:32:48 UTC (rev 330)
@@ -7,6 +7,7 @@
  javahl_java_CLASSPATH=$(JAVA_CLASSPATH)
  javahl_tests_CLASSPATH=$(JAVA_CLASSPATH)
 +javahl_javah_CLASSPATH=$(JDK)/jre/lib/rt.jar
- swig_java_api_CLASSPATH=$(JAVA_CLASSPATH)
- swig_java_java_CLASSPATH=$(SWIG_JAVA_DIR)/build:$(JAVA_CLASSPATH)
- swig_java_tests_CLASSPATH=$(SWIG_JAVA_DIR)/build:$(JAVA_CLASSPATH)
+
+ RUBY = @RUBY@
+
+

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-07-20 03:26:30 UTC (rev 329)
+++ trunk/debian/patches/series 2005-07-20 03:32:48 UTC (rev 330)
@@ -1,5 +1,6 @@
-#kaffe.patch -p0
+kaffe.patch -p0
 kaffe-cast.patch -p0
 repos-templates.patch -p0
 svnshell.patch -p0
 #rpath.patch -p0
+kaffe-javah.patch -p0

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-07-20 03:26:30 UTC (rev 329)
+++ trunk/debian/rules 2005-07-20 03:32:48 UTC (rev 330)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f

 # Set this variable to 'yes' to build the libsvn-javahl package.
-ENABLE_JAVAHL=no
+ENABLE_JAVAHL=yes

 # This is the debhelper compatability version to use.
 export DH_COMPAT=3