[med-svn] [Git][med-team/libhmsbeagle][master] 3 commits: Fix moving of jni on several architectures

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libhmsbeagle


Commits:
70258025 by Andreas Tille at 2019-02-20T15:58:48Z
Fix moving of jni on several architectures

- - - - -
1b06a2cc by Andreas Tille at 2019-02-21T16:41:17Z
Provide libhmsbeagle-jni.so as symlink in jni subdir

- - - - -
f466d01e by Andreas Tille at 2019-02-22T12:58:25Z
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/libhmsbeagle-dev.install
- − debian/libhmsbeagle1v5.dirs
- + debian/libhmsbeagle1v5.links
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libhmsbeagle (3.1.2+dfsg-4) unstable; urgency=medium
+
+  * Provide libhmsbeagle-jni.so as symlink in jni subdir
+    Closes: #922778
+
+ -- Andreas Tille <tille at debian.org>  Fri, 22 Feb 2019 13:51:26 +0100
+
 libhmsbeagle (3.1.2+dfsg-3) unstable; urgency=medium
 
   * Fix dankling symlink


=====================================
debian/control
=====================================
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 12~),
                default-jdk (>= 1:1.6),
                ant,
                dh-linktree,
+               dh-exec,
                libjs-jquery,
                ocl-icd-opencl-dev | opencl-dev,
                pocl-opencl-icd [amd64] | opencl-icd [amd64],


=====================================
debian/libhmsbeagle-dev.install
=====================================
@@ -4,3 +4,4 @@ usr/lib/*/lib*-cpu*.so
 usr/lib/*/lib*-cpu*.a
 usr/lib/*/libhmsbeagle.a
 usr/lib/*/libhmsbeagle.so
+usr/lib/*/libhmsbeagle-opencl.so


=====================================
debian/libhmsbeagle1v5.dirs deleted
=====================================
@@ -1 +0,0 @@
-usr/lib


=====================================
debian/libhmsbeagle1v5.links
=====================================
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+/usr/lib/${DEB_HOST_GNU_TYPE}/libhmsbeagle-jni.so /usr/lib/${DEB_HOST_GNU_TYPE}/jni/libhmsbeagle-jni.so


=====================================
debian/rules
=====================================
@@ -26,12 +26,6 @@ override_dh_auto_build:
 	$(MAKE) doxygen-doc
 	ant
 
-override_dh_install:
-	dh_install
-	jniso=`find debian/$(lib) -name $(DEB_SOURCE)-jni.so` ; \
-	mkdir -p `dirname $$jniso`/jni ; \
-	mv $$jniso `dirname $$jniso`/jni
-
 override_dh_auto_clean:
 	$(MAKE) -f Makefile distclean || true
 	rm -rf doc .config configure



View it on GitLab: https://salsa.debian.org/med-team/libhmsbeagle/compare/cd6f544485f252216135b2f31ab994830c3310b6...f466d01e2120e642ad82330be3a230ee61bdbee4

-- 
View it on GitLab: https://salsa.debian.org/med-team/libhmsbeagle/compare/cd6f544485f252216135b2f31ab994830c3310b6...f466d01e2120e642ad82330be3a230ee61bdbee4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190222/51d5e738/attachment-0001.html>