[Git][java-team/mpj][debian/jessie-backports] 3 commits: Avoid name space conflict with libopenmpi-java since both packages provide /usr/share/java/mpi.jar

[Andreas Tille]

Andreas Tille pushed to branch debian/jessie-backports at Debian Java Maintainers / mpj


Commits:
4482bffe by Andreas Tille at 2016-05-24T19:04:21Z
Avoid name space conflict with libopenmpi-java since both packages provide /usr/share/java/mpi.jar

- - - - -
71a65f17 by Andreas Tille at 2016-05-30T19:52:14Z
Merge tag 'debian/0.44+dfsg-3' into debian/jessie-backports

- - - - -
30f63c4b by Andreas Tille at 2016-05-30T19:53:22Z
Backport to Jessie

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+mpj (0.44+dfsg-3~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Andreas Tille <tille at debian.org>  Mon, 30 May 2016 21:52:39 +0200
+
+mpj (0.44+dfsg-3) unstable; urgency=medium
+
+  * Avoid name space conflict with libopenmpi-java since both packages
+    provide /usr/share/java/mpi.jar
+
+ -- Andreas Tille <tille at debian.org>  Tue, 24 May 2016 20:58:36 +0200
+
 mpj (0.44+dfsg-2~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.


=====================================
debian/rules
=====================================
@@ -20,11 +20,17 @@ override_dh_install:
 	    sed '1a export MPJ_HOME=$(MPJ_HOME)' $${bin} > $(BINDIR)/$${realbin} ; \
 	done
 
-override_dh_link:
-	dh_link
-	mkdir $(LIBDIR)/lib
-	for lib in lib/* ; do \
-	    ln -s ../../java/`basename $${lib}` $(LIBDIR)/$${lib} ; \
+override_jh_installlibs:
+	jh_installlibs
+	# Amongst the resulting JARs we have /usr/share/java/mpi.jar which is
+        # also in libopenmpi-java.  So all JARs will go into private MPJ_HOME
+	# and only /usr/share/java/mpj.jar will be exposed in /usr/share/java
+	mkdir -p $(LIBDIR)/lib
+	mv debian/$(DEBPKGNAME)/usr/share/java/* $(LIBDIR)/lib
+	mkdir -p debian/$(DEBPKGNAME)/usr/share/java/
+	for lib in $(LIBDIR)/lib/mpj[-.0-9]*jar ; do \
+	    echo "linking $${lib}" ; \
+	    ln -s ../mpj/lib/`basename $${lib}` debian/$(DEBPKGNAME)/usr/share/java/`basename $${lib}` ; \
 	done
 
 override_dh_fixperms:



View it on GitLab: https://salsa.debian.org/java-team/mpj/compare/89185c7c97424af4640c6c74cec618f966502de7...30f63c4bdfa81ec6966f0bfb4416e7ac505795cc

-- 
View it on GitLab: https://salsa.debian.org/java-team/mpj/compare/89185c7c97424af4640c6c74cec618f966502de7...30f63c4bdfa81ec6966f0bfb4416e7ac505795cc
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/pkg-java-commits/attachments/20190113/d0037771/attachment.html>