This is an automated email from the git hooks/post-receive script. mans0954 pushed a commit to branch master in repository batik.
commit 4a4831a09ff7b522660cbb8a99a74b725bfed000 Author: Christopher Hoskin <[email protected]> Date: Sun Sep 3 20:08:11 2017 +0100 Get package building again * Get package building again + maven-artifacts is no longer a target, explicitly add jars to DEB_ANT_BUILD_TARGET + Add debian/debian/libbatik-java.poms, call mh_install to install jars and poms, for closer alignment to other pkg-java packages --- debian/changelog | 5 ++++ debian/libbatik-java.poms | 63 +++++++++++++++++++++++++++++++++++++++++++++++ debian/rules | 12 +++------ 3 files changed, 72 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 04e4b11..337169d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,11 @@ batik (1.9-1) UNRELEASED; urgency=medium + Fix "CVE-2017-5662: information disclosure vulnerability" Upstream claim BATIK-1139 is fixed in 1.9 (Closes: #860566) * Disable old patches, pending further investigation + * Get package building again + + maven-artifacts is no longer a target, explicitly add jars to + DEB_ANT_BUILD_TARGET + + Add debian/debian/libbatik-java.poms, call mh_install to install jars + and poms, for closer alignment to other pkg-java packages -- Christopher Hoskin <[email protected]> Sun, 03 Sep 2017 16:39:56 +0100 diff --git a/debian/libbatik-java.poms b/debian/libbatik-java.poms new file mode 100644 index 0000000..528acf8 --- /dev/null +++ b/debian/libbatik-java.poms @@ -0,0 +1,63 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +./pom.xml +./batik-all/pom.xml --artifact=batik-1.9/lib/batik-all-1.9.jar --java-lib +./batik-anim/pom.xml --artifact=batik-1.9/lib/batik-anim-1.9.jar --java-lib +./batik-awt-util/pom.xml --artifact=batik-1.9/lib/batik-awt-util-1.9.jar --java-lib +./batik-bridge/pom.xml --artifact=batik-1.9/lib/batik-bridge-1.9.jar --java-lib +./batik-codec/pom.xml --artifact=batik-1.9/lib/batik-codec-1.9.jar --java-lib +./batik-constants/pom.xml --ignore-pom +./batik-css/pom.xml --artifact=batik-1.9/lib/batik-css-1.9.jar --java-lib +./batik-dom/pom.xml --artifact=batik-1.9/lib/batik-dom-1.9.jar --java-lib +./batik-extension/pom.xml --artifact=batik-1.9/lib/batik-extension-1.9.jar --java-lib +./batik-ext/pom.xml --artifact=batik-1.9/lib/batik-ext-1.9.jar --java-lib +./batik-gui-util/pom.xml --artifact=batik-1.9/lib/batik-gui-util-1.9.jar --java-lib +./batik-gvt/pom.xml --artifact=batik-1.9/lib/batik-gvt-1.9.jar --java-lib +./batik-i18n/pom.xml --ignore-pom +./batik-parser/pom.xml --artifact=batik-1.9/lib/batik-parser-1.9.jar --java-lib +./batik-rasterizer-ext/pom.xml --ignore-pom +./batik-rasterizer/pom.xml --artifact=batik-1.9/batik-rasterizer-1.9.jar --java-lib +./batik-script/pom.xml --artifact=batik-1.9/lib/batik-script-1.9.jar --java-lib +./batik-slideshow/pom.xml --artifact=batik-1.9/batik-slideshow-1.9.jar --java-lib +./batik-squiggle-ext/pom.xml --ignore-pom +./batik-squiggle/pom.xml --artifact=batik-1.9/batik-squiggle-1.9.jar --java-lib +./batik-svgbrowser/pom.xml --ignore-pom +./batik-svg-dom/pom.xml --artifact=batik-1.9/lib/batik-svg-dom-1.9.jar --java-lib +./batik-svggen/pom.xml --artifact=batik-1.9/lib/batik-svggen-1.9.jar --java-lib +./batik-svgpp/pom.xml --artifact=batik-1.9/batik-svgpp-1.9.jar --java-lib +./batik-svgrasterizer/pom.xml --ignore-pom +./batik-swing/pom.xml --artifact=batik-1.9/lib/batik-swing-1.9.jar --java-lib +./batik-test/pom.xml --ignore-pom +./batik-test-svg/pom.xml --ignore-pom +./batik-test-swing/pom.xml --ignore-pom +./batik-test-util/pom.xml --ignore-pom +./batik-transcoder/pom.xml --artifact=batik-1.9/lib/batik-transcoder-1.9.jar --java-lib +./batik-ttf2svg/pom.xml --artifact=batik-1.9/batik-ttf2svg-1.9.jar --java-lib +./batik-util/pom.xml --artifact=batik-1.9/lib/batik-util-1.9.jar --java-lib +./batik-xml/pom.xml --artifact=batik-1.9/lib/batik-xml-1.9.jar --java-lib + diff --git a/debian/rules b/debian/rules index 942039f..c403521 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ ANT_HOME := /usr/share/ant DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bfs \ gnujaxp js xalan2 xml-apis-ext xmlgraphics-commons DEB_ANT_COMPILER := modern -DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder-jar +DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder-jar jars DEB_BUILDDIR := . DEB_ANT_BUILDFILE := build.xml DEB_ANT_CLEAN_TARGET := clean @@ -29,21 +29,17 @@ LIBRARY=batik UPSTREAM_VERSION = $(subst +dfsg,,$(DEB_UPSTREAM_VERSION)) -LIB_NAMES = all libs +LIB_NAMES = libs install/libbatik-java:: # Install poms - ant maven-artifacts -Dbuild.id=Debian - for jar in batik-$(UPSTREAM_VERSION)/maven/*/$(UPSTREAM_VERSION)/*.jar; do \ - pom=$$(dirname $$jar)/$$(basename $$jar .jar).pom; \ - mh_installpom -v -plibbatik-java $$pom; \ - mh_installjar -plibbatik-java -l $$pom $$jar; \ - done + mh_install -v -plibbatik-java # Install batik-all.jar and batik-libs.jar for name in $(LIB_NAMES); do \ install -m 644 batik-$(UPSTREAM_VERSION)/lib/batik-$$name-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$$name-$(UPSTREAM_VERSION).jar; \ ln -s batik-$$name-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$$name.jar; \ done + #Link batik.jar and batik-1.9.jar to batik-all-1.9.jar ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$(UPSTREAM_VERSION).jar; \ ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik.jar; \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/batik.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
