Emmanuel Bourg pushed to branch master at Debian Java Maintainers / xmlunit
Commits: 692809a1 by Emmanuel Bourg at 2019-09-09T12:39:27Z Wrap and sort - - - - - cb0d388f by Emmanuel Bourg at 2019-09-09T12:40:44Z Standards-Version updated to 4.4.0 - - - - - ba67b65c by Emmanuel Bourg at 2019-09-09T12:40:53Z Switch to debhelper level 11 - - - - - 8640f289 by Emmanuel Bourg at 2019-09-09T12:40:57Z Use salsa.debian.org Vcs-* URLs - - - - - 9af52137 by Emmanuel Bourg at 2019-09-09T13:08:08Z Build with the DH sequencer instead of CDBS - - - - - 83fdf8df by Emmanuel Bourg at 2019-09-09T13:12:16Z Removed the libxmlunit-java-doc package - - - - - 536d9432 by Emmanuel Bourg at 2019-09-09T13:13:17Z Removed the unused build dependency on maven-ant-helper - - - - - 25a2c899 by Emmanuel Bourg at 2019-09-09T13:16:29Z Removed the dependency on libjaxp1.3-java - - - - - 388bf261 by Emmanuel Bourg at 2019-09-09T13:22:11Z Removed the build dependency on libxalan2-java - - - - - 9139346d by Emmanuel Bourg at 2019-09-09T13:23:05Z Upload to unstable - - - - - 11 changed files: - − debian/TODO - debian/changelog - debian/compat - debian/control - debian/copyright - − debian/libxmlunit-java-doc.doc-base.api - − debian/libxmlunit-java-doc.doc-base.userguide - − debian/libxmlunit-java-doc.install - − debian/libxmlunit-java-doc.links - debian/libxmlunit-java.poms - debian/rules Changes: ===================================== debian/TODO deleted ===================================== @@ -1,3 +0,0 @@ - -* Generate the documentation in a separate package. -At the moment, generation of the user manual with docbook fails. ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +xmlunit (1.6-2) unstable; urgency=medium + + * Removed the dependency on libjaxp1.3-java + * Build with the DH sequencer instead of CDBS + * Removed the libxmlunit-java-doc package + * Removed the build dependencies on maven-ant-helper and libxalan2-java + * Standards-Version updated to 4.4.0 + * Switch to debhelper level 11 + * Use salsa.debian.org Vcs-* URLs + + -- Emmanuel Bourg <[email protected]> Mon, 09 Sep 2019 15:23:00 +0200 + xmlunit (1.6-1) unstable; urgency=medium * New upstream release ===================================== debian/compat ===================================== @@ -1 +1 @@ -9 +11 ===================================== debian/control ===================================== @@ -2,31 +2,26 @@ Source: xmlunit Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Ludovic Claude <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, ant-optional, maven-ant-helper, dblatex -Build-Depends-Indep: maven-repo-helper, junit, libjaxp1.3-java, docbook-xsl, libxalan2-java (>= 2.7.1-3) -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-java/xmlunit.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/xmlunit.git +Uploaders: + Ludovic Claude <[email protected]>, + Emmanuel Bourg <[email protected]> +Build-Depends: + ant, + ant-optional, + debhelper (>= 11), + default-jdk, + junit, + maven-repo-helper +Standards-Version: 4.4.0 +Vcs-Git: https://salsa.debian.org/java-team/xmlunit.git +Vcs-Browser: https://salsa.debian.org/java-team/xmlunit Homepage: http://www.xmlunit.org Package: libxmlunit-java Architecture: all -Depends: ${misc:Depends}, junit, libjaxp1.3-java +Depends: ${misc:Depends}, junit Description: Unit testing for XML documents XMLUnit extends JUnit and NUnit to enable unit testing of XML. It compares a control XML document to a test document or the result of a transformation, validates documents, and compares the results of XPath expressions. - -Package: libxmlunit-java-doc -Architecture: all -Section: doc -Depends: ${misc:Depends}, default-jdk-doc -Description: Documentation for XMLUnit - XMLUnit extends JUnit and NUnit to enable unit testing of XML. - It compares a control XML document to a test document or the result of a - transformation, validates documents, and compares the results of XPath - expressions. - . - This package provides the API and user documentation for XMLUnit. ===================================== debian/copyright ===================================== @@ -42,5 +42,5 @@ License: BSD-3-clause License: GPL-3+ On Debian GNU/Linux system you can find the complete text of the - GNU General Public License version 3 license in + GNU General Public License version 3 license in '/usr/share/common-licenses/GPL-3'. ===================================== debian/libxmlunit-java-doc.doc-base.api deleted ===================================== @@ -1,10 +0,0 @@ -Document: libxmlunit-java -Title: Programmer API for XMLUnit -Author: Jeff Martin, Tim Bacon, Stefan Bodewig -Abstract: Java API for XMLUnit, a library that enables JUnit-style - assertions to be made about the content and structure of XML. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libxmlunit-java/api/index.html -Files: /usr/share/doc/libxmlunit-java/api/* ===================================== debian/libxmlunit-java-doc.doc-base.userguide deleted ===================================== @@ -1,10 +0,0 @@ -Document: libxmlunit-java-doc -Title: User guide for XMLUnit -Author: Jeff Martin, Tim Bacon, Stefan Bodewig -Abstract: User guide for XMLUnit, a library that enables JUnit-style - assertions to be made about the content and structure of XML. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libxmlunit-java-doc/userguide/html/index.html -Files: /usr/share/doc/libxmlunit-java-doc/userguide/html/* ===================================== debian/libxmlunit-java-doc.install deleted ===================================== @@ -1,5 +0,0 @@ -build/doc/api usr/share/doc/libxmlunit-java -build/doc/userguide usr/share/doc/libxmlunit-java-doc -build/doc/*.html usr/share/doc/libxmlunit-java-doc -build/doc/*.png usr/share/doc/libxmlunit-java-doc - ===================================== debian/libxmlunit-java-doc.links deleted ===================================== @@ -1,2 +0,0 @@ -usr/share/doc/libxmlunit-java/api usr/share/doc/libxmlunit-java-doc/api - ===================================== debian/libxmlunit-java.poms ===================================== @@ -1 +1 @@ -build/lib/xmlunit.pom --no-parent +build/lib/xmlunit.pom --no-parent --java-lib --artifact=build/lib/xmlunit-*.jar ===================================== debian/rules ===================================== @@ -1,28 +1,13 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/dpkg/pkg-info.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps ant-junit ant-trax junit jaxp-1.3 xalan2 serializer -DEB_ANT_BUILD_TARGET := jar test docs -DEB_ANT_BUILDFILE := build.xml -DEB_ANT_ARGS := -Dxmlunit.version=$(VERSION) -Ddb5.xsl=/usr/share/xml/docbook/stylesheet/nwalsh +%: + dh $@ --with maven-repo-helper -get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack - -binary-post-install/lib$(PACKAGE)-java:: - cp build/lib/xmlunit-$(VERSION).pom build/lib/xmlunit.pom - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml build/lib/xmlunit-$(VERSION).jar - -clean:: - -rm -rf debian/tmp - mh_clean +override_dh_auto_build: + dh_auto_build -- jar test -Dxmlunit.version=$(DEB_VERSION_UPSTREAM) + cp build/lib/xmlunit-*.pom build/lib/xmlunit.pom get-orig-pom: - wget -O debian/pom.xml http://repo1.maven.org/maven2/xmlunit/xmlunit/$(VERSION)/xmlunit-$(VERSION).pom - + wget -O debian/pom.xml http://repo1.maven.org/maven2/xmlunit/xmlunit/$(DEB_VERSION_UPSTREAM)/xmlunit-$(DEB_VERSION_UPSTREAM).pom View it on GitLab: https://salsa.debian.org/java-team/xmlunit/compare/45706433b7077fe1f7bf0c1fb9a52c2fedb317c1...9139346da6a010a1d01a10c92860ad56c7d82142 -- View it on GitLab: https://salsa.debian.org/java-team/xmlunit/compare/45706433b7077fe1f7bf0c1fb9a52c2fedb317c1...9139346da6a010a1d01a10c92860ad56c7d82142 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
