diff -Nru msv-2009.1+dfsg1/debian/changelog msv-2009.1+dfsg1/debian/changelog --- msv-2009.1+dfsg1/debian/changelog 2015-08-30 18:54:13.000000000 +0000 +++ msv-2009.1+dfsg1/debian/changelog 2018-11-05 22:37:18.000000000 +0000 @@ -1,3 +1,17 @@ +msv (2009.1+dfsg1-6) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 11 (Closes: #912359) + * Build with the DH sequencer instead of CDBS + * Standards-Version updated to 4.2.1 + * Switch to debhelper level 11 + * Use salsa.debian.org Vcs-* URLs + * Changed the priority from extra to optional + * Removed the documentation from the package + * Track and download the new releases from GitHub + + -- Emmanuel Bourg Mon, 05 Nov 2018 23:37:18 +0100 + msv (2009.1+dfsg1-5) unstable; urgency=medium * Team upload. diff -Nru msv-2009.1+dfsg1/debian/compat msv-2009.1+dfsg1/debian/compat --- msv-2009.1+dfsg1/debian/compat 2015-08-30 18:54:13.000000000 +0000 +++ msv-2009.1+dfsg1/debian/compat 2018-11-05 22:35:48.000000000 +0000 @@ -1 +1 @@ -7 +11 diff -Nru msv-2009.1+dfsg1/debian/control msv-2009.1+dfsg1/debian/control --- msv-2009.1+dfsg1/debian/control 2015-08-30 18:54:13.000000000 +0000 +++ msv-2009.1+dfsg1/debian/control 2018-11-05 22:35:48.000000000 +0000 @@ -1,19 +1,28 @@ Source: msv Section: java -Priority: extra +Priority: optional Maintainer: Debian Java Maintainers Uploaders: Giovanni Mascellani -Build-Depends: debhelper (>= 7.0.50~), maven-debian-helper, default-jdk, cdbs, - libisorelax-java, libjdom1-java, librelaxng-datatype-java, libxalan2-java, - libxerces2-java, libxml-commons-resolver1.1-java, ant, junit4 -Standards-Version: 3.9.6 -Homepage: http://java.net/projects/msv -Vcs-Git: git://anonscm.debian.org/pkg-java/msv.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/msv.git;a=summary +Build-Depends: + ant, + debhelper (>= 11), + default-jdk, + junit4, + libisorelax-java, + libjdom1-java, + librelaxng-datatype-java, + libxalan2-java, + libxerces2-java, + libxml-commons-resolver1.1-java, + maven-debian-helper +Standards-Version: 4.2.1 +Vcs-Git: https://salsa.debian.org/java-team/msv.git +Vcs-Browser: https://salsa.debian.org/java-team/msv;a=summary +Homepage: https://github.com/kohsuke/msv Package: libmsv-java Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${maven:Depends} +Depends: ${misc:Depends}, ${maven:Depends} Description: Sun multi-schema XML validator The Sun Multi-Schema XML Validator is a Java tool to validate XML documents against several kinds of XML schemata. It supports DTD, diff -Nru msv-2009.1+dfsg1/debian/copyright msv-2009.1+dfsg1/debian/copyright --- msv-2009.1+dfsg1/debian/copyright 2015-08-30 18:54:13.000000000 +0000 +++ msv-2009.1+dfsg1/debian/copyright 2018-11-05 22:35:48.000000000 +0000 @@ -1,6 +1,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: msv Source: http://java.net/projects/msv +Files-Excluded: *.vsd + generator/* + *.jar + *.zip Files: * Copyright: © 1998-2009, Sun Microsystems, Inc. diff -Nru msv-2009.1+dfsg1/debian/docs msv-2009.1+dfsg1/debian/docs --- msv-2009.1+dfsg1/debian/docs 2015-08-30 18:54:13.000000000 +0000 +++ msv-2009.1+dfsg1/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -readme.html -msv/doc/acceptor.html -msv/doc/commandline.html -msv/doc/developer.html -msv/doc/JARV_API.gif -msv/doc/JARV.html -msv/doc/JAXPmasquerading.html -msv/doc/nativeAPI.html -msv/doc/README.txt -msv/doc/RNGDatatypeLibrary.html -msv/doc/SAXfilter.gif diff -Nru msv-2009.1+dfsg1/debian/maven.properties msv-2009.1+dfsg1/debian/maven.properties --- msv-2009.1+dfsg1/debian/maven.properties 2015-08-30 18:54:13.000000000 +0000 +++ msv-2009.1+dfsg1/debian/maven.properties 2018-11-05 22:35:48.000000000 +0000 @@ -1 +1,2 @@ maven.test.failure.ignore=true +maven.compiler.release=8 diff -Nru msv-2009.1+dfsg1/debian/orig-tar.sh msv-2009.1+dfsg1/debian/orig-tar.sh --- msv-2009.1+dfsg1/debian/orig-tar.sh 2015-08-30 18:54:13.000000000 +0000 +++ msv-2009.1+dfsg1/debian/orig-tar.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e - -VERSION="$2" -DOWNLOADED_FILE="$3" -PACKAGE="$(dpkg-parsechangelog | sed -n 's/^Source: //p')" -TEMPDIR="$(mktemp -d)" -DIR="${PACKAGE}-${VERSION}" - -rm -f "$DOWNLOADED_FILE" -svn export "https://svn.java.net/svn/msv~svn/tags/msv-$VERSION" "$TEMPDIR/$DIR" -find "$TEMPDIR/$DIR" -name '*.vsd' -delete -GZIP=--best tar -c -z -f "../${PACKAGE}_$VERSION.orig.tar.gz" -C "$TEMPDIR" "$DIR" -rm -fr "$TEMPDIR" diff -Nru msv-2009.1+dfsg1/debian/rules msv-2009.1+dfsg1/debian/rules --- msv-2009.1+dfsg1/debian/rules 2015-08-30 18:54:13.000000000 +0000 +++ msv-2009.1+dfsg1/debian/rules 2018-11-05 22:35:48.000000000 +0000 @@ -1,11 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_INSTALL_CHANGELOGS_ALL := msv/doc/ChangeLog.txt +%: + dh $@ diff -Nru msv-2009.1+dfsg1/debian/watch msv-2009.1+dfsg1/debian/watch --- msv-2009.1+dfsg1/debian/watch 2015-08-30 18:54:13.000000000 +0000 +++ msv-2009.1+dfsg1/debian/watch 2018-11-05 22:35:48.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 -opts=dversionmangle=s/\+dfsg.*// \ -https://java.net/projects/msv/sources/svn/show/tags .*/msv-([0-9]{4}\.[\d\.]+)\?.* debian ./debian/orig-tar.sh +version=4 +opts="repack,compression=xz,dversionmangle=s/\+dfsg.*//" \ +https://github.com/kohsuke/msv/tags .*/msv(?:-core)?-([0-9]{4}\.[\d\.]+).tar.gz