This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository hawtjni.
commit 9eac15c8eeb5f30fb5aab93863398bd9cea650f2 Author: Emmanuel Bourg <[email protected]> Date: Thu Feb 5 21:24:29 2015 +0100 Packaged the hawtjni-generator module --- debian/changelog | 1 + debian/control | 17 +++++++++++++++-- debian/libhawtjni-runtime-java.poms | 2 +- debian/maven.ignoreRules | 1 + debian/maven.properties | 1 + debian/maven.rules | 1 + debian/patches/01-xbean-compatibility.patch | 14 ++++++++++++++ debian/patches/series | 1 + 8 files changed, 35 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6b4a344..989e7cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ hawtjni (1.10-2) UNRELEASED; urgency=medium * Team upload. * Build with maven-debian-helper instead of javahelper + * Packaged the hawtjni-generator module * Standards-Version updated to 3.9.6 (no changes) * debian/rules: Simplified the get-orig-source target by calling uscan * debian/copyright: Fixed the order of the paragraphs diff --git a/debian/control b/debian/control index d46261f..6d35094 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,8 @@ Build-Depends: cdbs, default-jdk, debhelper (>= 9), + libasm3-java, + libxbean-java, maven-debian-helper Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/hawtjni.git @@ -16,11 +18,22 @@ Homepage: http://fusesource.com/forge/sites/hawtjni/ Package: libhawtjni-runtime-java Architecture: all -Depends: - ${misc:Depends} +Depends: ${misc:Depends} Description: Java library that provide JNI code generation HawtJNI is a code generator that produces the JNI code needed to implement java native methods. It is based on the jnigen code generator that is part of the SWT Tools project which is used to generate all the JNI code which powers the eclipse platform. + +Package: libhawtjni-generator-java +Architecture: all +Depends: ${misc:Depends}, libhawtjni-runtime-java, libasm3-java, libcommons-cli-java, libxbean-java +Description: HawtJNI Generator + HawtJNI is a code generator that produces the JNI code + needed to implement java native methods. It is based on the + jnigen code generator that is part of the SWT Tools project + which is used to generate all the JNI code which powers the + eclipse platform. + . + This package contains the JNI code generation tools. diff --git a/debian/libhawtjni-runtime-java.poms b/debian/libhawtjni-runtime-java.poms index ee1a26f..9773d2a 100644 --- a/debian/libhawtjni-runtime-java.poms +++ b/debian/libhawtjni-runtime-java.poms @@ -27,7 +27,7 @@ # pom.xml --no-parent --has-package-version hawtjni-runtime/pom.xml --has-package-version -hawtjni-generator/pom.xml --ignore +hawtjni-generator/pom.xml --has-package-version --package=libhawtjni-generator-java maven-hawtjni-plugin/pom.xml --ignore hawtjni-example/pom.xml --ignore hawtjni-website/pom.xml --ignore diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 5644fa6..f60d8ff 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -7,6 +7,7 @@ org.apache.maven.plugins maven-eclipse-plugin * * * * org.apache.maven.plugins maven-idea-plugin * * * * org.apache.maven.plugins maven-javadoc-plugin * * * * org.apache.maven.plugins maven-project-info-reports-plugin * * * * +org.apache.maven.plugins maven-shade-plugin * * * * org.apache.maven.plugins maven-surefire-plugin * * * * org.codehaus.mojo jxr-maven-plugin * * * * org.codehaus.mojo surefire-report-maven-plugin * * * * diff --git a/debian/maven.properties b/debian/maven.properties index e593715..242da7e 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -3,3 +3,4 @@ # maven.test.skip=true maven.test.skip=true +project.build.sourceEncoding=UTF-8 diff --git a/debian/maven.rules b/debian/maven.rules index 8f15394..5fecd18 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,3 +1,4 @@ org.fusesource.hawtjni hawtjni-project pom s/.*/debian/ * * org.fusesource.hawtjni hawtjni-runtime jar s/.*/debian/ * * +asm asm* * s/.*/3.x/ * * diff --git a/debian/patches/01-xbean-compatibility.patch b/debian/patches/01-xbean-compatibility.patch new file mode 100644 index 0000000..692d011 --- /dev/null +++ b/debian/patches/01-xbean-compatibility.patch @@ -0,0 +1,14 @@ +Description: Fix a source compatibility issue with the version of xbean in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java ++++ b/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java +@@ -402,7 +402,7 @@ + + @SuppressWarnings("unchecked") + private void collectMatchingClasses(ClassFinder finder, Class annotation, LinkedHashSet<Class<?>> collector) { +- List<Class> annotated = finder.findAnnotatedClasses(annotation); ++ List<Class<?>> annotated = finder.findAnnotatedClasses(annotation); + for (Class<?> clazz : annotated) { + if( packages.isEmpty() ) { + collector.add(clazz); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..966818f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-xbean-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/hawtjni.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
