This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjaudiotagger-java.
commit a1d6fd28973077581ca0ed4e6d1081ace79e966f Author: Emmanuel Bourg <[email protected]> Date: Wed Nov 29 01:26:52 2017 +0100 Build with Maven instead of Ant --- debian/ant.properties | 6 ------ debian/build.xml | 24 ------------------------ debian/changelog | 1 + debian/control | 7 +++---- debian/libjaudiotagger-java.poms | 2 +- debian/maven.ignoreRules | 4 ++++ debian/maven.properties | 5 +++++ debian/rules | 17 +++-------------- 8 files changed, 17 insertions(+), 49 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index aa8b38f..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,6 +0,0 @@ -project.name=jaudiotagger -class.dir=build -source.dir=src -jar=jaudiotagger.jar -ant.build.javac.source=1.6 -ant.build.javac.target=1.6 diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index 5376c30..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project default="jar" name="${project.name}" basedir=".."> - - <target name="clean"> - <delete dir="${class.dir}" quiet="true"/> - </target> - - <target name="compile" description="o Compile the source files"> - <mkdir dir="${class.dir}"/> - <javac srcdir="${source.dir}" destdir="${class.dir}" - debug="true" source="1.5" nowarn="true" encoding="cp1252" - excludes="**/LogFormatter.java"/> - </target> - - <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="${jar}"> - <fileset dir="${class.dir}"> - <include name="**"/> - </fileset> - </jar> - </target> - -</project> diff --git a/debian/changelog b/debian/changelog index 4f7d794..36972ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ libjaudiotagger-java (2.0.3-3) UNRELEASED; urgency=medium * Moved the package to Git [ Emmanuel Bourg ] + * Build with Maven instead of Ant * Track and download the new releases from Bitbucket * Standards-Version updated to 4.1.1 * Switch to debhelper level 10 diff --git a/debian/control b/debian/control index 25c1993..59389a5 100644 --- a/debian/control +++ b/debian/control @@ -7,11 +7,9 @@ Uploaders: Torsten Werner <[email protected]>, Damien Raude-Morvan <[email protected]> Build-Depends: - ant, - cdbs, debhelper (>= 10), default-jdk, - maven-repo-helper + maven-debian-helper (>= 2.2) Standards-Version: 4.1.1 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjaudiotagger-java.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjaudiotagger-java.git @@ -19,7 +17,8 @@ Homepage: http://www.jthink.net/jaudiotagger/ Package: libjaudiotagger-java Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Description: library for editing tags like ID3 in audio files such as MP3s Jaudiotagger is the Audio Tagging library used for tagging data in audio files. It currently supports Mp4 (Mp4, M4p, M4a), Mp3 (id3v1, diff --git a/debian/libjaudiotagger-java.poms b/debian/libjaudiotagger-java.poms index d4f7111..433f4e1 100644 --- a/debian/libjaudiotagger-java.poms +++ b/debian/libjaudiotagger-java.poms @@ -1 +1 @@ -pom.xml +pom.xml --has-package-version --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..44d3b0f --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,4 @@ +junit junit +org.apache.maven.plugins maven-javadoc-plugin +org.apache.maven.plugins maven-source-plugin +org.jvnet.wagon-svn wagon-svn diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..e593715 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true diff --git a/debian/rules b/debian/rules index 017a9d7..d755df6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_BUILD_TARGET := jar - -install/libjaudiotagger-java:: - mh_installpoms -plibjaudiotagger-java -e$(DEB_UPSTREAM_VERSION) - mh_installjar -plibjaudiotagger-java -e$(DEB_UPSTREAM_VERSION) -l pom.xml jaudiotagger.jar - -clean:: - mh_clean +%: + dh $@ --buildsystem=maven get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + uscan --download-current-version --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaudiotagger-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
