Emmanuel Bourg pushed to branch master at Debian Java Maintainers / svgsalamander
Commits: e21ae07b by Emmanuel Bourg at 2019-03-04T08:28:35Z Removed the doc package to fix the build failure with Java 11.0.2 (Closes: #923709) - - - - - 67026765 by Emmanuel Bourg at 2019-03-04T08:28:45Z Use salsa.debian.org Vcs-* URLs - - - - - e8755ca0 by Emmanuel Bourg at 2019-03-04T08:28:54Z Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/control - − debian/libsvgsalamander-java-doc.javadoc - − debian/patches/0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +svgsalamander (1.1.1+dfsg-3) unstable; urgency=medium + + * Team upload. + * Removed the doc package to fix the build failure with Java 11.0.2 + (Closes: #923709) + * Use salsa.debian.org Vcs-* URLs + + -- Emmanuel Bourg <[email protected]> Mon, 04 Mar 2019 09:28:49 +0100 + svgsalamander (1.1.1+dfsg-2) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -7,14 +7,12 @@ Build-Depends: debhelper (>= 9), javahelper, maven-repo-helper Build-Depends-Indep: default-jdk, - default-jdk-doc, ant, ant-optional, - ant-doc, javacc Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/svgsalamander.git -Vcs-Git: https://anonscm.debian.org/git/pkg-java/svgsalamander.git +Vcs-Browser: https://salsa.debian.org/java-team/svgsalamander +Vcs-Git: https://salsa.debian.org/java-team/svgsalamander.git Homepage: http://svgsalamander.java.net/ Package: libsvgsalamander-java @@ -30,20 +28,3 @@ Description: SVG engine for Java Java games and making it much easier for artists to design 2D game content - from rich interactive menus to charts and graphcs to complex animations. - -Package: libsvgsalamander-java-doc -Architecture: all -Section: doc -Depends: ${misc:Depends}, - ${java:Depends} -Recommends: ${java:Recommends} -Description: SVG engine for Java (documentation) - SVG Salamander is an SVG engine for Java that's designed to be small, - fast, and allow programmers to use it with a minimum of fuss. - . - It's in particular targeted for making it easy to integrate SVG into - Java games and making it much easier for artists to design 2D game - content - from rich interactive menus to charts and graphcs to - complex animations. - . - This package includes the javadoc API documentation for svgsalamander. ===================================== debian/libsvgsalamander-java-doc.javadoc deleted ===================================== @@ -1 +0,0 @@ -svg-core/dist/javadoc ===================================== debian/patches/0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch deleted ===================================== @@ -1,15 +0,0 @@ -Description: Modify javadoc target to add links to system API docs -Author: Nicolas Dandrimont <[email protected]> -Forwarded: not-needed -Last-Update: 2011-03-06 ---- a/svg-core/nbproject/build-impl.xml -+++ b/svg-core/nbproject/build-impl.xml -@@ -1282,6 +1282,8 @@ is divided into following sections: - <include name="**/*.java"/> - <exclude name="*.java"/> - </fileset> -+ <link href="/usr/share/doc/default-jdk-doc/api" /> -+ <link href="/usr/share/doc/ant/api" /> - <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/> - </javadoc> - <copy todir="${dist.javadoc.dir}"> ===================================== debian/patches/series ===================================== @@ -1,6 +1,5 @@ 0001-Make-build-use-system-libraries.patch 0002-Disable-useless-automated-jar-signing.patch -0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch 0005-dont-call-netbeans-ant-tasks.patch 0006-modify-broken-upstream-pom.patch 0007-CVE-2017-5617-Allow-only-data-scheme.patch ===================================== debian/rules ===================================== @@ -19,7 +19,7 @@ TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz override_dh_auto_build: -mkdir -p $(CURDIR)/svg-core/src/gen/res -mkdir -p $(CURDIR)/svg-core/src/gen/java - cd $(CURDIR)/svg-core && $(ANT) jar && $(ANT) javadoc + cd $(CURDIR)/svg-core && $(ANT) jar override_dh_clean: -mkdir -p $(CURDIR)/svg-core/src/gen/res View it on GitLab: https://salsa.debian.org/java-team/svgsalamander/compare/4fb653f7162a42ad6bd6692d464305e8f8dbeb99...e8755ca0d0badf256797a8e9fb5f7ccf3713d2e8 -- View it on GitLab: https://salsa.debian.org/java-team/svgsalamander/compare/4fb653f7162a42ad6bd6692d464305e8f8dbeb99...e8755ca0d0badf256797a8e9fb5f7ccf3713d2e8 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
