[med-svn] [Git][med-team/bbmap][master] Include resources files

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / bbmap


Commits:
bd7ebbb5 by Andreas Tille at 2021-09-30T21:05:54+02:00
Include resources files

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+bbmap (38.93+dfsg-2) UNRELEASED; urgency=medium
+
+  * Include resources files
+    Closes: #995406
+
+ -- Andreas Tille <tille at debian.org>  Thu, 30 Sep 2021 21:04:39 +0200
+
 bbmap (38.93+dfsg-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -8,7 +8,6 @@ PKGSHAREDIR    := debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)
 export JAVA_HOME  := /usr/lib/jvm/default-java
 DEBJAR    := /usr/share/java
 export CLASSPATH := $(DEBJAR)/mpi.jar
-export JH_JAR_EXTRA := resources/*
 
 %:
 	dh $@ --with javahelper
@@ -23,7 +22,8 @@ override_dh_clean:
 
 override_dh_auto_build:
 	cd jni && make -f makefile.linux
-	JH_JAR_EXTRA=`$(CURDIR)/resources/*` jh_build $(DEB_SOURCE).jar current
+	jh_build $(DEB_SOURCE).jar current
+	cd $(CURDIR)/resources && jar uf $(CURDIR)/$(DEB_SOURCE).jar $(subst resources/,,$(wildcard resources/*))
 
 override_dh_install:
 	dh_install



View it on GitLab: https://salsa.debian.org/med-team/bbmap/-/commit/bd7ebbb5decc7c8bd87db33cccaae4f984f5fa2d

-- 
View it on GitLab: https://salsa.debian.org/med-team/bbmap/-/commit/bd7ebbb5decc7c8bd87db33cccaae4f984f5fa2d
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/20210930/be713ee6/attachment.htm>