I have just made an NMU of trang to fix the long standing RC bugs.
Please find attached the diff of the NMU.
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' [EMAIL PROTECTED] | [EMAIL PROTECTED]
`- people.debian.org/~aurel32 | www.aurel32.net
diff -u trang-20030619/debian/changelog trang-20030619/debian/changelog
--- trang-20030619/debian/changelog
+++ trang-20030619/debian/changelog
@@ -1,3 +1,11 @@
+trang (20030619-5.2) unstable; urgency=low
+
+ * NMU from the Zürich BSP.
+ * Add patch from Ken Bloom to fix FTBFS. (Closes: #424444).
+ * Rebuild with GCJ 4.2. (Closes: #422574).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 13 Jan 2008 00:12:54 +0100
+
trang (20030619-5.1) unstable; urgency=low
* NMU to rebuilt with GCJ 4.1.
--- trang-20030619.orig/src/com/thaiopensource/relaxng/output/xsd/PrefixManager.java
+++ trang-20030619/src/com/thaiopensource/relaxng/output/xsd/PrefixManager.java
@@ -49,8 +49,8 @@
si.getGrammar().componentsAccept(this);
Context context = si.getGrammar().getContext();
if (context != null) {
- for (Enumeration enum = context.prefixes(); enum.hasMoreElements();) {
- String prefix = (String)enum.nextElement();
+ for (Enumeration enum_ = context.prefixes(); enum_.hasMoreElements();) {
+ String prefix = (String)enum_.nextElement();
if (!prefix.equals(""))
notePrefix(prefix, resolveNamespace(context.resolveNamespacePrefix(prefix)));
}
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/relaxng/output/xsd/NamespaceManager.java
+++ trang-20030619/src/com/thaiopensource/relaxng/output/xsd/NamespaceManager.java
@@ -180,7 +180,7 @@
(NamespaceUsage)best.getValue())
// avoid output depending on order of hash table iteration
|| (tem.getValue().equals(best.getValue())
- && ((String)tem.getKey()).compareTo(best.getKey()) < 0))
+ && ((String)tem.getKey()).compareTo((String)best.getKey()) < 0))
best = tem;
}
namespaceUsageMap.clear();
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/relaxng/output/rng/Analyzer.java
+++ trang-20030619/src/com/thaiopensource/relaxng/output/rng/Analyzer.java
@@ -208,8 +208,8 @@
if (context == null || context == lastContext)
return;
lastContext = context;
- for (Enumeration enum = context.prefixes(); enum.hasMoreElements();) {
- String prefix = (String)enum.nextElement();
+ for (Enumeration enum_ = context.prefixes(); enum_.hasMoreElements();) {
+ String prefix = (String)enum_.nextElement();
noteNs(prefix, context.resolveNamespacePrefix(prefix));
}
}
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/relaxng/parse/compact/CompactSyntax.java
+++ trang-20030619/src/com/thaiopensource/relaxng/parse/compact/CompactSyntax.java
@@ -3448,8 +3448,8 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement());
+ for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
+ int[] oldentry = (int[])(enum_.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
