This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jcodings.
commit 403b51f920d38fb43e9e4890dca65fe7b56b37d0 Author: Emmanuel Bourg <[email protected]> Date: Mon Dec 16 00:52:03 2013 +0100 Build with Maven instead of Ant --- debian/ant.properties | 6 ------ debian/changelog | 1 + debian/control | 4 ++-- debian/libjcodings-java.poms | 28 ++++++++++++++++++++++++++++ debian/maven.ignoreRules | 3 +++ debian/maven.rules | 2 ++ debian/rules | 7 +------ 7 files changed, 37 insertions(+), 14 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index c13a929..0000000 --- a/debian/ant.properties +++ /dev/null @@ -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 --git a/debian/changelog b/debian/changelog index 51de372..f4fad0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ jcodings (1.0.10-2) UNRELEASED; urgency=medium * Team upload. + * Build with Maven instead of Ant * Switch to debhelper level 9 * debian/control: - Standards-Version updated to 3.9.5 (no changes) diff --git a/debian/control b/debian/control index 8e73217..123fa38 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Hideki Yamane <[email protected]> -Build-Depends: debhelper (>= 9), cdbs, maven-repo-helper -Build-Depends-Indep: ant, default-jdk +Build-Depends: default-jdk, debhelper (>= 9), cdbs, maven-debian-helper +Build-Depends-Indep: junit4 Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/pkg-java/jcodings.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jcodings.git diff --git a/debian/libjcodings-java.poms b/debian/libjcodings-java.poms new file mode 100644 index 0000000..1d885c3 --- /dev/null +++ b/debian/libjcodings-java.poms @@ -0,0 +1,28 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [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 <parent> tag from the POM +# --package=<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=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: 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>: name to use when installing the library in /usr/share/java +# --usj-version=<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=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --has-package-version --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..2001412 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,3 @@ +org.apache.maven.plugins maven-javadoc-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.apache.maven.wagon wagon-webdav-jackrabbit * * * * diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..e85291e --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,2 @@ + +junit junit jar s/4\..*/4.x/ * * diff --git a/debian/rules b/debian/rules index 5bff79c..b76c54a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,9 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java -ANT := ant -propertyfile $(CURDIR)/debian/ant.properties - -install/libjcodings-java:: - mh_installpom -plibjcodings-java pom.xml - mh_installjar -plibjcodings-java pom.xml -l target/jcodings.jar get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jcodings.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
