This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libslf4j-java.
commit 23ed4d4fa7f7578a033ad9ea753f96f605abe98a Author: Emmanuel Bourg <[email protected]> Date: Thu Jan 28 13:28:25 2016 +0100 Build with maven-debian-helper --- debian/ant.properties | 33 ------- debian/build.xml | 233 ---------------------------------------------- debian/changelog | 7 ++ debian/control | 11 +-- debian/libslf4j-java.poms | 55 ++++++++--- debian/manifest | 7 -- debian/maven.ignoreRules | 4 + debian/maven.rules | 6 +- debian/rules | 28 +----- 9 files changed, 68 insertions(+), 316 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index 5ef6220..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,33 +0,0 @@ -project.name=libslf4j-java -class.dir=classes -source.dir=src/main/java -test.dir=test -test.source.dir=src/test/java -test.class.dir=test/classes -test.res.dir=test/results -test.resource.dir=src/test/resources - -jcl-over-slf4j.dir=jcl-over-slf4j -jul-to-slf4j.dir=jul-to-slf4j -log4j-over-slf4j.dir=log4j-over-slf4j -slf4j-api.dir=slf4j-api -slf4j-jcl.dir=slf4j-jcl -slf4j-jdk14.dir=slf4j-jdk14 -slf4j-log4j12.dir=slf4j-log4j12 -slf4j-nop.dir=slf4j-nop -slf4j-simple.dir=slf4j-simple -slf4j-migrator.dir=slf4j-migrator -slf4j-ext.dir=slf4j-ext - -jcl-over-slf4j.jar=jcl-over-slf4j.jar -jul-to-slf4j.jar=jul-to-slf4j.jar -log4j-over-slf4j.jar=log4j-over-slf4j.jar -slf4j-api.jar=slf4j-api.jar -slf4j-api-test.jar=slf4j-api-test.jar -slf4j-jcl.jar=slf4j-jcl.jar -slf4j-jdk14.jar=slf4j-jdk14.jar -slf4j-log4j12.jar=slf4j-log4j12.jar -slf4j-nop.jar=slf4j-nop.jar -slf4j-simple.jar=slf4j-simple.jar -slf4j-migrator.jar=slf4j-migrator.jar -slf4j-ext.jar=slf4j-ext.jar diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index 9188f9a..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,233 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project default="jar" name="${project.name}" basedir=".."> - - <target name="clean"> - <delete dir="${jcl-over-slf4j.dir}/${class.dir}" quiet="true"/> - <delete dir="${jul-to-slf4j.dir}/${class.dir}" quiet="true"/> - <delete dir="${log4j-over-slf4j.dir}/${class.dir}" quiet="true"/> - <delete dir="${slf4j-api.dir}/${class.dir}" quiet="true"/> - <delete dir="${slf4j-jcl.dir}/${class.dir}" quiet="true"/> - <delete dir="${slf4j-jdk14.dir}/${class.dir}" quiet="true"/> - <delete dir="${slf4j-log4j12.dir}/${class.dir}" quiet="true"/> - <delete dir="${slf4j-nop.dir}/${class.dir}" quiet="true"/> - <delete dir="${slf4j-simple.dir}/${class.dir}" quiet="true"/> - <delete dir="${slf4j-migrator.dir}/${class.dir}" quiet="true"/> -<!-- <delete dir="${slf4j-ext.dir}/${class.dir}" quiet="true"/> --> - - <delete dir="${jcl-over-slf4j.dir}/${test.dir}" quiet="true"/> - <delete dir="${jul-to-slf4j.dir}/${test.dir}" quiet="true"/> - <delete dir="${log4j-over-slf4j.dir}/${test.dir}" quiet="true"/> - <delete dir="${slf4j-api.dir}/${test.dir}" quiet="true"/> - <delete dir="${slf4j-jcl.dir}/${test.dir}" quiet="true"/> - <delete dir="${slf4j-jdk14.dir}/${test.dir}" quiet="true"/> - <delete dir="${slf4j-log4j12.dir}/${test.dir}" quiet="true"/> - <delete dir="${slf4j-nop.dir}/${test.dir}" quiet="true"/> - <delete dir="${slf4j-simple.dir}/${test.dir}" quiet="true"/> - <delete dir="${slf4j-migrator.dir}/${test.dir}" quiet="true"/> - - <delete file="${jcl-over-slf4j.jar}" quiet="true"/> - <delete file="${jul-to-slf4j.jar}" quiet="true"/> - <delete file="${log4j-over-slf4j.jar}" quiet="true"/> - <delete file="${slf4j-api.jar}" quiet="true"/> - <delete file="${slf4j-api-test.jar}" quiet="true"/> - <delete file="${slf4j-jcl.jar}" quiet="true"/> - <delete file="${slf4j-jdk14.jar}" quiet="true"/> - <delete file="${slf4j-log4j12.jar}" quiet="true"/> - <delete file="${slf4j-nop.jar}" quiet="true"/> - <delete file="${slf4j-simple.jar}" quiet="true"/> - <delete file="${slf4j-migrator.jar}" quiet="true"/> -<!-- <delete file="${slf4j-ext.jar}" quiet="true"/> --> - </target> - - <target name="jar"> - <mkdir dir="${slf4j-api.dir}/${class.dir}"/> - <javac srcdir="${slf4j-api.dir}/${source.dir}" destdir="${slf4j-api.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" /> - - <jar jarfile="${slf4j-api.jar}"> - <fileset dir="${slf4j-api.dir}/${class.dir}"> - <exclude name="**/org/slf4j/impl/**"/> - </fileset> - </jar> - - <mkdir dir="${slf4j-jcl.dir}/${class.dir}"/> - <javac srcdir="${slf4j-jcl.dir}/${source.dir}" destdir="${slf4j-jcl.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - - <jar jarfile="${slf4j-jcl.jar}"> - <fileset dir="${slf4j-jcl.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> - - <mkdir dir="${slf4j-jdk14.dir}/${class.dir}"/> - <javac srcdir="${slf4j-jdk14.dir}/${source.dir}" destdir="${slf4j-jdk14.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - - <jar jarfile="${slf4j-jdk14.jar}"> - <fileset dir="${slf4j-jdk14.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> - - <mkdir dir="${slf4j-log4j12.dir}/${class.dir}"/> - <javac srcdir="${slf4j-log4j12.dir}/${source.dir}" destdir="${slf4j-log4j12.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - - <jar jarfile="${slf4j-log4j12.jar}"> - <fileset dir="${slf4j-log4j12.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> - - <mkdir dir="${slf4j-nop.dir}/${class.dir}"/> - <javac srcdir="${slf4j-nop.dir}/${source.dir}" destdir="${slf4j-nop.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - - <jar jarfile="${slf4j-nop.jar}"> - <fileset dir="${slf4j-nop.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> - - <mkdir dir="${slf4j-simple.dir}/${class.dir}"/> - <javac srcdir="${slf4j-simple.dir}/${source.dir}" destdir="${slf4j-simple.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - - <jar jarfile="${slf4j-simple.jar}"> - <fileset dir="${slf4j-simple.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> - - <mkdir dir="${slf4j-migrator.dir}/${class.dir}"/> - <javac srcdir="${slf4j-migrator.dir}/${source.dir}" destdir="${slf4j-migrator.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - - <jar jarfile="${slf4j-migrator.jar}"> - <fileset dir="${slf4j-migrator.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> - - <mkdir dir="${jcl-over-slf4j.dir}/${class.dir}"/> - <javac srcdir="${jcl-over-slf4j.dir}/${source.dir}" destdir="${jcl-over-slf4j.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - - <jar jarfile="${jcl-over-slf4j.jar}"> - <fileset dir="${jcl-over-slf4j.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> - - <mkdir dir="${jul-to-slf4j.dir}/${class.dir}"/> - <javac srcdir="${jul-to-slf4j.dir}/${source.dir}" destdir="${jul-to-slf4j.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - - <jar jarfile="${jul-to-slf4j.jar}"> - <fileset dir="${jul-to-slf4j.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> - - <mkdir dir="${log4j-over-slf4j.dir}/${class.dir}"/> - <javac srcdir="${log4j-over-slf4j.dir}/${source.dir}" destdir="${log4j-over-slf4j.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - - <jar jarfile="${log4j-over-slf4j.jar}"> - <fileset dir="${log4j-over-slf4j.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> - -<!-- <mkdir dir="${slf4j-ext.dir}/${class.dir}"/> - <javac srcdir="${slf4j-ext.dir}/${source.dir}" destdir="${slf4j-ext.dir}/${class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:/usr/share/java/javassist.jar:/usr/share/java/commons-lang.jar"/> - - <jar jarfile="${slf4j-ext.jar}"> - <fileset dir="${slf4j-ext.dir}/${class.dir}"> - <include name="**"/> - </fileset> - </jar> ---> - </target> - - <target name="test-compile"> - <mkdir dir="${slf4j-api.dir}/${test.class.dir}"/> - <javac srcdir="${slf4j-api.dir}/${test.source.dir}" destdir="${slf4j-api.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/> - <jar jarfile="${slf4j-api-test.jar}"> - <fileset dir="${slf4j-api.dir}/${test.class.dir}"> - <include name="**"/> - </fileset> - </jar> - <mkdir dir="${slf4j-jcl.dir}/${test.class.dir}"/> - <javac srcdir="${slf4j-jcl.dir}/${test.source.dir}" destdir="${slf4j-jcl.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}"/> - <mkdir dir="${slf4j-jdk14.dir}/${test.class.dir}"/> - <javac srcdir="${slf4j-jdk14.dir}/${test.source.dir}" destdir="${slf4j-jdk14.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}:${slf4j-jdk14.jar}"/> - <mkdir dir="${slf4j-log4j12.dir}/${test.class.dir}"/> - <javac srcdir="${slf4j-log4j12.dir}/${test.source.dir}" destdir="${slf4j-log4j12.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}"/> - <mkdir dir="${slf4j-nop.dir}/${test.class.dir}"/> - <javac srcdir="${slf4j-nop.dir}/${test.source.dir}" destdir="${slf4j-nop.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}"/> - <mkdir dir="${slf4j-simple.dir}/${test.class.dir}"/> - <javac srcdir="${slf4j-simple.dir}/${test.source.dir}" destdir="${slf4j-simple.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-simple.jar}:${slf4j-api-test.jar}"/> - <mkdir dir="${slf4j-migrator.dir}/${test.class.dir}"/> - <javac srcdir="${slf4j-migrator.dir}/${test.source.dir}" destdir="${slf4j-migrator.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-migrator.jar}"/> - <mkdir dir="${jcl-over-slf4j.dir}/${test.class.dir}"/> - <javac srcdir="${jcl-over-slf4j.dir}/${test.source.dir}" destdir="${jcl-over-slf4j.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-jdk14.jar}:${jcl-over-slf4j.jar}"/> - <mkdir dir="${jul-to-slf4j.dir}/${test.class.dir}"/> - <javac srcdir="${jul-to-slf4j.dir}/${test.source.dir}" destdir="${jul-to-slf4j.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-log4j12.jar}:${jul-to-slf4j.jar}"/> - <mkdir dir="${log4j-over-slf4j.dir}/${test.class.dir}"/> - <javac srcdir="${log4j-over-slf4j.dir}/${test.source.dir}" destdir="${log4j-over-slf4j.dir}/${test.class.dir}" - debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-jdk14.jar}:${log4j-over-slf4j.jar}"/> - </target> - - <macrodef name="test"> - <attribute name="path"/> - <attribute name="component"/> - <sequential> - <mkdir dir="@{component}/${test.res.dir}"/> - <junit printsummary="yes" haltonfailure="yes"> - <classpath> - <pathelement path="@{path}"/> - <pathelement location="@{component}/${test.class.dir}"/> - <pathelement location="@{component}/${test.resource.dir}"/> - <pathelement location="${slf4j-api.jar}"/> - </classpath> - <formatter type="plain"/> - <batchtest todir="@{component}/${test.res.dir}"> - <fileset dir="@{component}/${test.source.dir}"> - <include name="**/*TestCase.java"/> - <include name="**/*Test.java"/> - <exclude name="**/*$*"/> - <exclude name="**/Abstract*"/> - <exclude name="**/*PerfTest.java"/> - </fileset> - </batchtest> - </junit> - </sequential> - </macrodef> - - <target name="test" depends="test-compile"> - <test component="${slf4j-api.dir}" path="${slf4j-api.jar}"/> - <test component="${slf4j-jcl.dir}" path="${slf4j-api-test.jar}"/> - <test component="${slf4j-jdk14.dir}" path="${slf4j-api-test.jar}:${slf4j-jdk14.jar}"/> - <test component="${slf4j-log4j12.dir}" path="${slf4j-api-test.jar}:${slf4j-log4j12.jar}"/> - <test component="${slf4j-nop.dir}" path="${slf4j-api-test.jar}:${slf4j-nop.jar}"/> - <test component="${slf4j-simple.dir}" path="${slf4j-api-test.jar}:${slf4j-simple.jar}"/> - <test component="${slf4j-migrator.dir}" path="${slf4j-migrator.jar}"/> - <test component="${jcl-over-slf4j.dir}" path="${jcl-over-slf4j.jar}:${slf4j-jdk14.jar}"/> - <test component="${jul-to-slf4j.dir}" path="${jul-to-slf4j.jar}:${slf4j-log4j12.jar}"/> - <test component="${log4j-over-slf4j.dir}" path="${log4j-over-slf4j.jar}:${slf4j-jdk14.jar}"/> - </target> - -</project> diff --git a/debian/changelog b/debian/changelog index a642fad..cb7c891 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libslf4j-java (1.7.14-1) UNRELEASED; urgency=medium + + * New upstream release + * Build with maven-debian-helper + + -- Emmanuel Bourg <[email protected]> Thu, 28 Jan 2016 13:04:43 +0100 + libslf4j-java (1.7.13-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 8ce1d6f..68b58df 100644 --- a/debian/control +++ b/debian/control @@ -6,16 +6,15 @@ Uploaders: Varun Hiremath <[email protected]>, Damien Raude-Morvan <[email protected]>, Emmanuel Bourg <[email protected]>, Jakub Adam <[email protected]> -Build-Depends: ant, - ant-optional, - cdbs, - debhelper (>= 9), +Build-Depends: debhelper (>= 9), default-jdk, - javahelper, junit4, + libbuild-helper-maven-plugin-java, libcommons-logging-java, liblog4j1.2-java, - maven-repo-helper + libmaven-antrun-plugin-java, + libmaven-install-plugin-java, + maven-debian-helper Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/libslf4j-java.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libslf4j-java.git diff --git a/debian/libslf4j-java.poms b/debian/libslf4j-java.poms index 9a4c00e..772b842 100644 --- a/debian/libslf4j-java.poms +++ b/debian/libslf4j-java.poms @@ -1,12 +1,43 @@ -pom.xml --no-parent -jcl-over-slf4j/pom.xml -jul-to-slf4j/pom.xml -log4j-over-slf4j/pom.xml -slf4j-api/pom.xml -slf4j-nop/pom.xml -slf4j-jdk14/pom.xml -slf4j-jcl/pom.xml -slf4j-log4j12/pom.xml -slf4j-migrator/pom.xml -slf4j-simple/pom.xml - +# 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 --no-parent --has-package-version +integration/pom.xml --ignore +jcl-over-slf4j/pom.xml --has-package-version +jul-to-slf4j/pom.xml --has-package-version +log4j-over-slf4j/pom.xml --has-package-version +osgi-over-slf4j/pom.xml --ignore +slf4j-android/pom.xml --ignore +slf4j-api/pom.xml --has-package-version +slf4j-ext/pom.xml --ignore +slf4j-jcl/pom.xml --has-package-version +slf4j-jdk14/pom.xml --has-package-version +slf4j-log4j12/pom.xml --has-package-version +slf4j-migrator/pom.xml --has-package-version +slf4j-nop/pom.xml --has-package-version +slf4j-simple/pom.xml --has-package-version +slf4j-site/pom.xml --ignore diff --git a/debian/manifest b/debian/manifest deleted file mode 100644 index 3c454d8..0000000 --- a/debian/manifest +++ /dev/null @@ -1,7 +0,0 @@ -usr/share/java/slf4j-api.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Simple Logging Facade for Java API - Bundle-Vendor: www.slf4j.org - Bundle-Version: 1.7.13 - Bundle-SymbolicName: org.slf4j - Export-Package: org.slf4j;version="1.7.13",org.slf4j.helpers;version="1.7.13",org.slf4j.spi;version="1.7.13",org.slf4j.impl;version="1.7.13" diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..0fd8812 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,4 @@ + +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.codehaus.mojo animal-sniffer-maven-plugin * * * * diff --git a/debian/maven.rules b/debian/maven.rules index 4fd7959..8f58832 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,2 +1,4 @@ -junit junit jar s/4\..*/4.x/ -log4j log4j jar s/1\.2\..*/1.2.x/ + +junit junit * s/4\..*/4.x/ * * +log4j log4j * s/1\.2\..*/1.2.x/ * * +org.slf4j slf4j-api test-jar * * * diff --git a/debian/rules b/debian/rules index 2f9ea03..dd7921e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,29 +1,11 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +%: + dh $@ --buildsystem=maven -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar -DEB_ANT_CHECK_TARGET := test -DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := commons-logging log4j-1.2 ant-junit ant-junit4 junit4 -MODULES := jcl-over-slf4j jul-to-slf4j log4j-over-slf4j slf4j-api \ - slf4j-jcl slf4j-jdk14 slf4j-log4j12 slf4j-migrator slf4j-nop slf4j-simple - -binary-post-install/$(PACKAGE):: - mh_installpoms -p$(PACKAGE) - set -e; for MODULE in $(MODULES); do \ - mh_installjar -p$(PACKAGE) -l $$MODULE/pom.xml $$MODULE.jar; \ - done - jh_manifest - -clean:: - mh_clean - -rm -rf debian/tmp +override_dh_auto_build: + dh_auto_build -- install 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/libslf4j-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
