[dom4j] 47/74: * 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. * Update Standards-Version: 3.9.3 * d/copyright: Update to copyright-format 1.0.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 25 10:34:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository dom4j.
commit d1727d8a83d1e3afb3ae0eb5487327fb1358b84a
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Wed May 30 00:13:29 2012 +0000
* 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.
* Update Standards-Version: 3.9.3
* d/copyright: Update to copyright-format 1.0.
---
debian/changelog | 11 +++
debian/control | 2 +-
debian/copyright | 20 +++---
debian/patches/java7-compat.patch | 59 ++++++++++++++++
debian/patches/oldchanges.patch | 140 +++++++++++++++++++++++---------------
debian/patches/series | 1 +
6 files changed, 167 insertions(+), 66 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 01ba3f9..c4286e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,18 @@
dom4j (1.6.1+dfsg.2-6) UNRELEASED; urgency=low
* Team upload.
+
+ [ 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.
+
+ [ Damien Raude-Morvan ]
+ * Update Standards-Version: 3.9.3
+ * d/copyright: Update to copyright-format 1.0.
-- tony mancill <tmancill at debian.org> Fri, 03 Feb 2012 21:26:13 -0800
diff --git a/debian/control b/debian/control
index 86febd1..0eb1212 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Marcus Better <marcus at better.se>
Build-Depends: debhelper (>= 7), ant-optional, default-jdk, maven-repo-helper, cdbs
Build-Depends-Indep: antlr, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/dom4j
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/dom4j
Homepage: http://sourceforge.net/projects/dom4j/
diff --git a/debian/copyright b/debian/copyright
index 24c67c6..2d04bef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
-Format-Specification:
- http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=48
-Name: dom4j
-Maintainer: http://lists.sourceforge.net/lists/listinfo/dom4j-user
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dom4j
+Upstream-Contact: http://lists.sourceforge.net/lists/listinfo/dom4j-user
Source: http://sourceforge.net/projects/dom4j/
+Files: *
Copyright: 2001-2005, MetaStuff, Ltd.
License: DOM4J
@@ -15,29 +15,29 @@ License: DOM4J
Redistribution and use of this software and associated documentation
("Software"), with or without modification, are permitted provided
that the following conditions are met:
-
+ .
1. Redistributions of source code must retain copyright
statements and notices. Redistributions must also contain a
copy of this document.
-
+ .
2. Redistributions in binary form must reproduce the
above copyright notice, this list of conditions and the
following disclaimer in the documentation and/or other
materials provided with the distribution.
-
+ .
3. The name "DOM4J" must not be used to endorse or promote
products derived from this Software without prior written
permission of MetaStuff, Ltd. For written permission,
please contact dom4j-info at metastuff.com.
-
+ .
4. Products derived from this Software may not be called "DOM4J"
nor may "DOM4J" appear in their names without prior written
permission of MetaStuff, Ltd. DOM4J is a registered
trademark of MetaStuff, Ltd.
-
+ .
5. Due credit should be given to the DOM4J Project -
http://www.dom4j.org
-
+ .
THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
new file mode 100644
index 0000000..7ee12e3
--- /dev/null
+++ b/debian/patches/java7-compat.patch
@@ -0,0 +1,59 @@
+Description: Fixup compareTo function in Rule class to be compliant
+ with the Java 7 (and Java 6) API. Comparisons where not symmetric
+ with the upstream handling in this function:
+ .
+ r1 > r2 but ! r2 < r1
+ .
+ Also added extra tests to ensure that comparison works both ways.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+
+--- a/src/java/org/dom4j/rule/Rule.java
++++ b/src/java/org/dom4j/rule/Rule.java
+@@ -99,16 +99,16 @@
+ * @return DOCUMENT ME!
+ */
+ public int compareTo(Rule that) {
+- int answer = this.importPrecedence - that.importPrecedence;
+-
+- if (answer == 0) {
+- answer = (int) Math.round(this.priority - that.priority);
+-
+- if (answer == 0) {
+- answer = this.appearenceCount - that.appearenceCount;
+- }
++ int answer = 0;
++ if (this.importPrecedence != that.importPrecedence) {
++ answer = this.importPrecedence < that.importPrecedence ? -1 : 1;
++ }
++ else if (Double.compare(this.priority, that.priority) != 0) {
++ answer = Double.compare(this.priority, that.priority);
++ }
++ else if (this.appearenceCount != that.appearenceCount) {
++ answer = this.appearenceCount < that.appearenceCount ? -1 : 1;
+ }
+-
+ return answer;
+ }
+
+--- a/src/test/org/dom4j/rule/RuleTest.java
++++ b/src/test/org/dom4j/rule/RuleTest.java
+@@ -48,6 +48,18 @@
+
+ assertTrue("r1 > r2", value > 0);
+
++ value = r2.compareTo(r1);
++
++ System.out.println("Comparison: " + value);
++
++ assertTrue("r2 < r1", value < 0);
++
++ value = r1.compareTo(r1);
++
++ System.out.println("Comparison: " + value);
++
++ assertTrue("r1 == r1", value == 0);
++
+ ArrayList list = new ArrayList();
+ list.add(r1);
+ list.add(r2);
diff --git a/debian/patches/oldchanges.patch b/debian/patches/oldchanges.patch
index 0e42a01..6e5dbbc 100644
--- a/debian/patches/oldchanges.patch
+++ b/debian/patches/oldchanges.patch
@@ -1,8 +1,10 @@
This patch should be cleaned up.
Torsten Werner
---- dom4j-1.6.1+dfsg.2.orig/build.xml
-+++ dom4j-1.6.1+dfsg.2/build.xml
+Index: dom4j/build.xml
+===================================================================
+--- dom4j.orig/build.xml 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/build.xml 2012-05-21 10:02:51.481930000 +0100
@@ -16,13 +16,13 @@
</path>
@@ -82,9 +84,11 @@ Torsten Werner
</fileset>
</batchtest>
</junit>
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMDocumentType.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMDocumentType.java
-@@ -12,7 +12,9 @@ import org.dom4j.tree.DefaultDocumentTyp
+Index: dom4j/src/java/org/dom4j/dom/DOMDocumentType.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMDocumentType.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMDocumentType.java 2012-05-21 10:02:51.481930000 +0100
+@@ -12,7 +12,9 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -94,7 +98,7 @@ Torsten Werner
/**
* <p>
-@@ -177,6 +179,66 @@ public class DOMDocumentType extends Def
+@@ -177,6 +179,66 @@
public String getInternalSubset() {
return getElementName();
}
@@ -161,9 +165,11 @@ Torsten Werner
}
/*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMProcessingInstruction.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMProcessingInstruction.java
-@@ -15,7 +15,9 @@ import org.dom4j.tree.DefaultProcessingI
+Index: dom4j/src/java/org/dom4j/dom/DOMProcessingInstruction.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMProcessingInstruction.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMProcessingInstruction.java 2012-05-21 10:02:51.481930000 +0100
+@@ -15,7 +15,9 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -173,7 +179,7 @@ Torsten Werner
/**
* <p>
-@@ -177,6 +179,66 @@ public class DOMProcessingInstruction ex
+@@ -177,6 +179,66 @@
}
}
@@ -240,9 +246,11 @@ Torsten Werner
// Implementation methods
// -------------------------------------------------------------------------
}
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMAttribute.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMAttribute.java
-@@ -14,7 +14,10 @@ import org.dom4j.tree.DefaultAttribute;
+Index: dom4j/src/java/org/dom4j/dom/DOMAttribute.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMAttribute.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMAttribute.java 2012-05-21 10:02:51.481930000 +0100
+@@ -14,7 +14,10 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -253,7 +261,7 @@ Torsten Werner
/**
* <p>
-@@ -179,6 +182,76 @@ public class DOMAttribute extends Defaul
+@@ -179,6 +182,76 @@
public org.w3c.dom.Element getOwnerElement() {
return DOMNodeHelper.asDOMElement(getParent());
}
@@ -330,9 +338,11 @@ Torsten Werner
}
/*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMDocumentFactory.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMDocumentFactory.java
-@@ -174,6 +174,11 @@ public class DOMDocumentFactory extends
+Index: dom4j/src/java/org/dom4j/dom/DOMDocumentFactory.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMDocumentFactory.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMDocumentFactory.java 2012-05-21 10:02:51.481930000 +0100
+@@ -174,6 +174,11 @@
docType.getPublicId(), docType.getSystemId());
}
}
@@ -344,16 +354,18 @@ Torsten Werner
}
-@@ -213,4 +218,4 @@ public class DOMDocumentFactory extends
+@@ -213,4 +218,4 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
- */
\ No newline at end of file
+ */
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMComment.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMComment.java
-@@ -13,7 +13,9 @@ import org.dom4j.tree.DefaultComment;
+Index: dom4j/src/java/org/dom4j/dom/DOMComment.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMComment.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMComment.java 2012-05-21 10:02:51.481930000 +0100
+@@ -13,7 +13,9 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -363,7 +375,7 @@ Torsten Werner
/**
* <p>
-@@ -187,6 +189,66 @@ public class DOMComment extends DefaultC
+@@ -187,6 +189,66 @@
throws DOMException {
DOMNodeHelper.replaceData(this, offset, count, arg);
}
@@ -430,9 +442,11 @@ Torsten Werner
}
/*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMNamespace.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMNamespace.java
-@@ -13,7 +13,9 @@ import org.dom4j.tree.DefaultNamespace;
+Index: dom4j/src/java/org/dom4j/dom/DOMNamespace.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMNamespace.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMNamespace.java 2012-05-21 10:02:51.481930000 +0100
+@@ -13,7 +13,9 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -442,7 +456,7 @@ Torsten Werner
/**
* <p>
-@@ -140,6 +142,66 @@ public class DOMNamespace extends Defaul
+@@ -140,6 +142,66 @@
public boolean hasAttributes() {
return DOMNodeHelper.hasAttributes(this);
}
@@ -509,9 +523,11 @@ Torsten Werner
}
/*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMDocument.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMDocument.java
-@@ -15,12 +15,15 @@ import org.dom4j.tree.DefaultDocument;
+Index: dom4j/src/java/org/dom4j/dom/DOMDocument.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMDocument.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMDocument.java 2012-05-21 10:02:51.481930000 +0100
+@@ -15,12 +15,15 @@
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
@@ -527,7 +543,7 @@ Torsten Werner
/**
* <p>
-@@ -301,6 +304,136 @@ public class DOMDocument extends Default
+@@ -301,6 +304,136 @@
return super.getDocumentFactory();
}
}
@@ -664,9 +680,11 @@ Torsten Werner
}
/*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMEntityReference.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMEntityReference.java
-@@ -13,7 +13,9 @@ import org.dom4j.tree.DefaultEntity;
+Index: dom4j/src/java/org/dom4j/dom/DOMEntityReference.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMEntityReference.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMEntityReference.java 2012-05-21 10:02:51.481930000 +0100
+@@ -13,7 +13,9 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -676,7 +694,7 @@ Torsten Werner
/**
* <p>
-@@ -166,6 +168,66 @@ public class DOMEntityReference extends
+@@ -166,6 +168,66 @@
public boolean hasAttributes() {
return DOMNodeHelper.hasAttributes(this);
}
@@ -743,9 +761,11 @@ Torsten Werner
}
/*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMText.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMText.java
-@@ -14,7 +14,9 @@ import org.dom4j.tree.DefaultText;
+Index: dom4j/src/java/org/dom4j/dom/DOMText.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMText.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMText.java 2012-05-21 10:02:51.481930000 +0100
+@@ -14,7 +14,9 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -755,7 +775,7 @@ Torsten Werner
/**
* <p>
-@@ -224,6 +226,81 @@ public class DOMText extends DefaultText
+@@ -224,6 +226,81 @@
protected Text createText(String text) {
return new DOMText(text);
}
@@ -837,9 +857,11 @@ Torsten Werner
}
/*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMCDATA.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMCDATA.java
-@@ -14,7 +14,10 @@ import org.dom4j.tree.DefaultCDATA;
+Index: dom4j/src/java/org/dom4j/dom/DOMCDATA.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMCDATA.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMCDATA.java 2012-05-21 10:02:51.481930000 +0100
+@@ -14,7 +14,10 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -850,7 +872,7 @@ Torsten Werner
/**
* <p>
-@@ -225,6 +228,81 @@ public class DOMCDATA extends DefaultCDA
+@@ -225,6 +228,81 @@
protected CDATA createCDATA(String text) {
return new DOMCDATA(text);
}
@@ -932,9 +954,11 @@ Torsten Werner
}
/*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMElement.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMElement.java
-@@ -16,11 +16,14 @@ import org.dom4j.Namespace;
+Index: dom4j/src/java/org/dom4j/dom/DOMElement.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMElement.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMElement.java 2012-05-21 10:02:51.481930000 +0100
+@@ -16,11 +16,14 @@
import org.dom4j.QName;
import org.dom4j.tree.DefaultElement;
@@ -949,7 +973,7 @@ Torsten Werner
/**
* <p>
-@@ -389,6 +392,86 @@ public class DOMElement extends DefaultE
+@@ -389,6 +392,86 @@
return getDocumentFactory().createQName(localName, prefix, namespace);
}
@@ -1036,9 +1060,11 @@ Torsten Werner
}
/*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/tree/NamespaceCache.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/tree/NamespaceCache.java
-@@ -26,42 +26,46 @@ import org.dom4j.Namespace;
+Index: dom4j/src/java/org/dom4j/tree/NamespaceCache.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/tree/NamespaceCache.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/tree/NamespaceCache.java 2012-05-21 10:02:51.481930000 +0100
+@@ -26,42 +26,46 @@
* @version $Revision: 1.15 $
*/
public class NamespaceCache {
@@ -1100,7 +1126,7 @@ Torsten Werner
}
}
}
-@@ -154,7 +158,7 @@ public class NamespaceCache {
+@@ -154,7 +158,7 @@
answer = (Map) cache.get(uri);
if (answer == null) {
@@ -1109,9 +1135,11 @@ Torsten Werner
cache.put(uri, answer);
}
}
---- dom4j-1.6.1+dfsg.2.orig/src/test/org/dom4j/xpath/MatrixConcatTest.java
-+++ dom4j-1.6.1+dfsg.2/src/test/org/dom4j/xpath/MatrixConcatTest.java
-@@ -33,9 +33,11 @@ public class MatrixConcatTest extends Ab
+Index: dom4j/src/test/org/dom4j/xpath/MatrixConcatTest.java
+===================================================================
+--- dom4j.orig/src/test/org/dom4j/xpath/MatrixConcatTest.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/test/org/dom4j/xpath/MatrixConcatTest.java 2012-05-21 10:02:51.481930000 +0100
+@@ -33,9 +33,11 @@
String[] exp2 = {"EQUITY_BAR_CF1", "EQUITY_BAR_CF2", "EQUITY_BAR_CF3"};
@@ -1123,8 +1151,10 @@ Torsten Werner
}
// Implementation methods
---- dom4j-1.6.1+dfsg.2.orig/xml/bean/gui.xml
-+++ dom4j-1.6.1+dfsg.2/xml/bean/gui.xml
+Index: dom4j/xml/bean/gui.xml
+===================================================================
+--- dom4j.orig/xml/bean/gui.xml 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/xml/bean/gui.xml 2012-05-21 10:02:51.481930000 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<widgets>
diff --git a/debian/patches/series b/debian/patches/series
index dc3043e..af59e60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
oldchanges.patch
+java7-compat.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dom4j.git
More information about the pkg-java-commits
mailing list