tags 271125 pending
thanks

Author: dwhedon
Date: 2004-12-05 11:42:36 -0700 (Sun, 05 Dec 2004)
New Revision: 258

Added:
   branches/1.1.x/debian/patches/kaffe-cast.patch
   branches/1.1.x/debian/patches/kaffe.patch
Modified:
   branches/1.1.x/debian/changelog
   branches/1.1.x/debian/control.in
   branches/1.1.x/debian/patches/series
   branches/1.1.x/debian/rules
Log:
* debian/control.in : Add build depends on kaffe, kaffe-dev.  Add 
  libsvn-javahl package.
* debian/patches/series : Add two patches.
* debian/patches/kaffe.patch, debian/patches/kaffe-cast.patch : New files.
* debian/rules : Pass configure arguments for java build, build java
  package.


Modified: branches/1.1.x/debian/changelog
===================================================================
--- branches/1.1.x/debian/changelog	2004-11-09 21:44:55 UTC (rev 257)
+++ branches/1.1.x/debian/changelog	2004-12-05 18:42:36 UTC (rev 258)
@@ -1,3 +1,10 @@
+subversion (1.1.1-2) experimental; urgency=low
+
+  * Add libsvn-javahl, patch thanks to Christophe Labouisse.
+    (closes: #271125)
+
+ -- David Kimdon <email address hidden>  Sun,  5 Dec 2004 10:26:12 -0800
+
 subversion (1.1.1-1) experimental; urgency=low
 
   * New upstream release.  (closes: #272000)

Modified: branches/1.1.x/debian/control.in
===================================================================
--- branches/1.1.x/debian/control.in	2004-11-09 21:44:55 UTC (rev 257)
+++ branches/1.1.x/debian/control.in	2004-12-05 18:42:36 UTC (rev 258)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: David Kimdon <email address hidden>
-Build-Depends: debhelper (>=4.1.25), libneon24-dev (>=0.24.7), apache2-threaded-dev (>=2.0.50-11), libapr0-dev (>=2.0.50-11), libdb4.2-dev, libtool (>=1.4), libexpat1-dev, zlib1g-dev, bison, patch, python, time, python@PYTHON_VER@-dev, autotools-dev, autoconf (>=2.53), swig (>=1.3.22-2), libsasl2-dev, docbook-xsl, xsltproc, perl (>= 5.6.0-16), cdbs, quilt (>=0.30-4), libperl-dev, libkrb5-dev
+Build-Depends: debhelper (>=4.1.25), libneon24-dev (>=0.24.7), apache2-threaded-dev (>=2.0.50-11), libapr0-dev (>=2.0.50-11), libdb4.2-dev, libtool (>=1.4), libexpat1-dev, zlib1g-dev, bison, patch, python, time, python@PYTHON_VER@-dev, autotools-dev, autoconf (>=2.53), swig (>=1.3.22-2), libsasl2-dev, docbook-xsl, xsltproc, perl (>= 5.6.0-16), cdbs, quilt (>=0.30-4), libperl-dev, libkrb5-dev, kaffe, kaffe-dev
 Build-Conflicts: libtool (=1.5-6)
 Standards-Version: 3.6.1
 
@@ -113,6 +113,22 @@
  This package includes miscellaneous tools that make maintenance and
  administration of a Subversion repository easier.
 
+Package: libsvn-javahl
+Section: admin
+Architecture: any
+Depends: kaffe | gij | sablejvm | java-virtual-machine , libsvn0
+Description: Java bindings for Subversion (aka. svn)
+ Subversion is a version control system much like the Concurrent
+ Versions System (CVS).  Version control systems allow many
+ individuals (who may be distributed geographically) to collaborate on
+ a set of files (typically source code).  Subversion has all the major
+ features of CVS, plus certain new features that CVS users often wish
+ they had.
+ . 
+ These modules are required to interface with Subversion from Java.
+ This would be useful if you wanted to, for example, write a Java
+ class that manipulates a Subversion repository or working copy.
+
 Package: libsvn-core-perl
 Section: admin
 Architecture: any

Added: branches/1.1.x/debian/patches/kaffe-cast.patch
===================================================================
--- branches/1.1.x/debian/patches/kaffe-cast.patch	2004-11-09 21:44:55 UTC (rev 257)
+++ branches/1.1.x/debian/patches/kaffe-cast.patch	2004-12-05 18:42:36 UTC (rev 258)
@@ -0,0 +1,72 @@
+diff -u subversion-1.1.0/subversion/bindings/java/javahl/native-old/CommitMessage.cpp subversion-1.1.0/subversion/bindings/java/javahl/native/CommitMessage.cpp
+--- subversion-1.1.0/subversion/bindings/java/javahl/native-old/CommitMessage.cpp	2004-07-11 19:38:18.000000000 +0200
++++ subversion-1.1.0/subversion/bindings/java/javahl/native/CommitMessage.cpp	2004-10-29 11:24:09.000000000 +0200
+@@ -103,7 +103,7 @@
+         return NULL;
+     }
+     int count = commit_items->nelts;
+-    jobjectArray jitems = env->NewObjectArray(count, clazz, NULL);
++    jobjectArray jitems = (_jobjectArray*)env->NewObjectArray(count, clazz, NULL);
+     if(JNIUtil::isExceptionThrown())
+     {
+         return NULL;
+diff -u subversion-1.1.0/subversion/bindings/java/javahl/native-old/JNIByteArray.cpp subversion-1.1.0/subversion/bindings/java/javahl/native/JNIByteArray.cpp
+--- subversion-1.1.0/subversion/bindings/java/javahl/native-old/JNIByteArray.cpp	2004-06-12 17:48:55.000000000 +0200
++++ subversion-1.1.0/subversion/bindings/java/javahl/native/JNIByteArray.cpp	2004-10-29 11:35:43.000000000 +0200
+@@ -77,7 +77,7 @@
+  */
+ const signed char * JNIByteArray::getBytes()
+ {
+-    return m_data;
++    return (signed char *)m_data;
+ }
+ /**
+  * returns is the byte array was not set
+diff -u subversion-1.1.0/subversion/bindings/java/javahl/native-old/SVNClient.cpp subversion-1.1.0/subversion/bindings/java/javahl/native/SVNClient.cpp
+--- subversion-1.1.0/subversion/bindings/java/javahl/native-old/SVNClient.cpp	2004-08-09 23:58:00.000000000 +0200
++++ subversion-1.1.0/subversion/bindings/java/javahl/native/SVNClient.cpp	2004-10-29 11:45:41.000000000 +0200
+@@ -168,7 +168,7 @@
+         {
+             return NULL;
+         }
+-        jobjectArray ret = env->NewObjectArray(array->nelts, clazz, NULL);
++        jobjectArray ret = (_jobjectArray*)env->NewObjectArray(array->nelts, clazz, NULL);
+         if(JNIUtil::isJavaExceptionThrown())
+         {
+             return NULL;
+@@ -282,7 +282,7 @@
+         {
+             return NULL;
+         }
+-        jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
++        jobjectArray ret = (_jobjectArray*)env->NewObjectArray(size, clazz, NULL);
+         if(JNIUtil::isJavaExceptionThrown())
+         {
+             return NULL;
+@@ -438,7 +438,7 @@
+         {
+             return NULL;
+         }
+-        jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
++        jobjectArray ret = (_jobjectArray*)env->NewObjectArray(size, clazz, NULL);
+         if(JNIUtil::isJavaExceptionThrown())
+         {
+             return NULL;
+@@ -1046,7 +1046,7 @@
+         {
+             return NULL;
+         }
+-        jobjectArray ret = env->NewObjectArray(count, clazz, NULL);
++        jobjectArray ret = (_jobjectArray*)env->NewObjectArray(count, clazz, NULL);
+         if(JNIUtil::isJavaExceptionThrown())
+         {
+             return NULL;
+@@ -1687,7 +1687,7 @@
+         sorted_paths = svn_sort__hash (changed_paths,
+                                      svn_sort_compare_items_as_paths, pool);
+ 
+-        jChangedPaths = env->NewObjectArray(sorted_paths->nelts, clazzCP, NULL);
++        jChangedPaths = (_jobjectArray*)env->NewObjectArray(sorted_paths->nelts, clazzCP, NULL);
+ 
+         for (i = 0; i < sorted_paths->nelts; i++)
+         {

Added: branches/1.1.x/debian/patches/kaffe.patch
===================================================================
--- branches/1.1.x/debian/patches/kaffe.patch	2004-11-09 21:44:55 UTC (rev 257)
+++ branches/1.1.x/debian/patches/kaffe.patch	2004-12-05 18:42:36 UTC (rev 258)
@@ -0,0 +1,10 @@
+--- subversion-1.1.0/Makefile.in.old	2004-10-27 12:57:12.000000000 +0200
++++ subversion-1.1.0/Makefile.in	2004-10-27 12:59:05.000000000 +0200
+@@ -242,6 +242,7 @@
+ JAVA_CLASSPATH=@JAVA_CLASSPATH@
+ 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)

Modified: branches/1.1.x/debian/patches/series
===================================================================
--- branches/1.1.x/debian/patches/series	2004-11-09 21:44:55 UTC (rev 257)
+++ branches/1.1.x/debian/patches/series	2004-12-05 18:42:36 UTC (rev 258)
@@ -1,3 +1,5 @@
+kaffe.patch
+kaffe-cast.patch
 repos-templates.patch 
 svnshell.patch
 #rpath.patch

Modified: branches/1.1.x/debian/rules
===================================================================
--- branches/1.1.x/debian/rules	2004-11-09 21:44:55 UTC (rev 257)
+++ branches/1.1.x/debian/rules	2004-12-05 18:42:36 UTC (rev 258)
@@ -37,6 +37,11 @@
 		--disable-mod-activation \
 		--with-swig=/usr
 
+ifeq ($(SUBVERSION_VER), 1.1)
+  # jikes 1.22 cannot compile javahl.
+  confflags += --enable-javahl --without-jikes --with-jdk=/usr/lib/kaffe
+endif
+
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -140,6 +145,13 @@
 		swig_pydir=/usr/lib/python$(PYTHON_VER)/site-packages/libsvn \
 		swig_pydir_extra=/usr/lib/python$(PYTHON_VER)/site-packages/svn
 
+ifeq ($(SUBVERSION_VER), 1.1)
+	$(MAKE) -C $(DEB_BUILDDIR) javahl \
+		javahl_javadir=/usr/share/java \
+		javahl_libdir=/usr/lib \
+		javahl_javahdir=/usr/include/svn-javahl
+endif
+
 	# In Bug #220107 it was pointed out that libsvn_swig_py isn't
 	# linked in a pre-link friendly way.  The ideal would be to find 
 	# a clean patch to the upstream build system but this will have to 
@@ -171,6 +183,14 @@
 		swig_pydir_extra=/usr/lib/python$(PYTHON_VER)/site-packages/svn \
 		-C $(DEB_BUILDDIR)
 
+ifeq ($(SUBVERSION_VER), 1.1)
+	$(MAKE) -C $(DEB_BUILDDIR) install-javahl \
+		DESTDIR=$(PWD)/debian/tmp \
+		javahl_javadir=/usr/share/java \
+		javahl_libdir=/usr/lib \
+		javahl_javahdir=/usr/include/svn-javahl
+endif
+
 	# Create our default configuration files to be installed in
 	# /etc/subversion/
 	$(MAKE) -C debian/tools DEB_SRCDIR=$(PWD)/$(DEB_SRCDIR) \
@@ -251,6 +271,18 @@
 	$(MAKE) -C $(DEB_BUILDDIR)/$(PERL_BINDINGDIR) install \
 		MAN3EXT=3perl DESTDIR=$(PWD)/debian/tmp 
 
+	# Install files for 'libsvn-javahl' package
+ifeq ($(SUBVERSION_VER), 1.1)
+	dh_movefiles --package=libsvn-javahl \
+		usr/share/java \
+		usr/lib/libsvnjavahl-1.a \
+		usr/lib/libsvnjavahl-1.la \
+		usr/lib/libsvnjavahl-1.so \
+		usr/lib/libsvnjavahl-1.so.0 \
+		usr/lib/libsvnjavahl-1.so.0.0.0 \
+		usr/include/svn-javahl
+endif
+
 	# Install files for 'libsvn-core-perl' package
 	dh_movefiles --package=libsvn-core-perl \
 		usr/lib/perl5/ \