This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-codec-java.
commit 2922daba50ce9be5752141fb3c1e64e4c5efbd5c Author: Emmanuel Bourg <[email protected]> Date: Tue Nov 14 11:47:08 2017 +0100 Build with Maven instead of Ant --- debian/MANIFEST.MF | 26 -------------------------- debian/ant.properties | 4 ---- debian/changelog | 1 + debian/control | 15 ++++++++------- debian/libcommons-codec-java-doc.install | 2 +- debian/libcommons-codec-java.poms | 2 +- debian/maven.ignoreRules | 2 ++ debian/maven.rules | 1 + debian/patches/manifest.diff | 17 ----------------- debian/patches/properties.diff | 11 ----------- debian/patches/series | 1 - debian/rules | 24 +++--------------------- 12 files changed, 17 insertions(+), 89 deletions(-) diff --git a/debian/MANIFEST.MF b/debian/MANIFEST.MF deleted file mode 100644 index a0c84e9..0000000 --- a/debian/MANIFEST.MF +++ /dev/null @@ -1,26 +0,0 @@ -Export-Package: org.apache.commons.codec;version="1.10",org.apache.com - mons.codec.binary;version="1.10",org.apache.commons.codec.digest;vers - ion="1.10",org.apache.commons.codec.language;version="1.10",org.apach - e.commons.codec.language.bm;version="1.10",org.apache.commons.codec.n - et;version="1.10" -Implementation-Title: Apache Commons Codec -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.6))" -Implementation-Vendor: The Apache Software Foundation -Implementation-Vendor-Id: org.apache -Specification-Title: Apache Commons Codec -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-SymbolicName: org.apache.commons.codec -Implementation-Version: 1.10 -Specification-Vendor: The Apache Software Foundation -Bundle-Name: Apache Commons Codec -Bundle-Vendor: The Apache Software Foundation -Bundle-Version: 1.10.0 -Bundle-ManifestVersion: 2 -Bundle-Description: The Apache Commons Codec package contains simple e - ncoder and decoders for various formats such as Base64 and Hexade - cimal. In addition to these widely used encoders and decoders, t - he codec package also maintains a collection of phonetic encoding - utilities. -Bundle-DocURL: http://commons.apache.org/proper/commons-codec/ -Import-Package: javax.crypto,javax.crypto.spec -Specification-Version: 1.10 diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index 1b1a5f9..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,4 +0,0 @@ -compile.encoding=UTF-8 -# Use includeantruntime=true as we pass junit4 in DEB_JARS -# (and not in <javac> classpath) -compile.includeantruntime=true diff --git a/debian/changelog b/debian/changelog index ba40cc7..cde73ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ libcommons-codec-java (1.10-2) UNRELEASED; urgency=medium + * Build with Maven instead of Ant * Standards-Version updated to 4.1.1 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 505d523..1e26edf 100644 --- a/debian/control +++ b/debian/control @@ -9,13 +9,13 @@ Uploaders: James Page <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: - ant, - ant-optional, - cdbs, debhelper (>= 10), default-jdk, junit4, - maven-repo-helper + libcommons-parent-java, + libmaven-bundle-plugin-java, + libmaven-javadoc-plugin-java, + maven-debian-helper (>= 2.2) Standards-Version: 4.1.1 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libcommons-codec-java.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libcommons-codec-java.git @@ -23,7 +23,8 @@ Homepage: http://commons.apache.org/codec/ Package: libcommons-codec-java Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Description: encoder and decoders such as Base64 and hexadecimal codec The codec package contains simple encoder and decoders for various formats such as Base64 and Hexadecimal. In addition to these widely @@ -35,8 +36,8 @@ Description: encoder and decoders such as Base64 and hexadecimal codec Package: libcommons-codec-java-doc Architecture: all Section: doc -Depends: ${misc:Depends} -Suggests: libcommons-codec-java +Depends: ${misc:Depends}, ${maven:DocDepends} +Suggests: ${maven:DocOptionalDepends} Description: encoder and decoders such as Base64 and hexadecimal codec - documentation The codec package contains simple encoder and decoders for various formats such as Base64 and Hexadecimal. In addition to these widely diff --git a/debian/libcommons-codec-java-doc.install b/debian/libcommons-codec-java-doc.install index 37b65d8..647ba78 100644 --- a/debian/libcommons-codec-java-doc.install +++ b/debian/libcommons-codec-java-doc.install @@ -1 +1 @@ -dist/docs/api /usr/share/doc/libcommons-codec-java +target/apidocs/* /usr/share/doc/libcommons-codec-java/api/ diff --git a/debian/libcommons-codec-java.poms b/debian/libcommons-codec-java.poms index 43e746b..b0cc4e0 100644 --- a/debian/libcommons-codec-java.poms +++ b/debian/libcommons-codec-java.poms @@ -1 +1 @@ -pom.xml --no-parent +pom.xml --java-lib --has-package-version diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..66bca2f --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,2 @@ +org.apache.maven.plugins maven-assembly-plugin +org.apache.maven.plugins maven-scm-publish-plugin diff --git a/debian/maven.rules b/debian/maven.rules index 993fa59..6fc556e 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1 +1,2 @@ junit junit jar s/4\..*/4.x/ +org.apache.commons commons-parent pom s/.*/debian/ diff --git a/debian/patches/manifest.diff b/debian/patches/manifest.diff deleted file mode 100644 index 21286ff..0000000 --- a/debian/patches/manifest.diff +++ /dev/null @@ -1,17 +0,0 @@ -Description: Append debian/MANIFEST.MF inside JAR file - Entry should be merged with others -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2009-11-28 -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -107,7 +107,8 @@ - <mkdir dir="${build.home}/classes/META-INF"/> - <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/> - <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/> -- <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes"> -+ <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes" -+ manifest="debian/MANIFEST.MF"> - <manifest> - <attribute name="Specification-Title" value="Commons Codec"/> - <attribute name="Specification-Version" value="${component.version}"/> diff --git a/debian/patches/properties.diff b/debian/patches/properties.diff deleted file mode 100644 index d218a68..0000000 --- a/debian/patches/properties.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/default.properties -+++ b/default.properties -@@ -34,7 +34,7 @@ - component.title = Encode/Decode Utilities - - # The current version number of this component --component.version = 1.7-SNAPSHOT -+component.version = 1.7 - - # The name that is used to create the jar file - final.name = ${component.name}-${component.version} diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a7ac053..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -manifest.diff diff --git a/debian/rules b/debian/rules index e03ce8b..b85c816 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,7 @@ #!/usr/bin/make -f -# debian/rules for libcommons-codec-java -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps junit4 ant-junit4 ant-junit -DEB_ANT_BUILD_TARGET := dist -DEB_ANT_CHECK_TARGET := test -DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt -DEB_ANT_ARGS = -Dcomponent.version=$(DEB_UPSTREAM_VERSION) - -binary-post-install/$(PACKAGE):: - mh_installpoms -p$(PACKAGE) - mh_installjar -p$(PACKAGE) -l pom.xml dist/commons-codec-$(VERSION).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/libcommons-codec-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
