[libnetlib-java] 01/03: Revert packaging to the state of the 0.9.3-2 upload
Andreas Tille
tille at debian.org
Fri May 20 18:55:40 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 d522e6303ecf77445c0d3e3df638b6dc89a6236a
Author: Andreas Tille <tille at debian.org>
Date: Fri May 20 20:45:17 2016 +0200
Revert packaging to the state of the 0.9.3-2 upload
---
debian/changelog | 7 --
debian/control | 20 ++-
debian/copyright | 8 +-
debian/libnetlib-java.poms | 35 ------
debian/manifest | 2 +
debian/maven.cleanIgnoreRules | 1 -
debian/maven.ignoreRules | 5 -
debian/maven.properties | 2 -
debian/maven.publishedRules | 1 -
debian/maven.rules | 5 -
debian/patches/enable-generator-module.patch | 10 --
debian/patches/fix_version_mismatch.patch | 182 ---------------------------
debian/patches/series | 4 +-
debian/patches/suppress_native_plugins.patch | 24 ----
debian/patches/update_classpath.patch | 24 ++++
debian/rules | 14 ++-
16 files changed, 51 insertions(+), 293 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 52cf2c4..adbf9d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-netlib-java (1.1.2-1) UNRELEASED; urgency=low
-
- * New upstream version
- * Build system switched from ant to maven - add mh_make output files
-
- -- Andreas Tille <tille at debian.org> Tue, 19 Apr 2016 09:05:45 +0200
-
netlib-java (0.9.3-2) experimental; urgency=low
* Upload to main since preconditions are in main as well
diff --git a/debian/control b/debian/control
index 006699d..bc99262 100644
--- a/debian/control
+++ b/debian/control
@@ -6,28 +6,24 @@ Section: java
Priority: optional
Build-Depends: debhelper (>= 9),
unzip,
- f2j (>= 0.8.1+dfsg),
- libjlapack-java (>= 0.8~dfsg-2),
- default-jdk,
+ f2j,
+ libjlapack-java,
javahelper,
+ default-jdk,
junit,
- maven-debian-helper,
- liblombok-java,
- libplexus-compiler-java,
- libstringtemplate4-java,
- libnetlib-java
-Standards-Version: 3.9.6
+ ant
+Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libnetlib-java.git
Vcs-Git: https://anonscm.debian.org/git/pkg-java/libnetlib-java.git
Homepage: https://github.com/fommil/netlib-java/
Package: libnetlib-java
Architecture: all
-Depends: ${misc:Depends},
- ${maven:Depends},
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${java:Depends},
f2j,
libjlapack-java
-Suggests: ${maven:OptionalDepends}
Description: collection of mission-critical software components for linear algebra systems
Netlib is a collection of mission-critical software components for linear
algebra systems (i.e. working with vectors or matrices).
diff --git a/debian/copyright b/debian/copyright
index cc84ef4..0f19078 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: netlib-java
Source: https://github.com/fommil/netlib-java/
-License: BSD
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
@@ -35,17 +35,17 @@ Files: *
Copyright: 2007 Samuel Halliday, ThinkTank Maths Limited
2003-2007 Keith Seymour.
1992-2007 The University of Tennessee. All rights reserved.
-License: BSD
+License: BSD-3-clause
Files: src/org/netlib/generate/JNIGenerator.java src/org/netlib/generate/JNIGenerator.java
Copyright: 2006, 2007 Samuel Halliday, ThinkTank Maths Limited
-License: BSD
+License: BSD-3-clause
Files: jni/arpack.h
Copyright: 1997 Richard Lehoucq, Rice University
1997 Danny Sorensen, Rice University
1997 Chao Yang, Rice University
-License: BSD
+License: BSD-3-clause
Files: debian/*
Copyright: 2012 Olivier Sallou <osallou at debian.org>
diff --git a/debian/libnetlib-java.poms b/debian/libnetlib-java.poms
deleted file mode 100644
index 8257f62..0000000
--- a/debian/libnetlib-java.poms
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 --no-parent
-core/pom.xml --has-package-version
-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
-generator/pom.xml --has-package-version
diff --git a/debian/manifest b/debian/manifest
new file mode 100644
index 0000000..5bf5694
--- /dev/null
+++ b/debian/manifest
@@ -0,0 +1,2 @@
+/usr/share/java/netlib-java.jar:
+ Class-Path: /usr/share/java/libjlapack-java
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
deleted file mode 100644
index 8b13789..0000000
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
deleted file mode 100644
index f48e9c4..0000000
--- a/debian/maven.ignoreRules
+++ /dev/null
@@ -1,5 +0,0 @@
-
-com.github.fommil jniloader * * * *
-net.sourceforge.f2j arpack_combined_all * * * *
-org.apache.maven.plugins maven-gpg-plugin * * * *
-org.codehaus.mojo native-maven-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
deleted file mode 100644
index 23556e1..0000000
--- a/debian/maven.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-maven.install.skip=true
-
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
deleted file mode 100644
index 8b13789..0000000
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/maven.rules b/debian/maven.rules
deleted file mode 100644
index e44f6ee..0000000
--- a/debian/maven.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-
-junit junit jar s/4\..*/4.x/ * *
-org.antlr s/stringtemplate/ST4/ * s/.*/debian/ * *
-s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/ * *
-org.projectlombok lombok * s/.*/debian/ * *
diff --git a/debian/patches/enable-generator-module.patch b/debian/patches/enable-generator-module.patch
deleted file mode 100644
index b4a9f64..0000000
--- a/debian/patches/enable-generator-module.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -61,6 +61,7 @@
- <packaging>pom</packaging>
-
- <modules>
-+ <module>generator</module>
- <module>core</module>
- <module>legacy</module>
- <module>native_ref</module>
diff --git a/debian/patches/fix_version_mismatch.patch b/debian/patches/fix_version_mismatch.patch
deleted file mode 100644
index 57cad25..0000000
--- a/debian/patches/fix_version_mismatch.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Author: Andreas Tille
-Last-Update: Thu, 28 Jan 2016 21:56:34 +0100
-Description: Normalise version numbers
- See hint from Emmanuel Bourg <ebourg at apache.org> at
- https://lists.debian.org/debian-java/2016/01/msg00079.html
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -57,7 +57,7 @@
-
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>parent</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- <packaging>pom</packaging>
-
- <modules>
---- a/native_system/java/pom.xml
-+++ b/native_system/java/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_system</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>native_system-java</artifactId>
---- a/native_system/pom.xml
-+++ b/native_system/pom.xml
-@@ -15,7 +15,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>parent</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>native_system</artifactId>
---- a/native_system/xbuilds/pom.xml
-+++ b/native_system/xbuilds/pom.xml
-@@ -13,7 +13,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_system</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>native_system-xbuilds</artifactId>
---- a/native_ref/xbuilds/pom.xml
-+++ b/native_ref/xbuilds/pom.xml
-@@ -13,7 +13,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_ref</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>native_ref-xbuilds</artifactId>
---- a/native_system/xbuilds/linux-armhf/pom.xml
-+++ b/native_system/xbuilds/linux-armhf/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_system-xbuilds</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>netlib-native_system-linux-armhf</artifactId>
---- a/native_system/xbuilds/linux-i686/pom.xml
-+++ b/native_system/xbuilds/linux-i686/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_system-xbuilds</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>netlib-native_system-linux-i686</artifactId>
---- a/native_system/xbuilds/linux-x86_64/pom.xml
-+++ b/native_system/xbuilds/linux-x86_64/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_system-xbuilds</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>netlib-native_system-linux-x86_64</artifactId>
---- a/legacy/pom.xml
-+++ b/legacy/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>parent</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <groupId>com.googlecode.netlib-java</groupId>
---- a/native_ref/java/pom.xml
-+++ b/native_ref/java/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_ref</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>native_ref-java</artifactId>
---- a/native_ref/pom.xml
-+++ b/native_ref/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>parent</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>native_ref</artifactId>
---- a/native_ref/xbuilds/linux-armhf/pom.xml
-+++ b/native_ref/xbuilds/linux-armhf/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_ref-xbuilds</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>netlib-native_ref-linux-armhf</artifactId>
---- a/native_ref/xbuilds/linux-i686/pom.xml
-+++ b/native_ref/xbuilds/linux-i686/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_ref-xbuilds</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>netlib-native_ref-linux-i686</artifactId>
---- a/native_ref/xbuilds/linux-x86_64/pom.xml
-+++ b/native_ref/xbuilds/linux-x86_64/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>native_ref-xbuilds</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>netlib-native_ref-linux-x86_64</artifactId>
---- a/perf/pom.xml
-+++ b/perf/pom.xml
-@@ -27,7 +27,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>parent</artifactId>
-- <version>1.2-SNAPSHOT</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>perf</artifactId>
---- a/core/pom.xml
-+++ b/core/pom.xml
-@@ -7,7 +7,7 @@
- <parent>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>parent</artifactId>
-- <version>1.1</version>
-+ <version>1.1.2</version>
- </parent>
-
- <artifactId>core</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index 16ff75d..d2d0807 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-suppress_native_plugins.patch
-fix_version_mismatch.patch
-enable-generator-module.patch
+update_classpath.patch
diff --git a/debian/patches/suppress_native_plugins.patch b/debian/patches/suppress_native_plugins.patch
deleted file mode 100644
index d253da0..0000000
--- a/debian/patches/suppress_native_plugins.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/native_ref/pom.xml
-+++ b/native_ref/pom.xml
-@@ -15,9 +15,6 @@
-
- <modules>
- <module>java</module>
-- <module>osx-x86_64</module>
-- <module>win-i686</module>
-- <module>win-x86_64</module>
- <!-- cross compiles are built separately on a Linux box... -->
- </modules>
-
---- a/native_system/pom.xml
-+++ b/native_system/pom.xml
-@@ -23,9 +23,6 @@
-
- <modules>
- <module>java</module>
-- <module>osx-x86_64</module>
-- <module>win-i686</module>
-- <module>win-x86_64</module>
- <!-- cross compiles are built separately on a Linux box... -->
- </modules>
-
diff --git a/debian/patches/update_classpath.patch b/debian/patches/update_classpath.patch
new file mode 100644
index 0000000..cf43f62
--- /dev/null
+++ b/debian/patches/update_classpath.patch
@@ -0,0 +1,24 @@
+Description: update jar classpath to use package
+ jar files and remove version from generated jarLast-Updated: 26-03-2012
+Author: Olivier Sallou <osallou at debian.org>
+--- 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>
diff --git a/debian/rules b/debian/rules
index bde0193..83d36c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,18 @@
#export DH_VERBOSE=1
%:
- dh $@ --buildsystem=maven --with javahelper
+ dh $@ --with javahelper
override_dh_auto_build:
- dh_auto_build -- install
+ ant clean generate compile package
+
+get-orig-source:
+ debian/get-orig-source
+
+override_jh_installjavadoc:
+ jh_installjavadoc dist/javadoc
+
+override_dh_clean:
+ rm -f netlib-java.jar
+ dh_clean
--
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