[jblas] 20/30: Remove javahelper and maven-repo-helper from B-D again.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository jblas.

commit a9164da758dea35e1a1d69e5401488e8c44598dc
Author: Markus Koschany <apo at debian.org>
Date:   Mon Oct 23 21:20:45 2017 +0200

    Remove javahelper and maven-repo-helper from B-D again.
    
    Install navtive libs and jar files into packages.
---
 debian/control |  2 --
 debian/rules   | 42 ++++++++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/debian/control b/debian/control
index 1634b6d..8064658 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,9 @@ Build-Depends:
  debhelper (>= 10),
  default-jdk,
  gfortran,
- javahelper,
  junit4,
  libatlas-base-dev,
  locales,
- maven-repo-helper,
  ruby
 Build-Conflicts:
  locales-all
diff --git a/debian/rules b/debian/rules
index 993e5aa..e3d325f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 export JAVA_HOME := /usr/lib/jvm/default-java
 export CLASSPATH := /usr/share/java/ant-nodeps.jar:/usr/share/java/junit4.jar:/usr/share/java/ant-junit4.jar:/usr/share/java/ant-junit.jar
 
@@ -24,24 +27,27 @@ override_dh_auto_clean:
 	dh_auto_clean -- clean clean-jars
 
 override_dh_install:
-	cp test
-
-#override_dh_auto_test:
-#	# the tests need to be able to find the JNI libs
-#ifeq ($(DEB_BUILD_ARCH_CPU),powerpc)
-#	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/ppc \
-#		&& $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET)
-#else ifeq ($(DEB_BUILD_ARCH_CPU),arm64)
-#	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/aarch64 \
-#		&& $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET)
-#else ifeq ($(DEB_BUILD_ARCH_CPU),ppc64el)
-#	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/ppc64 \
-#		&& $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET)
-#else
-#	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/$(DEB_BUILD_ARCH_CPU) \
-#		&& $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET)
-#endif
-#	dh_auto_test
+	install -m755 -d debian/jblas/usr/lib/jni
+	install -m644 $(shell find ./src/main/resources/lib/dynamic -name '*.so') debian/jblas/usr/lib/jni
+	install -m644 -D jblas-minimal-$(DEB_VERSION_UPSTREAM)-SNAPSHOT.jar \
+		debian/jblas/usr/share/java/jblas-$(DEB_VERSION_UPSTREAM)-SNAPSHOT.jar
+
+override_dh_link:
+	dh_link
+	dh_link -pjblas /usr/share/java/jblas-$(DEB_VERSION_UPSTREAM)-SNAPSHOT.jar /usr/share/java/jblas.jar
+
+override_dh_auto_test:
+	# the tests need to be able to find the JNI libs
+ifeq ($(DEB_BUILD_ARCH),powerpc)
+	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/ppc
+else ifeq ($(DEB_BUILD_ARCH),arm64)
+	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/aarch64
+else ifeq ($(DEB_BUILD_ARCH),ppc64el)
+	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/ppc64
+else
+	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/$(DEB_BUILD_ARCH)
+endif
+	dh_auto_test
 
 override_dh_installdocs:
 	dh_installdocs

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