Comment 46 for bug 12471

Message-Id: <email address hidden>
Date: Sat, 16 Jul 2005 01:56:43 +1000
From: Andrew Vaughan <email address hidden>
To: <email address hidden>
Subject: Bug#271125: Updated javahl patches for subversion1.2.1

--Boundary-00=_7y91CPYUJeweFrV
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi David
Attached is an svn diff containing updated javahl patches.

These patches enabled me to build 1.2.1 on sarge (i368).

Please consider enabling javahl.

Thanks.

Andrew V.

--Boundary-00=_7y91CPYUJeweFrV
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="svn.1.2.1.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="svn.1.2.1.patch"

Index: debian/patches/kaffe-javah.patch
===================================================================
--- debian/patches/kaffe-javah.patch (revision 0)
+++ debian/patches/kaffe-javah.patch (revision 0)
@@ -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
Index: debian/patches/kaffe.patch
===================================================================
--- debian/patches/kaffe.patch (revision 323)
+++ debian/patches/kaffe.patch (working copy)
@@ -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@
+
+
Index: debian/patches/series
===================================================================
--- debian/patches/series (revision 323)
+++ debian/patches/series (working copy)
@@ -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

--Boundary-00=_7y91CPYUJeweFrV--