This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libminlog-java.
commit 8b1500d21908492413a24111cfa13dedeb9b6d2b Author: Emmanuel Bourg <[email protected]> Date: Mon Jan 9 10:03:40 2017 +0100 Build with Maven instead of javahelper --- debian/changelog | 4 ++- debian/control | 13 +++++---- debian/javabuild | 1 - debian/libminlog-java-doc.install | 2 ++ debian/libminlog-java-doc.javadoc | 1 - debian/libminlog-java.poms | 29 ++++++++++++++++++- debian/maven.ignoreRules | 4 +++ debian/pom.xml | 61 --------------------------------------- debian/rules | 6 +--- 9 files changed, 45 insertions(+), 76 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90f13f2..024ca2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -libminlog-java (1.2-4) UNRELEASED; urgency=medium +libminlog-java (1.3.0-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Build with Maven instead of javahelper * Standards-Version updated to 3.9.8 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 4860c9d..68dde00 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,9 @@ Uploaders: Damien Raude-Morvan <[email protected]> Build-Depends: debhelper (>= 10), default-jdk, - javahelper (>= 0.43), - maven-repo-helper + 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/libminlog-java.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libminlog-java.git @@ -15,8 +16,8 @@ Homepage: https://github.com/EsotericSoftware/minlog Package: libminlog-java Architecture: all -Depends: ${java:Depends}, ${misc:Depends} -Recommends: ${java:Recommends} +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Description: minimal Java logging library MinLog is a Java logging library. Key features: * Zero overhead Logging statements below a given level can @@ -31,8 +32,8 @@ Description: minimal Java logging library Package: libminlog-java-doc Architecture: all Section: doc -Depends: ${java:Depends}, ${misc:Depends} -Recommends: ${java:Recommends} +Depends: ${maven:DocDepends}, ${misc:Depends} +Recommends: ${maven:DocOptionalDepends} Description: minimal Java logging library - doc MinLog is a Java logging library. Key features: * Zero overhead Logging statements below a given level can diff --git a/debian/javabuild b/debian/javabuild deleted file mode 100644 index 8761b00..0000000 --- a/debian/javabuild +++ /dev/null @@ -1 +0,0 @@ -minlog.jar minlog/src diff --git a/debian/libminlog-java-doc.install b/debian/libminlog-java-doc.install new file mode 100644 index 0000000..22f0fb6 --- /dev/null +++ b/debian/libminlog-java-doc.install @@ -0,0 +1,2 @@ + +target/apidocs/* usr/share/doc/libminlog-java/api diff --git a/debian/libminlog-java-doc.javadoc b/debian/libminlog-java-doc.javadoc deleted file mode 100644 index ce83b25..0000000 --- a/debian/libminlog-java-doc.javadoc +++ /dev/null @@ -1 +0,0 @@ -internal diff --git a/debian/libminlog-java.poms b/debian/libminlog-java.poms index 3a837b3..64b1188 100644 --- a/debian/libminlog-java.poms +++ b/debian/libminlog-java.poms @@ -1 +1,28 @@ -debian/pom.xml --has-package-version --java-lib --artifact=minlog.jar +# 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 --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..f6f6681 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,4 @@ + +junit junit * * * * +org.apache.maven.plugins maven-release-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * diff --git a/debian/pom.xml b/debian/pom.xml deleted file mode 100644 index 9aa776e..0000000 --- a/debian/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>com.esotericsoftware.minlog</groupId> - <artifactId>minlog</artifactId> - <version>1.2</version> - <packaging>jar</packaging> - <name>MinLog</name> - <description>Minimal overhead Java logging</description> - <url>http://code.google.com/p/minlog/</url> - - <licenses> - <license> - <name>New BSD License</name> - <url>http://www.opensource.org/licenses/bsd-license.php</url> - <distribution>repo</distribution> - </license> - </licenses> - - <scm> - <url>http://minlog.googlecode.com/svn/</url> - <connection>scm:svn:http://minlog.googlecode.com/svn/</connection> - </scm> - - <developers> - <developer> - <id>nathan.sweet</id> - <name>Nathan Sweet</name> - <email>[email protected]</email> - </developer> - </developers> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - <build> - <!-- Set nonstandard source dir --> - <sourceDirectory>src</sourceDirectory> - - <plugins> - <!-- Disable resources (project has none) --> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.5</version> - <executions> - <execution> - <id>default-resources</id> - <phase>none</phase> - </execution> - <execution> - <id>default-testResources</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/debian/rules b/debian/rules index eb933b2..06abd43 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,7 @@ #!/usr/bin/make -f -export JAVA_HOME=/usr/lib/jvm/default-java - %: - dh $@ --with javahelper,maven-repo-helper - + dh $@ get-orig-source: uscan --force-download - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libminlog-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
