From 69c52092238ecb77de53779db1eb1f27e8938bba Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Tue, 16 Sep 2014 12:53:04 +0300
Subject: [PATCH] Closes several bugs reported on debian bug tracker.

---
 resources/install/debian/changelog.tmpl         |  7 ++++++-
 resources/install/debian/control-src.tmpl       |  2 ++
 resources/install/debian/patches/encoding.patch | 17 +++++++++++++++++
 resources/install/debian/patches/jdk8           | 12 ++++++++++++
 resources/install/debian/patches/series         |  2 ++
 src/native/build.xml                            |  2 ++
 6 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 resources/install/debian/patches/encoding.patch
 create mode 100644 resources/install/debian/patches/jdk8

diff --git a/resources/install/debian/changelog.tmpl b/resources/install/debian/changelog.tmpl
index 67f527e40..31d20b6f6 100644
--- a/resources/install/debian/changelog.tmpl
+++ b/resources/install/debian/changelog.tmpl
@@ -5,7 +5,12 @@ _PACKAGE_NAME_ (_VERSION_) unstable; urgency=low
   * Fixes BundleException: Unresolved constraint in bundle
     propertieseditor. (Closes: #736773)
   * Fixes commons lang missing felix manifests. (Closes: #736773)
-  * Removes gdata dependency. (Closes: #759835)
+  * Removes gdata dependency. Set encoding for javadoc to fix errors with
+    Java 7 (part of the patch in libjitsi as jsip has moved
+    there). (Closes: #759835, #748503)
+  * New version will be updated with bound to libavfilter5. (Closes: #760853)
+  * Added vcs links. (Closes: #754586)
+  * Fixes dependencies to build with jdk8. (Closes: #745090)
 
  -- Damian Minkov <damencho@jitsi.org>  _DATE_
 
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl
index 66c8a643f..660dafd73 100644
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@@ -51,6 +51,8 @@ Build-Depends: debhelper (>= 9), javahelper,
                libphonenumber6-java,
                libslf4j-java
 Standards-Version: 3.9.5
+Vcs-Git: git@github.com:jitsi/jitsi.git
+Vcs-Browser: https://github.com/jitsi/jitsi
 
 Package: _PACKAGE_NAME_
 Architecture: all
diff --git a/resources/install/debian/patches/encoding.patch b/resources/install/debian/patches/encoding.patch
new file mode 100644
index 000000000..09176fd39
--- /dev/null
+++ b/resources/install/debian/patches/encoding.patch
@@ -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}" />
diff --git a/resources/install/debian/patches/jdk8 b/resources/install/debian/patches/jdk8
new file mode 100644
index 000000000..005a5b307
--- /dev/null
+++ b/resources/install/debian/patches/jdk8
@@ -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.
diff --git a/resources/install/debian/patches/series b/resources/install/debian/patches/series
index 15ab6cf18..766160f3e 100644
--- a/resources/install/debian/patches/series
+++ b/resources/install/debian/patches/series
@@ -1,3 +1,5 @@
 bcprov-upgrade-1.48
 remove-dns-java-logger.patch
 removes-gdata-deps
+encoding.patch
+jdk8
diff --git a/src/native/build.xml b/src/native/build.xml
index 1ae9bf296..1743f0155 100644
--- a/src/native/build.xml
+++ b/src/native/build.xml
@@ -597,6 +597,8 @@
 
                 <compilerarg value="-I${system.JAVA_HOME}/include"
                              if="is.running.linux" />
+                <compilerarg value="-I${system.JAVA_HOME}/include/linux"
+                             if="is.running.linux" />
 
                 <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
                 <linkerarg value="-shared"/>