[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#422605: [Patch] #422605 caused by gcjh being replaced by gjavah in gcj >= 4.2



tag 422605 patch
thanks

The folowwing patch takes care of the rename and tightens
build-depends to make sure the replacement is caught.

BTW, since this builds entirely with free tools, it might be possible
to build it in all arches, instead of only i386 and amd64 (it seems to
be blocked by the autobuilders, as the package is arch: any).

---------[Patch]-------------------------------------------------------
diff -r 75343eaaea8c debian/changelog
--- a/debian/changelog	Mon May 14 23:58:18 2007 -0500
+++ b/debian/changelog	Tue May 15 01:16:20 2007 -0500
@@ -1,3 +1,12 @@ nbio (2.0-14) unstable; urgency=low
+nbio (2.0-15) unstable; urgency=low
+
+  * QA upload.
+  * Change call of gcjh to gjavah in make-libnbio.sh.
+    Update Build-depends to gcj (>= 4:4.1.2-2) and added java-gcj-compat
+    (Closes #422605).
+
+ -- Luis Rodrigo Gallardo Cruz <rodrigo@nul-unu.com>  Tue, 15 May 2007 00:47:53 -0500
+
 nbio (2.0-14) unstable; urgency=low
 
   * QA upload.
diff -r 75343eaaea8c debian/control
--- a/debian/control	Mon May 14 23:58:18 2007 -0500
+++ b/debian/control	Tue May 15 01:07:13 2007 -0500
@@ -2,7 +2,7 @@ Section: libs
 Section: libs
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>> 4.1.0), fastjar (>= 1:3.2.1-0pre6), gcj (>= 3:3.2.1-0pre6), doxygen
+Build-Depends: debhelper (>> 4.1.0), fastjar (>= 1:3.2.1-0pre6), gcj (>= 3:3.2.1-0pre6), java-gcj-compat, doxygen
 Standards-Version: 3.7.2
 
 Package: libnbio2-java
diff -r 75343eaaea8c debian/make-libnbio.sh
--- a/debian/make-libnbio.sh	Mon May 14 23:58:18 2007 -0500
+++ b/debian/make-libnbio.sh	Tue May 15 01:02:00 2007 -0500
@@ -41,7 +41,7 @@ PACKAGE="seda.nbio"
 # the versioned gcc-x.y and gcj-x.y programs are no longer used.
 JAVA="/usr/bin/gcj-wrapper"
 JAVAC="/usr/bin/gcj -C"
-JAVAH="/usr/bin/gcjh"
+JAVAH="/usr/bin/gjavah"
 JAR="/usr/bin/fastjar"
 DOXYGEN="/usr/bin/doxygen"
 
@@ -75,7 +75,7 @@ for classfile in *.class; do
    header="jni/${class}.h"
    echo "${PACKAGE}.${class}..."
    cd ${BASE_DIR}/${BUILD_DIR}
-   ${JAVAH} -jni -o ${PACKAGE_DIR}/${header} "${PACKAGE}.${class}"
+   ${JAVAH} -jni -I . -o ${PACKAGE_DIR}/${header} "${PACKAGE}.${class}"
    if [ $? -ne 0 ]; then
       echo "Error: unable to build all header files.  Terminating."
       exit 1
---------[/Patch]------------------------------------------------------

Attachment: signature.asc
Description: Digital signature


Reply to: