[med-svn] [Git][med-team/artemis][master] 4 commits: Setting the classpath in d/rules is not needed with a Maven build
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Sat Nov 6 19:18:34 GMT 2021
Pierre Gruet pushed to branch master at Debian Med / artemis
Commits:
4d21ab12 by Pierre Gruet at 2021-11-06T14:46:33+01:00
Setting the classpath in d/rules is not needed with a Maven build
- - - - -
241e4171 by Pierre Gruet at 2021-11-06T15:25:47+01:00
with-javahelper -> with javahelper
- - - - -
25d15bd3 by Pierre Gruet at 2021-11-06T15:29:16+01:00
Updating changelog
- - - - -
d129dbb9 by Pierre Gruet at 2021-11-06T20:18:19+01:00
Upload to unstable
- - - - -
4 changed files:
- + debian/artemis.manifest
- − debian/artemis.manifest.in
- debian/changelog
- debian/rules
Changes:
=====================================
debian/artemis.manifest
=====================================
@@ -0,0 +1,15 @@
+usr/share/java/artemis.jar:
+ Class-Path: /usr/share/java/batik-codec.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-svggen.jar /usr/share/java/batik-util.jar /usr/share/java/biojava.jar /usr/share/java/cglib.jar /usr/share/java/commons-lang3.jar /usr/share/java/commons-logging.jar /usr/share/java/commons-net.jar /usr/share/java/htsjdk.jar /usr/share/java/ibatis.jar /usr/share/java/j2ssh-core.jar /usr/share/java/log4j-1.2.jar /usr/share/java/picard.jar /usr/share/java/postgresql-jdbc.jar
+ Main-Class: uk.ac.sanger.artemis.components.ArtemisMain
+
+usr/share/java/act.jar:
+ Class-Path: /usr/share/java/artemis.jar /usr/share/java/batik-codec.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-svggen.jar /usr/share/java/batik-util.jar /usr/share/java/biojava.jar /usr/share/java/cglib.jar /usr/share/java/commons-lang3.jar /usr/share/java/commons-logging.jar /usr/share/java/commons-net.jar /usr/share/java/htsjdk.jar /usr/share/java/ibatis.jar /usr/share/java/j2ssh-core.jar /usr/share/java/log4j-1.2.jar /usr/share/java/picard.jar /usr/share/java/postgresql-jdbc.jar
+ Main-Class: uk.ac.sanger.artemis.components.ActMain
+
+usr/share/java/bamview.jar:
+ Class-Path: /usr/share/java/artemis.jar /usr/share/java/batik-codec.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-svggen.jar /usr/share/java/batik-util.jar /usr/share/java/biojava.jar /usr/share/java/cglib.jar /usr/share/java/commons-lang3.jar /usr/share/java/commons-logging.jar /usr/share/java/commons-net.jar /usr/share/java/htsjdk.jar /usr/share/java/ibatis.jar /usr/share/java/j2ssh-core.jar /usr/share/java/log4j-1.2.jar /usr/share/java/picard.jar /usr/share/java/postgresql-jdbc.jar
+ Main-Class: uk.ac.sanger.artemis.components.alignment.BamView
+
+usr/share/java/dnaplotter.jar:
+ Class-Path: /usr/share/java/artemis.jar /usr/share/java/batik-codec.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-svggen.jar /usr/share/java/batik-util.jar /usr/share/java/biojava.jar /usr/share/java/cglib.jar /usr/share/java/commons-lang3.jar /usr/share/java/commons-logging.jar /usr/share/java/commons-net.jar /usr/share/java/htsjdk.jar /usr/share/java/ibatis.jar /usr/share/java/j2ssh-core.jar /usr/share/java/log4j-1.2.jar /usr/share/java/picard.jar /usr/share/java/postgresql-jdbc.jar
+ Main-Class: uk.ac.sanger.artemis.circular.DNADraw
=====================================
debian/artemis.manifest.in deleted
=====================================
@@ -1,16 +0,0 @@
-/usr/share/java/artemis.jar:
- Class-Path: @CLASSPATH@
- Main-Class: uk.ac.sanger.artemis.components.ArtemisMain
- Permissions: all-permissions
-/usr/share/java/act.jar:
- Class-Path: @CLASSPATH@
- Main-Class: uk.ac.sanger.artemis.components.ActMain
- Permissions: all-permissions
-/usr/share/java/bamview.jar:
- Class-Path: @CLASSPATH@
- Main-Class: uk.ac.sanger.artemis.components.alignment.BamView
- Permissions: all-permissions
-/usr/share/java/dnaplotter.jar:
- Class-Path: @CLASSPATH@
- Main-Class: uk.ac.sanger.artemis.circular.DNADraw
- Permissions: all-permissions
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+artemis (18.1.0+dfsg-5) unstable; urgency=medium
+
+ * Upload to unstable, setting the package as Architecture: all seems to be
+ OK in experimental
+ * Setting the classpath in d/rules is not needed with a Maven build
+
+ -- Pierre Gruet <pgt at debian.org> Sat, 06 Nov 2021 15:29:24 +0100
+
artemis (18.1.0+dfsg-4) experimental; urgency=medium
* Removing useless dependency on jarwrapper
=====================================
debian/rules
=====================================
@@ -2,36 +2,8 @@
include /usr/share/dpkg/default.mk
-JAVA_HOME=/usr/lib/jvm/default-java
-
-CUPBOARD = biojava \
- j2ssh-core \
- ibatis \
- log4j-1.2 \
- postgresql-jdbc3 \
- picard \
- htsjdk \
- commons-logging \
- commons-net \
- commons-lang3 \
- cglib \
- batik-codec \
- batik-dom \
- batik-ext \
- batik-svggen \
- batik-util
-
-# hack to be able to use a space as an argument to the subst function
-space=
-space+=
-
-CLASSPATH := $(foreach jar, $(CUPBOARD), /usr/share/java/$(jar).jar)
-CLASSPATH += /usr/share/EMBOSS/jemboss/lib/jemboss.jar \
- $(CURDIR)
-export CLASSPATH := $(subst $(space),:,$(strip $(CLASSPATH)))
-
%:
- dh $@
+ dh $@ --with javahelper
override_dh_auto_build:
dh_auto_build
@@ -48,10 +20,6 @@ override_dh_auto_build:
jar cf dnaplotter.jar * && \
mv dnaplotter.jar ../modifiedJars/ && \
cp ../modifiedJars/dnaplotter.jar ../modifiedJars/bamview.jar
- # Preparing the classpath for jh_manifest, which will fix the classpath and
- # the main class.
- sed 's|@CLASSPATH@|$(subst :,$(space),$(subst $(CURDIR),/usr/share/java/artemis.jar,$(CLASSPATH)))|g' debian/artemis.manifest.in > \
- debian/artemis.manifest
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -61,7 +29,6 @@ endif
override_dh_auto_clean:
dh_auto_clean
- $(RM) debian/artemis.manifest
$(RM) images/helix.png
$(RM) -rf target/jarsBuild
$(RM) -rf target/modifiedJars
@@ -71,5 +38,3 @@ override_dh_install:
# Using imagemagick to convert the icon from gif to png.
mkdir -p debian/$(DEB_SOURCE)/usr/share/icons/hicolor/96x96/apps/
convert src/main/resources/images/helix.gif -resize 96x96\! debian/$(DEB_SOURCE)/usr/share/icons/hicolor/96x96/apps/helix.png
- # Defining the right classpaths and main classes.
- jh_manifest
View it on GitLab: https://salsa.debian.org/med-team/artemis/-/compare/7075fb82dd3e5873024d27244ad15c74cfc876d1...d129dbb90167efe7629df701d4f8685eee1ab39e
--
View it on GitLab: https://salsa.debian.org/med-team/artemis/-/compare/7075fb82dd3e5873024d27244ad15c74cfc876d1...d129dbb90167efe7629df701d4f8685eee1ab39e
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/20211106/dc68521f/attachment-0001.htm>
More information about the debian-med-commit
mailing list