diff -Nru isorelax-20041111/debian/changelog isorelax-20041111/debian/changelog --- isorelax-20041111/debian/changelog 2016-04-29 06:32:27.000000000 +0000 +++ isorelax-20041111/debian/changelog 2016-04-28 07:42:22.000000000 +0000 @@ -1,3 +1,20 @@ +isorelax (20041111-9) unstable; urgency=low + + [ Samuel Thibault ] + * rules: Pass -notimestamp to javadoc to make build more reproducible. + * Bump Standards-Version to 3.9.8 (no changes). + * compat: Bump to 9. + * rules: Clear. + * patches: Switch to 3.0 patch system. + + [ Emmanuel Bourg ] + * Set the locale and the encoding when generating the javadoc + to make the build reproducible + * Changed the priority from extra to optional + * Use secure Vcs-* URLs + + -- Emmanuel Bourg Thu, 28 Apr 2016 09:42:00 +0200 + isorelax (20041111-8) unstable; urgency=low * Upload to unstable. diff -Nru isorelax-20041111/debian/compat isorelax-20041111/debian/compat --- isorelax-20041111/debian/compat 2016-04-29 06:32:27.000000000 +0000 +++ isorelax-20041111/debian/compat 2016-04-28 07:20:14.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru isorelax-20041111/debian/control isorelax-20041111/debian/control --- isorelax-20041111/debian/control 2016-04-29 06:32:27.000000000 +0000 +++ isorelax-20041111/debian/control 2016-04-28 07:40:13.000000000 +0000 @@ -1,15 +1,15 @@ Source: isorelax -Priority: extra +Section: java +Priority: optional Maintainer: Debian Java Maintainers Uploaders: Samuel Thibault , Giovanni Mascellani -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 9) Build-Depends-Indep: default-jdk, default-jdk-doc, ant, ant-doc, maven-repo-helper -Standards-Version: 3.9.4 -Section: java +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/isorelax.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/isorelax.git Homepage: http://sourceforge.net/projects/iso-relax/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/isorelax.git;a=summary -Vcs-Git: git://anonscm.debian.org/pkg-java/isorelax.git Package: libisorelax-java Architecture: all diff -Nru isorelax-20041111/debian/patches/build isorelax-20041111/debian/patches/build --- isorelax-20041111/debian/patches/build 1970-01-01 00:00:00.000000000 +0000 +++ isorelax-20041111/debian/patches/build 2016-04-28 07:20:14.000000000 +0000 @@ -0,0 +1,13 @@ +diff --git a/org/iso_relax/jaxp/ValidatingDocumentBuilderFactory.java b/org/iso_relax/jaxp/ValidatingDocumentBuilderFactory.java +index 7fb995a..e48f660 100644 +--- a/org/iso_relax/jaxp/ValidatingDocumentBuilderFactory.java ++++ b/org/iso_relax/jaxp/ValidatingDocumentBuilderFactory.java +@@ -101,4 +101,8 @@ public class ValidatingDocumentBuilderFactory extends DocumentBuilderFactory + { _WrappedFactory.setIgnoringElementContentWhitespace(whitespace); } + public void setNamespaceAware(boolean awareness) + { _WrappedFactory.setNamespaceAware(awareness); } ++ public boolean getFeature(String name) throws ParserConfigurationException ++ { return _WrappedFactory.getFeature(name); } ++ public void setFeature(String name, boolean value) throws ParserConfigurationException ++ { _WrappedFactory.setFeature(name, value); } + } diff -Nru isorelax-20041111/debian/patches/series isorelax-20041111/debian/patches/series --- isorelax-20041111/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ isorelax-20041111/debian/patches/series 2016-04-28 07:20:14.000000000 +0000 @@ -0,0 +1 @@ +build diff -Nru isorelax-20041111/debian/rules isorelax-20041111/debian/rules --- isorelax-20041111/debian/rules 2016-04-29 06:32:27.000000000 +0000 +++ isorelax-20041111/debian/rules 2016-04-28 07:38:27.000000000 +0000 @@ -7,50 +7,26 @@ JAVACLASSES=/usr/share/java JAVAFLAGS=-classpath $(JAVACLASSES)/ant.jar -source 1.5 -target 1.5 -JAVADOCFLAGS=-classpath $(JAVACLASSES)/ant.jar \ +JAVADOCFLAGS=-locale en \ + -encoding UTF-8 \ + -notimestamp \ + -classpath $(JAVACLASSES)/ant.jar \ -link /usr/share/doc/default-jdk-doc/api \ -link /usr/share/doc/ant/api/ \ -source 1.5 JARFILE=isorelax-20041111.jar -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: - dh_testdir +%: + dh $@ --with maven_repo_helper - $(JAVAC) $(JAVAFLAGS) `find . -name \*.java` +override_dh_auto_build: + $(JAVAC) $(JAVAFLAGS) `find jp org -name \*.java` $(JAVADOC) $(JAVADOCFLAGS) -d api `find . -name \*.java` $(JAR) c `find . -name \*.class -o -name \*.rxm -o -name \*.rxg -o -name \*.dtd -o -name \*.mod -o -name \*.MF` > $(JARFILE) - touch $@ - -clean: - dh_testdir - dh_testroot - +override_dh_auto_clean: rm -f `find . -name \*.class` rm -f $(JARFILE) rm -fr api - - mh_clean - dh_clean - -binary-indep: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - mh_install - dh_lintian - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install diff -Nru isorelax-20041111/debian/source/format isorelax-20041111/debian/source/format --- isorelax-20041111/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ isorelax-20041111/debian/source/format 2016-04-28 07:20:14.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru isorelax-20041111/org/iso_relax/jaxp/ValidatingDocumentBuilderFactory.java isorelax-20041111/org/iso_relax/jaxp/ValidatingDocumentBuilderFactory.java --- isorelax-20041111/org/iso_relax/jaxp/ValidatingDocumentBuilderFactory.java 2016-04-29 06:32:27.000000000 +0000 +++ isorelax-20041111/org/iso_relax/jaxp/ValidatingDocumentBuilderFactory.java 2009-09-05 20:24:22.000000000 +0000 @@ -101,8 +101,4 @@ { _WrappedFactory.setIgnoringElementContentWhitespace(whitespace); } public void setNamespaceAware(boolean awareness) { _WrappedFactory.setNamespaceAware(awareness); } - public boolean getFeature(String name) throws ParserConfigurationException - { return _WrappedFactory.getFeature(name); } - public void setFeature(String name, boolean value) throws ParserConfigurationException - { _WrappedFactory.setFeature(name, value); } }