mirror of https://github.com/sipwise/jitsi.git
parent
d2b0603a5a
commit
69c5209223
@ -0,0 +1,17 @@
|
||||
Description: Set encoding for javadoc to fix errors with Java 7
|
||||
Author: Colin Watson <cjwatson@ubuntu.com>
|
||||
Bug-Debian: https://bugs.debian.org/759835
|
||||
Forwarded: no
|
||||
Last-Update: 2014-09-05
|
||||
|
||||
--- jitsi.orig/lib/src/swingworker/build.xml
|
||||
+++ jitsi/lib/src/swingworker/build.xml
|
||||
@@ -63,7 +63,7 @@ reserved. Use is subject to license term
|
||||
<javadoc access="protected" link=""
|
||||
packagenames="org.jdesktop.swingworker" author="true" destdir="${javadoc.dir}"
|
||||
nodeprecated="false" nodeprecatedlist="false" noindex="false"
|
||||
- nonavbar="false" notree="false" use="true" version="true">
|
||||
+ nonavbar="false" notree="false" use="true" version="true" encoding="iso-8859-1">
|
||||
<link href="${external.doc}" />
|
||||
<sourcepath>
|
||||
<pathelement path="${src.dir}" />
|
||||
@ -0,0 +1,12 @@
|
||||
Index: jitsi/lib/src/java-jml/src/net/sf/jml/message/p2p/MsnFileContextParser.java
|
||||
===================================================================
|
||||
--- jitsi.orig/lib/src/java-jml/src/net/sf/jml/message/p2p/MsnFileContextParser.java
|
||||
+++ jitsi/lib/src/java-jml/src/net/sf/jml/message/p2p/MsnFileContextParser.java
|
||||
@@ -18,6 +18,7 @@ package net.sf.jml.message.p2p;
|
||||
import java.io.*;
|
||||
import java.util.*;
|
||||
import net.sf.jml.util.*;
|
||||
+import net.sf.jml.util.Base64; // disambiguation
|
||||
|
||||
/**
|
||||
* Parses context of incoming filerequests. Extracts filename and filesize.
|
||||
@ -1,3 +1,5 @@
|
||||
bcprov-upgrade-1.48
|
||||
remove-dns-java-logger.patch
|
||||
removes-gdata-deps
|
||||
encoding.patch
|
||||
jdk8
|
||||
|
||||
Loading…
Reference in new issue