This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository libmtj-java.
commit 59f99d4f5cd73aed8dbe7aad059c1335f39c32cf Author: Andreas Tille <[email protected]> Date: Thu Jan 28 15:00:00 2016 +0100 Build system switched from ant to maven - add mh_make output files --- debian/changelog | 1 + debian/libmtj-java.poms | 28 ++++++++++++++++ debian/libmtj-java.substvars | 8 +++++ debian/maven.cleanIgnoreRules | 1 + debian/maven.ignoreRules | 2 ++ debian/maven.publishedRules | 1 + debian/maven.rules | 2 ++ debian/patches/series | 1 - debian/patches/use_debian_jar_files.patch | 53 ------------------------------- 9 files changed, 43 insertions(+), 54 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8e37030..69cef1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mtj (1.0.4-1) UNRELEASED; urgency=medium * d/watch: moved to Github * d/get-orig-source: deleted since no need to repack any more * Move from Debian Med team to pkg-java team maintenance + * Build system switched from ant to maven - add mh_make output files [ Olivier Sallou ] * debian/patches/use_debian_jar_files.patch: fix patch to build using Debian jar files diff --git a/debian/libmtj-java.poms b/debian/libmtj-java.poms new file mode 100644 index 0000000..5ad70f2 --- /dev/null +++ b/debian/libmtj-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 --no-parent --has-package-version diff --git a/debian/libmtj-java.substvars b/debian/libmtj-java.substvars new file mode 100644 index 0000000..5186b48 --- /dev/null +++ b/debian/libmtj-java.substvars @@ -0,0 +1,8 @@ +#List of dependencies for libmtj-java, generated for use by debian/control +maven.CompileDepends= +maven.UpstreamPackageVersion=1.0.4 +maven.Depends= +maven.OptionalDepends= +maven.TestDepends= +maven.DocDepends=default-jdk-doc +maven.DocOptionalDepends= diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1 @@ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..74a357d --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,2 @@ + +org.apache.maven.plugins maven-gpg-plugin * * * * diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1 @@ + diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..31f8b0c --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,2 @@ + +com.googlecode.matrix-toolkits-java mtj jar s/.*/debian/ * * diff --git a/debian/patches/series b/debian/patches/series index 35808d0..bba1400 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -use_debian_jar_files.patch 0002-use_netlib_java_debian_lib.patch diff --git a/debian/patches/use_debian_jar_files.patch b/debian/patches/use_debian_jar_files.patch deleted file mode 100644 index c8bfb89..0000000 --- a/debian/patches/use_debian_jar_files.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Debian Java Maintainers <[email protected]> -Date: Fri, 4 Sep 2015 07:59:24 +0000 -Subject: use_debian_jar_files - ---- - build.xml | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - ---- a/build.xml -+++ b/build.xml -@@ -2,18 +2,32 @@ - <project name="Matrix_Toolkits_for_Java" default="default" basedir="."> - <description>Builds, tests, and runs the project Matrix Toolkits for Java.</description> - <property name="version" value="dev" /> -- <import file="nbproject/build-impl.xml"/> - -- <target name="-post-clean"> -+ <target name="clean"> - <delete dir="javadoc" /> -+ <delete dir="build" /> -+ <delete dir="dist" /> - </target> - -- <target name="package" depends="jar, javadoc"> -- <!-- TODO: consider bundling BLAS/LAPACK --> -- <move file="dist/javadoc" todir="."/> -- <move file="${dist.jar}" tofile="mtj-${version}.jar" /> -- <zip destfile="mtj-${version}.zip"> -- <zipfileset dir="." excludes="**/lib/nblibraries-private.properties **/nbproject/private** **/.ant-targets-build.xml dist/** build/** **/*.zip **/.svn**" prefix="mtj-${version}" /> -- </zip> -- </target> -+ <property name="src.dir" value="src"/> -+ <property name="compile.classpath" value="/usr/share/java/junit.jar:/usr/share/java/f2jutil.jar:/usr/share/java/netlib-java.jar:/usr/share/maven-repo/net/sf/opencsv/opencsv/debian/opencsv-debian.jar"/> -+ <path id="compile.classpath"> -+ <fileset dir="/usr/share/java"> -+ <include name="junit.jar"/> -+ <include name="f2jutil.jar"/> -+ <include name="netlib-java.jar"/> -+ <include name="guava.jar"/> -+ </fileset> -+ <fileset dir="/usr/share/maven-repo/net/sf/opencsv/opencsv/debian"> -+ <include name="opencsv-debian.jar"/> -+ </fileset> -+ </path> -+ -+ <target name="default"> -+ <mkdir dir="build"/> -+ <mkdir dir="dist"/> -+ <javac srcdir="src" destdir="build" classpathref="compile.classpath" nowarn="true" source="1.5" target="1.5"> -+ </javac> -+ </target> -+ - </project> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libmtj-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
