Package: xnap
Version: 2.5-pre3-2
Severity: serious
Tags: patch
When building 'xnap' on amd64/unstable, I get the following error:
dh_testdir
/usr/bin/make jar
make[1]: Entering directory `/xnap-2.5-pre3'
rm -rf /tmp/root/xnap
mkdir -p /tmp/root/xnap
jikes -classpath
.:lib/java_readline.jar:lib/jd3lib.jar:lib/gnu.getopt.jar:lib/kunststoff.jar:lib/libxnap.jar:lib/log4j.jar:lib/xnap-ziga.jar:
+D +P +F -d /tmp/root/xnap xnap/XNap.java xnap/XNapLoader.java
xnap/plugin/nap/Plugin.java xnap/plugin/nap/GUIPlugin.java
xnap/plugin/viewer/image/Plugin.java xnap/plugin/viewer/mp3/Plugin.java
xnap/plugin/viewer/text/Plugin.java xnap/plugin/viewer/video/Plugin.java
make[1]: *** [jar] Segmentation fault
make[1]: Leaving directory `/xnap-2.5-pre3'
make: *** [build-stamp] Error 2
With the attached patch 'xnap' can be compiled on amd64.
Regards
Andreas Jochens
diff -urN ../tmp-orig/xnap-2.5-pre3/Makefile ./Makefile
--- ../tmp-orig/xnap-2.5-pre3/Makefile 2003-10-25 23:00:54.000000000 +0000
+++ ./Makefile 2006-11-02 12:29:23.000000000 +0000
@@ -15,10 +15,10 @@
#PLUGINS += gnutella
MAKE = make
-JAVAC = jikes
-JAVAC_OPTS = -classpath $(CP) +D +P +F
-#JAVAC = javac
-#JAVAC_OPTS = -classpath $(CP)
+#JAVAC = jikes
+#JAVAC_OPTS = -classpath $(CP) +D +P +F
+JAVAC = javac
+JAVAC_OPTS = -classpath $(CP)
JAR = jar
JRE = java
JDB = jdb
diff -urN ../tmp-orig/xnap-2.5-pre3/debian/control ./debian/control
--- ../tmp-orig/xnap-2.5-pre3/debian/control 2003-10-27 23:19:27.000000000
+0000
+++ ./debian/control 2006-11-02 13:05:14.000000000 +0000
@@ -1,8 +1,8 @@
Source: xnap
-Section: contrib/net
+Section: net
Priority: optional
Maintainer: Yven Johannes Leist <[EMAIL PROTECTED]>
-Build-Depends-Indep: docbook-to-man, jikes, debhelper (>> 3.0.0)
+Build-Depends-Indep: debhelper, unzip, docbook-to-man, java-gcj-compat-dev
Standards-Version: 3.6.1
Package: xnap
diff -urN ../tmp-orig/xnap-2.5-pre3/xnap/gui/FeedbackDialog.java
./xnap/gui/FeedbackDialog.java
--- ../tmp-orig/xnap-2.5-pre3/xnap/gui/FeedbackDialog.java 2002-12-02
05:52:43.000000000 +0000
+++ ./xnap/gui/FeedbackDialog.java 2006-11-02 12:58:32.000000000 +0000
@@ -90,7 +90,7 @@
GridBagHelper.addLabel(jpText, "");
String s = XNap.tr("Include error.log") + " (" +
- Formatter.formatSize(Debug.getErrorFileSize()) + ")";
+ xnap.util.Formatter.formatSize(Debug.getErrorFileSize()) + ")";
jcbIncErrorLog = new JCheckBox(s, (Debug.getErrorFileSize() > 0));
GridBagHelper.add(jpText, jcbIncErrorLog);
diff -urN ../tmp-orig/xnap-2.5-pre3/xnap/gui/LibraryPanel.java
./xnap/gui/LibraryPanel.java
--- ../tmp-orig/xnap-2.5-pre3/xnap/gui/LibraryPanel.java 2003-10-06
11:12:39.000000000 +0000
+++ ./xnap/gui/LibraryPanel.java 2006-11-02 12:57:44.000000000 +0000
@@ -744,11 +744,11 @@
// nothing is selected
sb.append(ltm.getRowCount());
sb.append(" files - ");
- sb.append(Formatter.formatSize(ltm.getTotalSize()));
+
sb.append(xnap.util.Formatter.formatSize(ltm.getTotalSize()));
}
else if (files.length == 1) {
sb.append("1 file - ");
- sb.append(Formatter.formatNumber(files[0].length()) + "
bytes");
+
sb.append(xnap.util.Formatter.formatNumber(files[0].length()) + " bytes");
}
else {
long totalSize = 0;
@@ -758,7 +758,7 @@
sb.append("selected - ");
sb.append(files.length);
sb.append(" files - ");
- sb.append(Formatter.formatSize(totalSize));
+ sb.append(xnap.util.Formatter.formatSize(totalSize));
}
// FIX: we need some kind of padding
diff -urN ../tmp-orig/xnap-2.5-pre3/xnap/io/MP3File.java ./xnap/io/MP3File.java
--- ../tmp-orig/xnap-2.5-pre3/xnap/io/MP3File.java 2002-11-03
23:10:27.000000000 +0000
+++ ./xnap/io/MP3File.java 2006-11-02 12:59:16.000000000 +0000
@@ -120,7 +120,7 @@
public String getInfo()
{
- return getBitrate() + " bit, " +
Formatter.formatLength(getPlayingTime());
+ return getBitrate() + " bit, " +
xnap.util.Formatter.formatLength(getPlayingTime());
}
}
diff -urN ../tmp-orig/xnap-2.5-pre3/xnap/io/VideoFile.java
./xnap/io/VideoFile.java
--- ../tmp-orig/xnap-2.5-pre3/xnap/io/VideoFile.java 2002-12-02
17:52:34.000000000 +0000
+++ ./xnap/io/VideoFile.java 2006-11-02 12:59:01.000000000 +0000
@@ -137,7 +137,7 @@
public String getInfo()
{
- return Formatter.formatLength(getLength());
+ return xnap.util.Formatter.formatLength(getLength());
}
public int getLength()
diff -urN ../tmp-orig/xnap-2.5-pre3/xnap/plugin/PluginManager.java
./xnap/plugin/PluginManager.java
--- ../tmp-orig/xnap-2.5-pre3/xnap/plugin/PluginManager.java 2003-01-13
20:38:26.000000000 +0000
+++ ./xnap/plugin/PluginManager.java 2006-11-02 12:57:16.000000000 +0000
@@ -314,9 +314,9 @@
sb.append(plugins[i].getClass().getName());
table[i] = sb.toString();
}
- int L = Formatter.LEFT;
+ int L = xnap.util.Formatter.LEFT;
int[] cols = new int[] { L, L, L };
- console.println(Formatter.formatTable(table, cols));
+ console.println(xnap.util.Formatter.formatTable(table, cols));
}
return true;
diff -urN ../tmp-orig/xnap-2.5-pre3/xnap/plugin/nap/Plugin.java
./xnap/plugin/nap/Plugin.java
--- ../tmp-orig/xnap-2.5-pre3/xnap/plugin/nap/Plugin.java 2003-01-13
20:39:22.000000000 +0000
+++ ./xnap/plugin/nap/Plugin.java 2006-11-02 12:56:19.000000000 +0000
@@ -269,14 +269,14 @@
sb.append("|" + servers[i].getUserCount() + " users");
sb.append("|" + servers[i].getFileCount() + " files");
int s = servers[i].getFileSize();
- sb.append("|" + Formatter.formatSize(s) + " shared");
+ sb.append("|" + xnap.util.Formatter.formatSize(s) + "
shared");
}
table[i] = sb.toString();
}
- int L = Formatter.LEFT;
- int R = Formatter.RIGHT;
+ int L = xnap.util.Formatter.LEFT;
+ int R = xnap.util.Formatter.RIGHT;
int[] cols = new int[] { R, L, L, L, R, R, R };
- console.println(Formatter.formatTable(table, cols));
+ console.println(xnap.util.Formatter.formatTable(table, cols));
}
return true;
diff -urN ../tmp-orig/xnap-2.5-pre3/xnap/plugin/nap/util/Connector.java
./xnap/plugin/nap/util/Connector.java
--- ../tmp-orig/xnap-2.5-pre3/xnap/plugin/nap/util/Connector.java
2003-05-06 15:24:13.000000000 +0000
+++ ./xnap/plugin/nap/util/Connector.java 2006-11-02 12:56:51.000000000
+0000
@@ -593,10 +593,10 @@
String oldValue = stats;
// gb -> byte
fileSize = fileSize * 1024 * 1024 * 1024;
- stats = (Formatter.formatNumber(connectedCount) + " " +
XNap.tr("Servers") + " / "
- + Formatter.formatNumber(userCount) + " " + XNap.tr("Users")+"
/ "
- + Formatter.formatNumber(fileCount) + " " + XNap.tr("Files") +
" / "
- + Formatter.formatSize(fileSize) + " " + XNap.tr("Shared"));
+ stats = (xnap.util.Formatter.formatNumber(connectedCount) + " " +
XNap.tr("Servers") + " / "
+ + xnap.util.Formatter.formatNumber(userCount) + " " +
XNap.tr("Users")+" / "
+ + xnap.util.Formatter.formatNumber(fileCount) + " " +
XNap.tr("Files") + " / "
+ + xnap.util.Formatter.formatSize(fileSize) + " " +
XNap.tr("Shared"));
setStats(stats);
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
