This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository commons-io.
commit a8c46ad7ed6346c8bd1db2e3eaa00c4638b3ac39 Author: Emmanuel Bourg <[email protected]> Date: Tue Apr 26 11:51:22 2016 +0200 Build with maven-debian-helper instead of Ant --- debian/ant.properties | 1 - debian/changelog | 1 + debian/control | 15 ++++++++++----- debian/libcommons-io-java.poms | 29 ++++++++++++++++++++++++++++- debian/maven.ignoreRules | 7 +++++++ debian/maven.rules | 3 +-- debian/patches/add-osgi-metadata.patch | 23 ----------------------- debian/patches/fix-ant-build-version.patch | 15 --------------- debian/patches/series | 2 -- debian/rules | 18 ++---------------- 10 files changed, 49 insertions(+), 65 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index c97321a..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1 +0,0 @@ -javadocdir=target/apidocs diff --git a/debian/changelog b/debian/changelog index 888d2f3..3982c41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ commons-io (2.5-1) UNRELEASED; urgency=low [ Emmanuel Bourg ] * New upstream release + * Build with maven-debian-helper instead of Ant * Moved the package to Git * Standards-Version updated to 3.9.8 (no changes) * Use XZ compression for the upstream tarball diff --git a/debian/control b/debian/control index c06065f..272d234 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,13 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Varun Hiremath <[email protected]>, Jakub Adam <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends: debhelper (>= 8), cdbs, default-jdk -Build-Depends-Indep: maven-repo-helper, ant, junit +Build-Depends: debhelper (>= 8), + default-jdk, + junit4, + libcommons-parent-java, + libmaven-bundle-plugin-java, + libmaven-javadoc-plugin-java, + maven-debian-helper Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/commons-io.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/commons-io.git @@ -14,8 +19,8 @@ Homepage: http://commons.apache.org/io/ Package: libcommons-io-java Architecture: all -Depends: ${misc:Depends} -Suggests: libcommons-io-java-doc +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends}, libcommons-io-java-doc Description: Common useful IO related classes Commons-IO contains utility classes, stream implementations, file filters and endian classes. @@ -23,7 +28,7 @@ Description: Common useful IO related classes Package: libcommons-io-java-doc Section: doc Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ${maven:DocDepends} Suggests: libcommons-io-java Description: Common useful IO related classes - documentation Commons-IO contains utility classes, stream implementations, file filters and diff --git a/debian/libcommons-io-java.poms b/debian/libcommons-io-java.poms index 43e746b..0417132 100644 --- a/debian/libcommons-io-java.poms +++ b/debian/libcommons-io-java.poms @@ -1 +1,28 @@ -pom.xml --no-parent +# 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 diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..ddd4fdf --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,7 @@ + +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-scm-publish-plugin * * * * +org.apache.rat apache-rat-plugin * * * * +org.codehaus.mojo cobertura-maven-plugin * * * * +org.codehaus.mojo findbugs-maven-plugin * * * * diff --git a/debian/maven.rules b/debian/maven.rules index 8486979..35566f0 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,2 +1 @@ -junit junit jar s/3\..*/3.x/ - +junit junit jar s/.*/4.x/ * * diff --git a/debian/patches/add-osgi-metadata.patch b/debian/patches/add-osgi-metadata.patch deleted file mode 100644 index 4901fd3..0000000 --- a/debian/patches/add-osgi-metadata.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Jakub Adam <[email protected]> -Date: Sun, 16 Oct 2011 22:55:56 +0200 -Subject: add-osgi-metadata - ---- - build.xml | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - ---- a/build.xml -+++ b/build.xml -@@ -242,6 +242,12 @@ - <attribute name="Implementation-Vendor-Id" value="org.apache"/> - <attribute name="X-Compile-Source-JDK" value="${compile.source}"/> - <attribute name="X-Compile-Target-JDK" value="${compile.target}"/> -+ <attribute name="Bundle-ManifestVersion" value="2"/> -+ <attribute name="Bundle-Name" value="Apache Commons IO"/> -+ <attribute name="Bundle-Vendor" value="The Apache Software Foundation"/> -+ <attribute name="Bundle-SymbolicName" value="org.apache.commons.io"/> -+ <attribute name="Bundle-Version" value="${component.version}"/> -+ <attribute name="Export-Package" value='org.apache.commons.io;version="1.4.9999",org.apache.commons.io.comparator;version="1.4.9999",org.apache.commons.io.filefilter;version="1.4.9999",org.apache.commons.io.input;version="1.4.9999",org.apache.commons.io.output;version="1.4.9999",org.apache.commons.io;version="${component.version}",org.apache.commons.io.comparator;version="${component.version}",org.apache.commons.io.filefilter;version="${component.version}",org.apache.c [...] - </manifest> - - <jar jarfile="${build.home}/${final.name}.jar" diff --git a/debian/patches/fix-ant-build-version.patch b/debian/patches/fix-ant-build-version.patch deleted file mode 100644 index e39d0a8..0000000 --- a/debian/patches/fix-ant-build-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fixes the wrong revision number in the build file -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed -Origin: vendor ---- a/build.xml -+++ b/build.xml -@@ -55,7 +55,7 @@ - <property name="component.title" value="Commons IO"/> - - <!-- The current version number of this component --> -- <property name="component.version" value="2.2-SNAPSHOT"/> -+ <property name="component.version" value="2.4"/> - - <!-- The base directory for component sources --> - <property name="source.home" value="src/main/java"/> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2aa663d..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -add-osgi-metadata.patch -fix-ant-build-version.patch diff --git a/debian/rules b/debian/rules index f90ee5a..745fd86 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,7 @@ #!/usr/bin/make -f -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 -# no junit at the moment -DEB_JARS := #junit ant-junit -DEB_ANT_BUILD_TARGET := jar javadoc - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar - -clean:: - -rm -rf debian/tmp +%: + dh $@ --buildsystem=maven get-orig-source: uscan --download-current-version --rename --repack --compression xz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-io.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
