[libnetlib-java] 01/01: Build system switched from ant to maven - add mh_make output files

Andreas Tille tille at debian.org
Thu Jan 28 13:57:37 UTC 2016


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository libnetlib-java.

commit 30b470b819fd3bd39e02a88506a77040f3a63538
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jan 28 14:56:49 2016 +0100

    Build system switched from ant to maven - add mh_make output files
---
 debian/changelog                      |  1 +
 debian/libnetlib-java.poms            | 34 ++++++++++++++++++++++++++++++++++
 debian/libnetlib-java.substvars       |  8 ++++++++
 debian/maven.cleanIgnoreRules         |  1 +
 debian/maven.ignoreRules              |  7 +++++++
 debian/maven.publishedRules           |  1 +
 debian/maven.rules                    | 13 +++++++++++++
 debian/patches/series                 |  1 -
 debian/patches/update_classpath.patch | 26 --------------------------
 9 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bea26d3..b274cd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ netlib-java (1.1.2-1) UNRELEASED; urgency=low
   * cme fix dpkg-control
   * debhelper 9
   * Move from Debian Med team to pkg-java team maintenance
+  * Build system switched from ant to maven - add mh_make output files
 
  -- Andreas Tille <tille at debian.org>  Thu, 28 Aug 2014 15:47:33 +0200
 
diff --git a/debian/libnetlib-java.poms b/debian/libnetlib-java.poms
new file mode 100644
index 0000000..a7e3e3c
--- /dev/null
+++ b/debian/libnetlib-java.poms
@@ -0,0 +1,34 @@
+# 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
+core/pom.xml
+legacy/pom.xml --has-package-version
+native_ref/pom.xml --has-package-version
+native_ref/java/pom.xml --has-package-version
+native_system/pom.xml --has-package-version
+native_system/java/pom.xml --has-package-version
diff --git a/debian/libnetlib-java.substvars b/debian/libnetlib-java.substvars
new file mode 100644
index 0000000..672c0cc
--- /dev/null
+++ b/debian/libnetlib-java.substvars
@@ -0,0 +1,8 @@
+#List of dependencies for libnetlib-java, generated for use by debian/control
+maven.CompileDepends=libmaven-compiler-plugin-java, libmaven-jar-plugin-java
+maven.UpstreamPackageVersion=1.2-SNAPSHOT
+maven.Depends=
+maven.OptionalDepends=
+maven.TestDepends=junit4
+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..4d8257f
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,7 @@
+
+com.github.fommil jniloader * * * *
+com.github.fommil.netlib generator * * * *
+net.sourceforge.f2j arpack_combined_all * * * *
+org.apache.maven.plugins maven-gpg-plugin * * * *
+org.codehaus.mojo native-maven-plugin * * * *
+org.projectlombok lombok * * * *
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..dcdc954
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,13 @@
+
+com.github.fommil.netlib core jar s/.*/debian/ * *
+com.github.fommil.netlib native_ref-java jar s/.*/debian/ * *
+com.github.fommil.netlib native_ref pom s/.*/debian/ * *
+com.github.fommil.netlib native_system-java jar s/.*/debian/ * *
+com.github.fommil.netlib native_system pom s/.*/debian/ * *
+com.github.fommil.netlib parent pom s/.*/debian/ * *
+com.google.guava guava bundle s/.*/debian/ * *
+com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
+com.googlecode.netlib-java netlib-java jar s/.*/debian/ * *
+junit junit jar s/4\..*/4.x/ * *
+s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
+s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d2d0807..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-update_classpath.patch
diff --git a/debian/patches/update_classpath.patch b/debian/patches/update_classpath.patch
deleted file mode 100644
index 7aecef7..0000000
--- a/debian/patches/update_classpath.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: update classpath and jar names
-Description: update jar classpath to use package
- jar files and remove version from generated jar
-Author: Olivier Sallou <osallou at debian.org>
-Last-Updated: 26-03-2012
---- a/build.xml
-+++ b/build.xml
-@@ -35,14 +35,12 @@
- 	-->
- 	<target name="package" depends="javadoc">
- 		<!-- TODO: unpack and include the F2J classes -->
--		<jar destfile="netlib-java-${version}.jar">
-+		<jar destfile="netlib-java.jar">
- 			<fileset dir="build/classes"
-              excludes="**org/netlib/generate**" />
- 		</jar>
--		<move file="dist/javadoc" todir="." />
--		<zip destfile="netlib-java-${version}.zip">
--			<zipfileset dir="." excludes="**/lib/nblibraries-private.properties **/nbproject/private** **/.ant-targets-build.xml dist/** build/** **/*.zip **/.svn** **/jni/*.tar.gz" prefix="netlib-java-${version}" />
--		</zip>
--		<delete dir="javadoc"/>
- 	</target>
-+
-+<property name="javac.classpath" value="/usr/share/java/junit.jar:/usr/share/java/f2jutil.jar:/usr/share/java/jlapack-blas.jar:/usr/share/java/jlapack-lapack.jar:/usr/share/java/jlapack-xerbla.jar"/>
-+
- </project>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnetlib-java.git



More information about the pkg-java-commits mailing list