Merge branch 'deb-src-release-2.8.5426'

Conflicts:
	resources/install/debian/control-src.tmpl

5 files changed, 13 insertions, 5 deletions

diff --git a/resources/install/debian/README.embedded-libraries b/resources/install/debian/README.embedded-libraries
index 446c890..d4457de 100644
--- a/resources/install/debian/README.embedded-libraries
+++ b/resources/install/debian/README.embedded-libraries
@@ -30,6 +30,7 @@ Reason: No Debian package.
 Smack is an Open Source XMPP (Jabber) client library.
 Reason: We contributed several patches on version 3.2.2 in order to fix a memory leak, added code that handles some currently unchecked, fixes for discovery info parsing, a pubsub parsing problem and the option to use a custom javax.net.ssl.TrustManager. All of those have been sent to the smack community for integration about a year ago, but haven’t been integrated since.
 And there’s no Debian package.
+ITP: https://bugs.debian.org/640873
 
 - jmyspell http://kenai.com/projects/jmyspell
 JMySpell is a 100% pure-Java implementation of the MySpell spell checker.
@@ -58,6 +59,7 @@ Reason: No Debian package.
 - swingworker
 Part of jdesktop.org JDNC project.
 Reason: No Debian package.
+ITP: https://bugs.debian.org/494018
 
 - irc-api https://code.google.com/p/irc-api/
 IRC-API is a state(ful)/(less), (a)synchronous IRC API written in Java.
diff --git a/resources/install/debian/changelog.tmpl b/resources/install/debian/changelog.tmpl
index 2f01b4a..54ef82c 100644
--- a/resources/install/debian/changelog.tmpl
+++ b/resources/install/debian/changelog.tmpl
@@ -1,6 +1,12 @@
 _PACKAGE_NAME_ (_VERSION_) unstable; urgency=low
 
   * Updates upstream.
+  * Adjust build-time deps for easier backporting. (Closes: #729904)
+  * Reuses already installed on the system spellcheck
+    ditionaries. (Closes: #719201)
+  * Fixes processing incoming xmpp ping error packets and showing
+    many stack traces in console. (Closes: #785299)
+  * Removes java6-runtime alternative. (Closes: #735904)
 
  -- Damian Minkov <damencho@jitsi.org>  _DATE_
 
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl
index dfb60f6..fdf1456 100644
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@@ -34,7 +34,7 @@ Build-Depends: debhelper (>= 9), javahelper,
                liblaf-widget-java,
                libhttpcore-java,
                libhttpmime-java,
-               libhttpclient-java,
+               libhttpclient-java (>= 4.2.1),
                libjson-simple-java (>= 1.1.1),
                libdbus-java,
                libeasymock-java,
@@ -62,7 +62,7 @@ Depends: ${misc:Depends},
          _PACKAGE_NAME_-common (= ${source:Version}),
          libjitsi (= ${libjitsi:version}),
          libjitsi-jni (= ${libjitsi:version}),
-         default-jre | java6-runtime,
+         default-jre,
          libunixsocket-java,
          libhttpcore-java,
          liblog4j1.2-java,
@@ -70,7 +70,7 @@ Depends: ${misc:Depends},
          libmac-widgets-java,
          libfelix-main-java,
          libfelix-framework-java,
-         libhttpclient-java,
+         libhttpclient-java (>= 4.2.1),
          libhttpmime-java,
          libcommons-logging-java,
          libcommons-codec-java,
diff --git a/resources/install/debian/control.tmpl b/resources/install/debian/control.tmpl
index 2f663b3..f717416 100644
--- a/resources/install/debian/control.tmpl
+++ b/resources/install/debian/control.tmpl
@@ -61,7 +61,7 @@ Standards-Version: 3.9.5
 
 Package: _PACKAGE_NAME_
 Architecture: i386 amd64
-Depends: default-jre | java6-runtime, libxss1
+Depends: default-jre, libxss1
 Description: VoIP and Instant Messaging client
  _APP_NAME_ is an application that allows you to do audio/video
  conversations over the Internet through the SIP and XMPP/Jabber protocol,
diff --git a/resources/install/debian/watch b/resources/install/debian/watch
index 6156d2a..2c195cc 100644
--- a/resources/install/debian/watch
+++ b/resources/install/debian/watch
@@ -1,2 +1,2 @@
 version=3
-https://download.jitsi.org/jitsi/nightly/debian-src jitsi_(.+).orig.tar.gz
+https://download.jitsi.org/jitsi/debian-src jitsi_(.+).orig.tar.gz