Emmanuel Bourg pushed to branch master at Debian Med / figtree
Commits: 78b2507e by Emmanuel Bourg at 2018-11-30T09:37:21Z Fixed the build failure with Java 11 (Closes: #912235) - - - - - 2f7e1d74 by Emmanuel Bourg at 2018-11-30T09:37:40Z Removed the dfsg suffix - - - - - 9a6fa4ff by Emmanuel Bourg at 2018-11-30T09:37:56Z Upload to unstable - - - - - 7 changed files: - debian/changelog - debian/control - debian/figtree.manifest - debian/patches/0009-add-batik-all.jar.patch - debian/patches/fix_classpath_in_build_xml.patch - debian/rules - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,9 @@ -figtree (1.4.4+dfsg-1) UNRELEASED; urgency=medium +figtree (1.4.4-1) unstable; urgency=medium - [ Fabian Klötzl ] - * use JDK 8 (fix by Graham Inggs) - Closes: #908039 + * Team upload + * Fixed the build failure with Java 11 (Closes: #912235) - -- Fabian Klötzl <kloe...@evolbio.mpg.de> Mon, 29 Oct 2018 15:27:36 +0000 + -- Emmanuel Bourg <ebo...@apache.org> Fri, 30 Nov 2018 10:37:49 +0100 figtree (1.4.3+dfsg-6) unstable; urgency=medium ===================================== debian/control ===================================== @@ -6,8 +6,9 @@ Section: science Priority: optional Build-Depends: debhelper (>= 11~), javahelper, - openjdk-8-jdk, + default-jdk, ant, + libactivation-java, libbatik-java, libjebl2-java, libjam-java (>= 0.1.20140824), ===================================== debian/figtree.manifest ===================================== @@ -1,3 +1,3 @@ usr/share/java/figtree.jar: - Class-Path: /usr/share/java/jebl.jar /usr/share/java/jam.jar /usr/share/java/freehep-graphics2d.jar /usr/share/java/freehep-graphicsio.jar /usr/share/java/freehep-graphicsio-pdf.jar /usr/share/java/freehep-graphicsio-ps.jar /usr/share/java/freehep-graphicsio-emf.jar /usr/share/java/freehep-graphicsio-swf.jar /usr/share/java/freehep-graphicsio-svg.jar /usr/share/java/freehep-export.jar /usr/share/java/itext5.jar /usr/share/java/batik-svggen.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-awt-util.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-util.jar /usr/share/java/batik-xml.jar /usr/share/java/batik-constants.jar + Class-Path: /usr/share/java/jebl.jar /usr/share/java/jam.jar /usr/share/java/freehep-graphics2d.jar /usr/share/java/freehep-graphicsio.jar /usr/share/java/freehep-graphicsio-pdf.jar /usr/share/java/freehep-graphicsio-ps.jar /usr/share/java/freehep-graphicsio-emf.jar /usr/share/java/freehep-graphicsio-swf.jar /usr/share/java/freehep-graphicsio-svg.jar /usr/share/java/freehep-export.jar /usr/share/java/itext5.jar /usr/share/java/batik-svggen.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-awt-util.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-util.jar /usr/share/java/batik-xml.jar /usr/share/java/batik-constants.jar /usr/share/java/javax.activation.jar Main-Class: figtree/application/FigTreeApplication ===================================== debian/patches/0009-add-batik-all.jar.patch ===================================== @@ -14,8 +14,8 @@ index 2773e5d..d1f4310 100755 <target name="compile" depends="init"> <!-- Compile the java code from ${src} into ${build} --> <javac source="1.6" target="1.6" srcdir="${src}" destdir="${build}" -- classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/batik-awt-util.jar:${deblib}/batik-dom.jar:${deblib}/batik-ext.jar:${deblib}/batik-svggen.jar:${deblib}/batik-util.jar:${deblib}/batik-xml.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-graphicsio-pdf.jar:${deblib}/freehep-graphicsio-ps.jar:${deblib}/freehep-graphicsio-emf.jar:${deblib}/freehep-graphicsio-swf.jar:${deblib}/freehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${deblib}/itext5.jar:${env.JAVA_HOME}/lib/sa-jdi.jar"> -+ classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/batik-all.jar:${deblib}/batik-awt-util.jar:${deblib}/batik-dom.jar:${deblib}/batik-ext.jar:${deblib}/batik-svggen.jar:${deblib}/batik-util.jar:${deblib}/batik-xml.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-graphicsio-pdf.jar:${deblib}/freehep-graphicsio-ps.jar:${deblib}/freehep-graphicsio-emf.jar:${deblib}/freehep-graphicsio-swf.jar:${deblib}/freehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${deblib}/itext5.jar:${env.JAVA_HOME}/lib/sa-jdi.jar"> +- classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/batik-awt-util.jar:${deblib}/batik-dom.jar:${deblib}/batik-ext.jar:${deblib}/batik-svggen.jar:${deblib}/batik-util.jar:${deblib}/batik-xml.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-graphicsio-pdf.jar:${deblib}/freehep-graphicsio-ps.jar:${deblib}/freehep-graphicsio-emf.jar:${deblib}/freehep-graphicsio-swf.jar:${deblib}/freehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${deblib}/itext5.jar:${deblib}/javax.activation.jar:${env.JAVA_HOME}/lib/sa-jdi.jar"> ++ classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/batik-all.jar:${deblib}/batik-awt-util.jar:${deblib}/batik-dom.jar:${deblib}/batik-ext.jar:${deblib}/batik-svggen.jar:${deblib}/batik-util.jar:${deblib}/batik-xml.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-graphicsio-pdf.jar:${deblib}/freehep-graphicsio-ps.jar:${deblib}/freehep-graphicsio-emf.jar:${deblib}/freehep-graphicsio-swf.jar:${deblib}/freehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${deblib}/itext5.jar:${deblib}/javax.activation.jar:${env.JAVA_HOME}/lib/sa-jdi.jar"> <include name="figtree/**"/> </javac> <copy todir="${build}" verbose="true"> ===================================== debian/patches/fix_classpath_in_build_xml.patch ===================================== @@ -18,7 +18,7 @@ Subject: adapt build file to match debian env <!-- Compile the java code from ${src} into ${build} --> <javac source="1.6" target="1.6" srcdir="${src}" destdir="${build}" - classpath="${lib}/jebl.jar:${lib}/jam.jar:${lib}/batik-awt-util.jar:${lib}/batik-dom.jar:${lib}/batik-ext.jar:${lib}/batik-svggen.jar:${lib}/batik-util.jar:${lib}/batik-xml.jar:${lib}/xml-apis.jar:${lib}/iText.jar:${lib}/quaqua.jar:${lib}/jwt/servlet-api-2.5-6.0.2.jar:${lib}/jwt/jwt-3.1.7pre1.jar"> -+ classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/batik-awt-util.jar:${deblib}/batik-dom.jar:${deblib}/batik-ext.jar:${deblib}/batik-svggen.jar:${deblib}/batik-util.jar:${deblib}/batik-xml.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-graphicsio-pdf.jar:${deblib}/freehep-graphicsio-ps.jar:${deblib}/freehep-graphicsio-emf.jar:${deblib}/freehep-graphicsio-swf.jar:${deblib}/freehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${deblib}/itext5.jar:${env.JAVA_HOME}/lib/sa-jdi.jar"> ++ classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/batik-awt-util.jar:${deblib}/batik-dom.jar:${deblib}/batik-ext.jar:${deblib}/batik-svggen.jar:${deblib}/batik-util.jar:${deblib}/batik-xml.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-graphicsio-pdf.jar:${deblib}/freehep-graphicsio-ps.jar:${deblib}/freehep-graphicsio-emf.jar:${deblib}/freehep-graphicsio-swf.jar:${deblib}/freehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${deblib}/itext5.jar:${deblib}/javax.activation.jar:${env.JAVA_HOME}/lib/sa-jdi.jar"> <include name="figtree/**"/> </javac> <copy todir="${build}" verbose="true"> ===================================== debian/rules ===================================== @@ -6,8 +6,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH) - %: dh $@ --with javahelper ===================================== debian/watch ===================================== @@ -1,3 +1,3 @@ version=4 - -opts=repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g https://github.com/rambaut/figtree/tags .*/v(\d[.\d]+)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +opts=repack,compression=xz,dversionmangle=s/\+dfsg//g \ +https://github.com/rambaut/figtree/tags .*/v(\d[.\d]+)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) View it on GitLab: https://salsa.debian.org/med-team/figtree/compare/98e9ba3798f3b69f09550173002ce96911c0b85f...9a6fa4ffd401b9e9dea41a285f0a16569a7e9e58 -- View it on GitLab: https://salsa.debian.org/med-team/figtree/compare/98e9ba3798f3b69f09550173002ce96911c0b85f...9a6fa4ffd401b9e9dea41a285f0a16569a7e9e58 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list debian-med-com...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit