Emmanuel Bourg pushed to branch master at Debian Java Maintainers / doxia
Commits: bfa7bc83 by Emmanuel Bourg at 2018-11-26T11:44:27Z Wrap and sort - - - - - e65dd81a by Emmanuel Bourg at 2018-11-26T12:05:46Z Standards-Version updated to 4.2.1 - - - - - 5e860424 by Emmanuel Bourg at 2018-11-26T12:05:51Z Switch to debhelper level 11 - - - - - 3c8b75ca by Emmanuel Bourg at 2018-11-26T12:05:56Z Use salsa.debian.org Vcs-* URLs - - - - - 1252f23c by Emmanuel Bourg at 2018-11-26T12:06:45Z Removed the unused build dependency on libmaven-plugin-tools-java - - - - - 79367273 by Emmanuel Bourg at 2018-11-26T12:07:41Z Fixed the build failure with maven-parent 31 (Closes: #906350) - - - - - 115ce840 by Emmanuel Bourg at 2018-11-26T12:09:38Z Indentation - - - - - fd3607f3 by Emmanuel Bourg at 2018-11-26T12:11:03Z Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/compat - debian/control - debian/libdoxia-java.poms - debian/maven.rules - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +doxia (1.7-2) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with maven-parent 31 (Closes: #906350) + * Removed the unused build dependency on libmaven-plugin-tools-java + * Standards-Version updated to 4.2.1 + * Switch to debhelper level 11 + * Use salsa.debian.org Vcs-* URLs + + -- Emmanuel Bourg <[email protected]> Mon, 26 Nov 2018 13:10:55 +0100 + doxia (1.7-1) unstable; urgency=medium * Team upload. ===================================== debian/compat ===================================== @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== @@ -3,37 +3,37 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 10), - default-jdk, - maven-debian-helper (>= 2.2.2~) -Build-Depends-Indep: default-jdk-doc, - fop (>= 1:2.0), - junit4, - libcommons-collections3-java, - libcommons-configuration-java, - libcommons-configuration-java-doc, - libcommons-lang-java, - libdoxia-sitetools-java, - libhttpclient-java, - libitext1-java, - liblog4j1.2-java, - liblog4j1.2-java-doc, - libmaven-doxia-tools-java, - libmaven-javadoc-plugin-java, - libmaven-parent-java, - libmaven-plugin-tools-java, - libmaven-shade-plugin-java, - libmodello-maven-plugin-java, - libpegdown-java, - libplexus-component-metadata-java, - libplexus-container-default1.5-java, - libplexus-i18n-java, - libplexus-utils-java, - libplexus-utils-java-doc, - libxerces2-java -Standards-Version: 4.0.0 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/doxia.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/doxia.git +Build-Depends: + debhelper (>= 11), + default-jdk, + default-jdk-doc, + fop (>= 1:2.0), + junit4, + libcommons-collections3-java, + libcommons-configuration-java, + libcommons-configuration-java-doc, + libcommons-lang-java, + libdoxia-sitetools-java, + libhttpclient-java, + libitext1-java, + liblog4j1.2-java, + liblog4j1.2-java-doc, + libmaven-doxia-tools-java, + libmaven-javadoc-plugin-java, + libmaven-parent-java, + libmaven-shade-plugin-java, + libmodello-maven-plugin-java, + libpegdown-java, + libplexus-component-metadata-java, + libplexus-container-default1.5-java, + libplexus-i18n-java, + libplexus-utils-java, + libplexus-utils-java-doc, + libxerces2-java, + maven-debian-helper (>= 2.2.2~) +Standards-Version: 4.2.1 +Vcs-Git: https://salsa.debian.org/java-team/doxia.git +Vcs-Browser: https://salsa.debian.org/java-team/doxia Homepage: http://maven.apache.org/doxia/ Package: libdoxia-java ===================================== debian/libdoxia-java.poms ===================================== @@ -25,21 +25,21 @@ # --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. # Empty by default. [mh_install] # -pom.xml --has-package-version --package=libdoxia-core-java --java-lib -doxia-logging-api/pom.xml --has-package-version --package=libdoxia-core-java --java-lib -doxia-sink-api/pom.xml --has-package-version --package=libdoxia-core-java --java-lib -doxia-test-docs/pom.xml --ignore -doxia-core/pom.xml --has-package-version --package=libdoxia-core-java --java-lib -doxia-modules/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-apt/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-confluence/pom.xml --has-package-version --java-lib +pom.xml --has-package-version --java-lib --package=libdoxia-core-java +doxia-logging-api/pom.xml --has-package-version --java-lib --package=libdoxia-core-java +doxia-sink-api/pom.xml --has-package-version --java-lib --package=libdoxia-core-java +doxia-test-docs/pom.xml --ignore +doxia-core/pom.xml --has-package-version --java-lib --package=libdoxia-core-java +doxia-modules/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-apt/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-confluence/pom.xml --has-package-version --java-lib doxia-modules/doxia-module-docbook-simple/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-fml/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-fo/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-itext/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-latex/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-markdown/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-rtf/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-twiki/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-xdoc/pom.xml --has-package-version --java-lib -doxia-modules/doxia-module-xhtml/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-fml/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-fo/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-itext/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-latex/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-markdown/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-rtf/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-twiki/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-xdoc/pom.xml --has-package-version --java-lib +doxia-modules/doxia-module-xhtml/pom.xml --has-package-version --java-lib ===================================== debian/maven.rules ===================================== @@ -21,3 +21,4 @@ commons-collections commons-collections * s/.*/3.x/ * * junit junit jar s/.*/4.x/ * * log4j log4j jar s/1\.2\..*/1.2.x/ * * org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * * +org.apache.maven maven-parent pom s/.*/debian/ * * ===================================== debian/rules ===================================== @@ -2,6 +2,3 @@ %: dh $@ - -get-orig-source: - uscan --download-current-version --force-download --rename View it on GitLab: https://salsa.debian.org/java-team/doxia/compare/d22e27efec6479d4dbeeedf459d1dbcb813d3ce3...fd3607f331090ffbf5797c1a48eedcfc3d9be709 -- View it on GitLab: https://salsa.debian.org/java-team/doxia/compare/d22e27efec6479d4dbeeedf459d1dbcb813d3ce3...fd3607f331090ffbf5797c1a48eedcfc3d9be709 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
