This is an automated email from the git hooks/post-receive script. tille pushed a commit to tag debian/0.44+dfsg-3 in repository mpj.
commit 4482bffebd470ca96966ef2bb7077faacf7387da Author: Andreas Tille <[email protected]> Date: Tue May 24 21:04:21 2016 +0200 Avoid name space conflict with libopenmpi-java since both packages provide /usr/share/java/mpi.jar --- debian/changelog | 7 +++++++ debian/rules | 16 +++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index f35aad0..a908295 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 <[email protected]> Tue, 24 May 2016 20:58:36 +0200 + mpj (0.44+dfsg-2) unstable; urgency=medium * Install mpj wrapper scripts and config files as well diff --git a/debian/rules b/debian/rules index e3c357e..3864435 100755 --- a/debian/rules +++ b/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: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mpj.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
