[Git][java-team/dom4j][master] Squashed commit to merge 2.1.1-3 upload changes with master.

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / dom4j


Commits:
7c549fed by tony mancill at 2020-05-03T10:55:22-07:00
Squashed commit to merge 2.1.1-3 upload changes with master.

Includes these local branch changes:

commit c6997e6784bacc56ee1a10edb99da1b51efb4380
Author: tony mancill <tmancill at debian.org>
Date:   Sun May 3 10:17:39 2020 -0700

    prepare changelog for upload to unstable

commit 44c885d9047136a4d67dca044aa46d5f3b37e842
Author: tony mancill <tmancill at debian.org>
Date:   Sun May 3 10:20:22 2020 -0700

    Set "Rules-Requires-Root: no" in debian/control

commit accecec45420603ee73ae7172039bafa474626e2
Author: tony mancill <tmancill at debian.org>
Date:   Sun May 3 10:16:48 2020 -0700

    Apply "cme mix dpkg" fixes; Standards-Version and debhelper-compat

commit b6bb66159bbcfb788b18f2449ebe949330edc2cc
Author: tony mancill <tmancill at debian.org>
Date:   Fri Apr 17 22:28:47 2020 -0700

    Add build-dep on libjaxp1.3-java to address FTBFS

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/04_headless-test.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,12 @@
-dom4j (2.1.1-3) UNRELEASED; urgency=medium
+dom4j (2.1.1-3) unstable; urgency=medium
 
   * Team upload.
-  * Ignore the dependency on xml-apis (provided by the JRE)
-  * Standards-Version updated to 4.5.0
-  * Switch to debhelper level 12
+  * Add build-dep on libjaxp1.3-java to address FTBFS (Closes: #959567)
+  * Bump Standards-Version to 4.5.0
+  * Use debhelper-compat = 13
+  * Set "Rules-Requires-Root: no" in debian/control
 
- -- Emmanuel Bourg <ebourg at apache.org>  Sat, 18 Apr 2020 14:49:05 +0200
+ -- tony mancill <tmancill at debian.org>  Sun, 03 May 2020 10:20:53 -0700
 
 dom4j (2.1.1-2) unstable; urgency=medium
 
@@ -92,11 +93,11 @@ dom4j (1.6.1+dfsg.2-6) unstable; urgency=low
 
   [ tony mancill ]
   * Remove Michael Koch from uploaders (Closes: #654011)
-  
+
   [ James Page ]
   * Fix FTBFS with openjdk-7 (LP: #888121) (Closes: #673765):
     - d/patches/java7-compat.patch: Fix compareTo function in Rule class
-      to ensure that comparisions are actually symmetric. 
+      to ensure that comparisions are actually symmetric.
 
   [ Damien Raude-Morvan ]
   * Update Standards-Version: 3.9.3


=====================================
debian/control
=====================================
@@ -1,38 +1,38 @@
 Source: dom4j
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Marcus Better <marcus at better.se>,
+           Emmanuel Bourg <ebourg at apache.org>
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders:
- Marcus Better <marcus at better.se>,
- Emmanuel Bourg <ebourg at apache.org>
-Build-Depends:
- antlr,
- debhelper-compat (= 12),
- default-jdk,
- default-jdk-doc,
- gradle-debian-helper,
- junit,
- libjaxb-api-java,
- libjaxen-java,
- libmsv-java,
- libxalan2-java (>= 2.7.0),
- libxerces2-java,
- libxpp2-java (>= 2.1.10-8~),
- libxpp3-java,
- maven-repo-helper
+Build-Depends: antlr,
+               debhelper-compat (= 13),
+               default-jdk,
+               default-jdk-doc,
+               gradle-debian-helper,
+               junit,
+               libjaxb-api-java,
+               libjaxen-java,
+               libjaxp1.3-java,
+               libmsv-java,
+               libxalan2-java,
+               libxerces2-java,
+               libxpp2-java (>= 2.1.10-8~),
+               libxpp3-java,
+               maven-repo-helper
 Standards-Version: 4.5.0
-Vcs-Git: https://salsa.debian.org/java-team/dom4j.git
 Vcs-Browser: https://salsa.debian.org/java-team/dom4j
+Vcs-Git: https://salsa.debian.org/java-team/dom4j.git
 Homepage: https://dom4j.github.io
+Rules-Requires-Root: no
 
 Package: libdom4j-java
 Architecture: all
-Depends: ${misc:Depends}, libjaxen-java
-Suggests:
- libdom4j-java-doc,
- libmsv-java,
- libxpp2-java (>= 2.1.10-8~),
- libxpp3-java
+Depends: ${misc:Depends},
+         libjaxen-java
+Suggests: libdom4j-java-doc,
+          libmsv-java,
+          libxpp2-java (>= 2.1.10-8~),
+          libxpp3-java
 Description: Flexible XML framework for Java
  dom4j is a library for working with XML, XPath and XSLT on the Java
  platform using the Java Collections Framework and with full support


=====================================
debian/patches/04_headless-test.patch
=====================================
@@ -1,3 +1,4 @@
+Description: _headless test
 --- a/xml/bean/gui.xml
 +++ b/xml/bean/gui.xml
 @@ -1,5 +1,5 @@



View it on GitLab: https://salsa.debian.org/java-team/dom4j/-/commit/7c549fed1e5e7e136beb410333b67e5700e62729

-- 
View it on GitLab: https://salsa.debian.org/java-team/dom4j/-/commit/7c549fed1e5e7e136beb410333b67e5700e62729
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200503/d7ba7033/attachment.html>