diff -Nru jruby-joni-2.1.11/debian/ant.properties jruby-joni-2.1.11/debian/ant.properties --- jruby-joni-2.1.11/debian/ant.properties 2016-08-21 06:23:16.000000000 +0000 +++ jruby-joni-2.1.11/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# Ensure that source and target are 1.6 -# For backwards compat on Java 7 -# see https://lists.debian.org/debian-java/2012/12/msg00026.html -# -ant.build.javac.source=1.6 -ant.build.javac.target=1.6 diff -Nru jruby-joni-2.1.11/debian/changelog jruby-joni-2.1.11/debian/changelog --- jruby-joni-2.1.11/debian/changelog 2016-08-21 06:23:16.000000000 +0000 +++ jruby-joni-2.1.11/debian/changelog 2016-10-03 20:35:08.000000000 +0000 @@ -1,3 +1,12 @@ +jruby-joni (2.1.11-2) unstable; urgency=medium + + * Team upload. + * Build with Maven instead of Ant and enabled the unit tests + * Depend on libasm-java (>= 5.0) instead of libasm4-java + * Switch to debhelper level 9 + + -- Emmanuel Bourg Mon, 03 Oct 2016 22:35:08 +0200 + jruby-joni (2.1.11-1) unstable; urgency=medium * New upstream release diff -Nru jruby-joni-2.1.11/debian/compat jruby-joni-2.1.11/debian/compat --- jruby-joni-2.1.11/debian/compat 2016-08-21 06:23:16.000000000 +0000 +++ jruby-joni-2.1.11/debian/compat 2016-10-03 20:09:47.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru jruby-joni-2.1.11/debian/control jruby-joni-2.1.11/debian/control --- jruby-joni-2.1.11/debian/control 2016-08-21 06:23:16.000000000 +0000 +++ jruby-joni-2.1.11/debian/control 2016-10-03 20:34:37.000000000 +0000 @@ -2,20 +2,27 @@ Section: java Priority: extra Maintainer: Debian Java Maintainers -Uploaders: Hideki Yamane , +Uploaders: + Hideki Yamane , Torsten Werner -Build-Depends: debhelper (>= 7), default-jdk -Build-Depends-Indep: ant, libjcodings-java (>= 1.0.13), libasm4-java (>= 5.0.3), - maven-debian-helper +Build-Depends: + debhelper (>= 9), + default-jdk +Build-Depends-Indep: + junit, + libasm-java (>= 5.0), + libjcodings-java (>= 1.0.13), + maven-debian-helper (>= 2.0) Standards-Version: 3.9.8 -Homepage: https://github.com/jruby/joni/ Vcs-Git: https://anonscm.debian.org/git/pkg-java/jruby-joni/ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jruby-joni.git +Homepage: https://github.com/jruby/joni/ Package: libjruby-joni-java Architecture: all -Depends: ${misc:Depends}, libjcodings-java (>= 1.0.13), libasm4-java (>= 5.0.3), -Description: Java port of Oniguruma regexp library +Depends: ${maven:Depends}, ${misc:Depends} +Suggests: ${maven:OptionalDepends} +Description: Java port of Oniguruma regexp library Oniguruma is a regular expressions library. The characteristics of this library is that different character encoding for every regular expression object can be specified. The supported APIs are GNU regex, POSIX, and Oniguruma diff -Nru jruby-joni-2.1.11/debian/libjruby-joni-java.links jruby-joni-2.1.11/debian/libjruby-joni-java.links --- jruby-joni-2.1.11/debian/libjruby-joni-java.links 2016-08-21 06:23:16.000000000 +0000 +++ jruby-joni-2.1.11/debian/libjruby-joni-java.links 2016-10-03 20:33:58.000000000 +0000 @@ -1,2 +1 @@ usr/share/java/joni.jar usr/lib/jruby/lib/joni.jar - diff -Nru jruby-joni-2.1.11/debian/libjruby-joni-java.poms jruby-joni-2.1.11/debian/libjruby-joni-java.poms --- jruby-joni-2.1.11/debian/libjruby-joni-java.poms 2016-08-21 06:23:16.000000000 +0000 +++ jruby-joni-2.1.11/debian/libjruby-joni-java.poms 2016-10-03 20:24:06.000000000 +0000 @@ -1 +1,28 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the tag from the POM +# --package=: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=: name to use when installing the library in /usr/share/java +# --usj-version=: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=: Optional, the classifier for the jar. Empty by default. +# --site-xml=: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --no-parent --java-lib diff -Nru jruby-joni-2.1.11/debian/maven.ignoreRules jruby-joni-2.1.11/debian/maven.ignoreRules --- jruby-joni-2.1.11/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 +++ jruby-joni-2.1.11/debian/maven.ignoreRules 2016-10-03 20:28:54.000000000 +0000 @@ -0,0 +1,4 @@ + +org.apache.maven.plugins maven-javadoc-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.apache.maven.wagon wagon-webdav * * * * diff -Nru jruby-joni-2.1.11/debian/maven.rules jruby-joni-2.1.11/debian/maven.rules --- jruby-joni-2.1.11/debian/maven.rules 2016-08-21 06:23:16.000000000 +0000 +++ jruby-joni-2.1.11/debian/maven.rules 2016-10-03 20:24:57.000000000 +0000 @@ -1,3 +1,2 @@ junit junit * s/.*/3.x/ * * org.jruby.jcodings jcodings * s/.*/debian/ * * -org.ow2.asm asm * s/.*/4.x/ * * diff -Nru jruby-joni-2.1.11/debian/patches/build.xml-jcoding.patch jruby-joni-2.1.11/debian/patches/build.xml-jcoding.patch --- jruby-joni-2.1.11/debian/patches/build.xml-jcoding.patch 2016-08-21 06:23:16.000000000 +0000 +++ jruby-joni-2.1.11/debian/patches/build.xml-jcoding.patch 2016-10-03 20:06:49.000000000 +0000 @@ -19,7 +19,7 @@ + + + -+ ++ + + @@ -30,7 +30,7 @@ + ++ /usr/share/java/asm.jar" /> diff -Nru jruby-joni-2.1.11/debian/rules jruby-joni-2.1.11/debian/rules --- jruby-joni-2.1.11/debian/rules 2016-08-21 06:23:16.000000000 +0000 +++ jruby-joni-2.1.11/debian/rules 2016-10-03 20:18:27.000000000 +0000 @@ -1,20 +1,7 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 %: - dh $@ - -override_dh_auto_build: - ant -propertyfile $(CURDIR)/debian/ant.properties - -override_dh_auto_install: - dh_auto_install - mh_installpoms -plibjruby-joni-java - mh_installjar -plibjruby-joni-java pom.xml target/joni*.jar --java-lib - -override_dh_auto_clean: - dh_auto_clean - mh_clean + dh $@ --buildsystem=maven get-orig-source: uscan --force-download --rename