[SCM] Java Abstracted Foreign Function Layer branch, master, updated. debian/0.5.9-1-5-ge3c3155
Damien Raude-Morvan
drazzib at debian.org
Mon Apr 8 21:50:24 UTC 2013
The following commit has been merged in the master branch:
commit e3c3155572c45fc32214bdc16b8978285423879c
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Sun Jan 6 23:54:56 2013 +0100
d/{control,rules}: Rebuild using ASM4 instead of ASM3.
diff --git a/debian/changelog b/debian/changelog
index 970b908..cfe4609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-jaffl (0.5.9-2) UNRELEASED; urgency=low
+jaffl (0.5.9-2) experimental; urgency=low
+ [ Jakub Adam ]
* Add OSGi metadata into jaffl.jar.
* Add Jakub Adam to Uploaders.
* Bump Standards-Version to 3.9.4.
* Fix jaffl.jar Class-Path.
- -- Jakub Adam <jakub.adam at ktknet.cz> Fri, 18 Jan 2013 19:47:01 +0100
+ [ Damien Raude-Morvan ]
+ * d/{control,rules}: Rebuild using ASM4 instead of ASM3.
+ * d/patches/ftbfs-gcc-*.diff: Remove -Werror from tests build
+ since GCC-4.8 now includes 'unused-parameter' by default.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 06 Jan 2013 23:54:16 +0100
jaffl (0.5.9-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 5805a0b..449915c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep: ant-optional,
default-jdk,
javahelper,
junit4,
- libasm3-java,
+ libasm4-java,
libjffi-java,
libjnr-x86asm-java
Standards-Version: 3.9.4
@@ -21,7 +21,7 @@ Homepage: http://github.com/wmeissner/jaffl
Package: libjaffl-java
Architecture: all
-Depends: libasm3-java, libjffi-java, libjnr-x86asm-java, ${misc:Depends}
+Depends: libasm4-java, libjffi-java, libjnr-x86asm-java, ${misc:Depends}
Description: Java Abstracted Foreign Function Layer
Jaffl is a Java library providing an abstracted interface to invoking native
functions from Java.
diff --git a/debian/patches/0001-ignore-test-failures.patch b/debian/patches/0001-ignore-test-failures.patch
index 63353dd..1e64edf 100644
--- a/debian/patches/0001-ignore-test-failures.patch
+++ b/debian/patches/0001-ignore-test-failures.patch
@@ -6,11 +6,9 @@ Subject: [PATCH] ignore test failures
nbproject/build-impl.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
-diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
-index 22a2507..29af563 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
-@@ -721,7 +721,6 @@ is divided into following sections:
+@@ -721,7 +721,6 @@
<j2seproject3:junit testincludes="**/*Test.java"/>
</target>
<target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
@@ -18,4 +16,3 @@ index 22a2507..29af563 100644
</target>
<target depends="init" if="have.tests" name="test-report"/>
<target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
---
diff --git a/debian/patches/0002-remove-copyLibs-task.patch b/debian/patches/0002-remove-copyLibs-task.patch
index e30ad58..078a4ad 100644
--- a/debian/patches/0002-remove-copyLibs-task.patch
+++ b/debian/patches/0002-remove-copyLibs-task.patch
@@ -6,11 +6,9 @@ Subject: [PATCH] remove <copyLibs> task
nbproject/build-impl.xml | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
-diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
-index 29af563..b95ec34 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
-@@ -520,14 +520,13 @@ is divided into following sections:
+@@ -520,14 +520,13 @@
<globmapper from="*" to="lib/*"/>
</chainedmapper>
</pathconvert>
@@ -27,7 +25,7 @@ index 29af563..b95ec34 100644
<echo>To run this application from the command line without Ant, try:</echo>
<property location="${dist.jar}" name="dist.jar.resolved"/>
<echo>java -jar "${dist.jar.resolved}"</echo>
-@@ -545,13 +544,12 @@ is divided into following sections:
+@@ -545,13 +544,12 @@
<globmapper from="*" to="lib/*"/>
</chainedmapper>
</pathconvert>
@@ -43,7 +41,7 @@ index 29af563..b95ec34 100644
</target>
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-@@ -566,13 +564,12 @@ is divided into following sections:
+@@ -566,13 +564,12 @@
<globmapper from="*" to="lib/*"/>
</chainedmapper>
</pathconvert>
@@ -59,4 +57,3 @@ index 29af563..b95ec34 100644
</target>
<target name="-post-jar">
<!-- Empty placeholder for easier customization. -->
---
diff --git a/debian/patches/0003-don-t-call-ant-for-subprojects.patch b/debian/patches/0003-don-t-call-ant-for-subprojects.patch
index a87b88a..0896a44 100644
--- a/debian/patches/0003-don-t-call-ant-for-subprojects.patch
+++ b/debian/patches/0003-don-t-call-ant-for-subprojects.patch
@@ -6,11 +6,9 @@ Subject: [PATCH] don't call ant for subprojects
nbproject/build-impl.xml | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
-diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
-index b95ec34..768d748 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
-@@ -411,20 +411,6 @@ is divided into following sections:
+@@ -411,20 +411,6 @@
<propertyfile file="${built-jar.properties}">
<entry key="${basedir}" value=""/>
</propertyfile>
@@ -31,4 +29,3 @@ index b95ec34..768d748 100644
</target>
<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
<target depends="init" name="-check-automatic-build">
---
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
deleted file mode 100644
index 50623a9..0000000
--- a/debian/patches/ftbfs-gcc-4.7.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: jaffl-0.5.4/libtest/GNUmakefile
-===================================================================
---- jaffl-0.5.4.orig/libtest/GNUmakefile 2010-08-01 19:40:41.000000000 +0000
-+++ jaffl-0.5.4/libtest/GNUmakefile 2012-05-22 00:39:00.528083754 +0000
-@@ -42,7 +42,7 @@
- OFLAGS = -O2 $(JFLAGS)
- WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
- PICFLAGS = -fPIC
--SOFLAGS = -shared -mimpure-text -Wl,-O1
-+SOFLAGS = -shared -Wl,-O1
- LDFLAGS += $(SOFLAGS)
-
- IFLAGS = -I"$(BUILD_DIR)"
diff --git a/debian/patches/ftbfs-gcc-4.8.diff b/debian/patches/ftbfs-gcc-4.8.diff
new file mode 100644
index 0000000..9887194
--- /dev/null
+++ b/debian/patches/ftbfs-gcc-4.8.diff
@@ -0,0 +1,14 @@
+--- a/libtest/GNUmakefile
++++ b/libtest/GNUmakefile
+@@ -40,9 +40,9 @@
+ # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
+ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
+ OFLAGS = -O2 $(JFLAGS)
+-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
++WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
+ PICFLAGS = -fPIC
+-SOFLAGS = -shared -mimpure-text -Wl,-O1
++SOFLAGS = -shared -Wl,-O1
+ LDFLAGS += $(SOFLAGS)
+
+ IFLAGS = -I"$(BUILD_DIR)"
diff --git a/debian/patches/series b/debian/patches/series
index f25df0c..ba750ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
0001-ignore-test-failures.patch
0002-remove-copyLibs-task.patch
0003-don-t-call-ant-for-subprojects.patch
-ftbfs-gcc-4.7.diff
+ftbfs-gcc-4.8.diff
string_array_support.diff
+use_asm4.diff
diff --git a/debian/patches/use_asm4.diff b/debian/patches/use_asm4.diff
new file mode 100644
index 0000000..f31d00e
--- /dev/null
+++ b/debian/patches/use_asm4.diff
@@ -0,0 +1,22 @@
+--- a/src/com/kenai/jaffl/provider/jffi/SkinnyMethodAdapter.java
++++ b/src/com/kenai/jaffl/provider/jffi/SkinnyMethodAdapter.java
+@@ -17,16 +17,18 @@
+ *
+ * @author headius
+ */
+-public class SkinnyMethodAdapter implements MethodVisitor, Opcodes {
++public class SkinnyMethodAdapter extends MethodVisitor implements Opcodes {
+ private final static boolean DEBUG = Boolean.getBoolean("jaffl.compile.dump");
+ private MethodVisitor method;
+
+ /** Creates a new instance of SkinnyMethodAdapter */
+ public SkinnyMethodAdapter(MethodVisitor method) {
++ super(Opcodes.ASM4);
+ setMethodVisitor(method);
+ }
+
+ public SkinnyMethodAdapter() {
++ super(Opcodes.ASM4);
+ }
+
+ public MethodVisitor getMethodVisitor() {
diff --git a/debian/rules b/debian/rules
index 9b73785..fa5b0d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-junit ant-nodeps asm3-all jffi jnr-x86asm junit4
+DEB_JARS := ant-junit ant-nodeps asm4-all jffi jnr-x86asm junit4
common-post-build-indep::
# Generate OSGi metadata for jaffl.jar
--
Java Abstracted Foreign Function Layer
More information about the pkg-java-commits
mailing list