debian/changelog

 libnanoxml2-java (2.2.3.dfsg-6) UNRELEASED; urgency=medium
 
+  * Team upload
+
+  [ Chris West (Faux) ]
   * Update to -source 1.8 to allow build with Java 9:
     - change -source arguments
     - rename all the "enum" variables to "enu"
 
+  [ Andreas Tille ]
+  * More verbose output in build time test
+  * Point Vcs-fields to Salsa
+
  -- Chris West (Faux) <debian@fau.xxx>  Fri, 08 Sep 2017 13:16:03 +0100
 
 libnanoxml2-java (2.2.3.dfsg-5) unstable; urgency=medium

debian/control

@@ -10,8 +10,8 @@ Build-Depends-Indep: default-jdk-doc,
                      perl,
                      javahelper
 Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libnanoxml2-java.git
-Vcs-Git: git://anonscm.debian.org/pkg-java/libnanoxml2-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libnanoxml2-java
+Vcs-Git: https://salsa.debian.org/java-team/libnanoxml2-java.git
 Homepage: http://devkix.com/nanoxml.php
 
 Package: libnanoxml2-java

debian/rules

@@ -53,10 +53,12 @@ override_dh_clean:
 
 test:
 	set -e
+	set -x
 	cd Test/Lite && \
 	${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${LITE} `find -iname *.java` && \
-	for TESTFILE in *.xml; \
-		do if [ "`${JAVA_HOME}/bin/java -cp .:../../${LITE} DumpXML_Lite $${TESTFILE}`" != "`cat $${TESTFILE}.out`" ]; \
+	for TESTFILE in *.xml; do \
+		${JAVA_HOME}/bin/java -cp .:../../${LITE} DumpXML_Lite $${TESTFILE} > $${TESTFILE}.test_out ; \
+		if diff -u $${TESTFILE}.out $${TESTFILE}.test_out ; \
 		then	echo ${LITE} failed $${TESTFILE}; \
 			exit 1; \
 		fi; \
@@ -64,8 +66,9 @@ test:
 
 	cd Test/Java && \
 	${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${NANOXML} `find -iname *.java` && \
-	for TESTFILE in *.xml; \
-		do if [ "`${JAVA_HOME}/bin/java -cp .:../../${NANOXML} DumpXML $${TESTFILE}`" != "`cat $${TESTFILE}.out`" ] ;\
+	for TESTFILE in *.xml; do\
+		${JAVA_HOME}/bin/java -cp .:../../${NANOXML} DumpXML $${TESTFILE} > $${TESTFILE}.test_out ; \
+		if diff -u $${TESTFILE}.out $${TESTFILE}.test_out ; \
 		then	echo ${NANOXML} failed $${TESTFILE}; \
 			exit 1; \
 		fi; \