diffstat for gnutls28-3.5.19 gnutls28-3.5.19

 changelog |   16 +++++++++++++++-
 control   |    1 -
 rules     |    1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff -Nru gnutls28-3.5.19/debian/changelog gnutls28-3.5.19/debian/changelog
--- gnutls28-3.5.19/debian/changelog	2018-07-16 12:07:09.000000000 +0000
+++ gnutls28-3.5.19/debian/changelog	2018-09-07 02:23:43.000000000 +0000
@@ -1,3 +1,9 @@
+gnutls28 (3.5.19-1endless1) UNRELEASED; urgency=low
+
+  * Merge from Debian buster.
+
+ -- Merge-o-Matic <mom@endlessm.com>  Thu, 06 Sep 2018 19:23:43 -0700
+
 gnutls28 (3.5.19-1) unstable; urgency=low
 
   * New upstream version.
@@ -5,6 +11,15 @@
 
  -- Andreas Metzler <ametzler@debian.org>  Mon, 16 Jul 2018 14:07:09 +0200
 
+gnutls28 (3.5.18-1endless1) eos; urgency=medium
+
+  * Build with --with-included-unistring, Debian's libunistring package is
+    too old (non dual-licensed).
+    Restored this behaviour from Debian Stretch. It can be dropped once we
+    upgrade libunistring.
+
+ -- Daniel Drake <drake@endlessm.com>  Tue, 10 Apr 2018 15:14:50 -0600
+
 gnutls28 (3.5.18-1) unstable; urgency=medium
 
   * New upstream version.
@@ -3290,4 +3305,3 @@
 
  -- Ivo Timmermans <ivo@debian.org>  Fri, 31 Oct 2003 18:47:09 +0100
 
-
diff -Nru gnutls28-3.5.19/debian/control gnutls28-3.5.19/debian/control
--- gnutls28-3.5.19/debian/control	2018-07-16 11:44:24.000000000 +0000
+++ gnutls28-3.5.19/debian/control	2018-09-07 02:23:43.000000000 +0000
@@ -13,7 +13,6 @@
  autogen (>= 1:5.16-0), bison, dh-autoreconf, libcmocka-dev <!nocheck>,
  libgmp-dev (>= 2:6),
  libopts25-dev, automake (>= 1:1.12.2), libunbound-dev (>= 1.5.10-1),
- libunistring-dev (>= 0.9.7),
  net-tools [!kfreebsd-i386 !kfreebsd-amd64] <!nocheck>,
  freebsd-net-tools [kfreebsd-i386 kfreebsd-amd64] <!nocheck>,
  libssl-dev <!nocheck>, openssl <!nocheck>, softhsm2 <!nocheck>
diff -Nru gnutls28-3.5.19/debian/rules gnutls28-3.5.19/debian/rules
--- gnutls28-3.5.19/debian/rules	2018-07-16 11:44:24.000000000 +0000
+++ gnutls28-3.5.19/debian/rules	2018-09-07 02:23:43.000000000 +0000
@@ -28,6 +28,7 @@
 	--without-lzo \
 	--enable-libdane --without-tpm --disable-guile \
 	--enable-openssl-compatibility \
+    --with-included-unistring \
 	--disable-silent-rules \
 	--with-unbound-root-key-file=/usr/share/dns/root.key \
 	--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt \