diff -Nru gnome-vfs-2.24.4/debian/changelog gnome-vfs-2.24.4/debian/changelog --- gnome-vfs-2.24.4/debian/changelog 2016-07-15 02:13:34.000000000 +0000 +++ gnome-vfs-2.24.4/debian/changelog 2012-03-05 15:00:39.000000000 +0000 @@ -1,3 +1,16 @@ +gnome-vfs (1:2.24.4-6.1ubuntu2~0ppa1~focal) focal; urgency=medium + + * Upload for Focal + + -- Logix Thu, 05 Mar 2012 15:00:39 +0000 + +gnome-vfs (1:2.24.4-6.1ubuntu2~0ppa1~eoan3) eoan; urgency=medium + + * Upload for Eoan + * Disable doc generation as it fails to build with it + + -- Logix Thu, 22 Aug 2019 16:05:23 +0000 + gnome-vfs (1:2.24.4-6.1ubuntu2) yakkety; urgency=medium * Build-depend on libgnutls28-dev, since Debian never renamed to diff -Nru gnome-vfs-2.24.4/debian/control gnome-vfs-2.24.4/debian/control --- gnome-vfs-2.24.4/debian/control 2016-07-15 02:12:38.000000000 +0000 +++ gnome-vfs-2.24.4/debian/control 2012-03-05 15:00:39.000000000 +0000 @@ -1,5 +1,5 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gnome-vfs @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Josselin Mouette -Uploaders: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Josselin Mouette Build-Depends: cdbs, dh-autoreconf, gnome-common, diff -Nru gnome-vfs-2.24.4/debian/patches/gnutls-3.4.0.patch gnome-vfs-2.24.4/debian/patches/gnutls-3.4.0.patch --- gnome-vfs-2.24.4/debian/patches/gnutls-3.4.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-vfs-2.24.4/debian/patches/gnutls-3.4.0.patch 2012-03-05 15:00:39.000000000 +0000 @@ -0,0 +1,38 @@ +diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c +--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2010-02-09 14:16:14.000000000 +0200 ++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2015-04-14 00:01:51.272451668 +0300 +@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand + #endif + } + +-#ifdef HAVE_GNUTLS +-static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0}; +-static const int cipher_priority[] = +- {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC, +- GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0}; +-static const int comp_priority[] = +- {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0}; +-static const int kx_priority[] = +- {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0}; +-static const int mac_priority[] = +- {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0}; +- +-#endif +- +- + /** + * gnome_vfs_ssl_create_from_fd: + * @handle_return: pointer to a #GnomeVFSSSL struct, which will +@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS + gnutls_transport_set_ptr (ssl->private->tlsstate, + GINT_TO_POINTER (fd)); + +- gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority); +- gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority); +- gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority); +- gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority); +- gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority); ++ gnutls_set_default_priority (ssl->private->tlsstate); + + gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE, + ssl->private->xcred); diff -Nru gnome-vfs-2.24.4/debian/patches/gnutls-config.patch gnome-vfs-2.24.4/debian/patches/gnutls-config.patch --- gnome-vfs-2.24.4/debian/patches/gnutls-config.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-vfs-2.24.4/debian/patches/gnutls-config.patch 2012-03-05 15:00:39.000000000 +0000 @@ -0,0 +1,25 @@ +# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 +# Use pkg-config in place of gnutls own macro since it's not present anymore. +--- a/configure.in 2009-03-07 19:59:53.805507753 +0100 ++++ b/configure.in 2009-03-07 18:34:36.928169018 +0100 +@@ -686,14 +686,14 @@ + AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) + else + AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) +- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- have_ssl=true]) ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) ++ have_ssl=true]) + + if test "x${LIBGNUTLS_LIBS}" = "x"; then +- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) +- have_ssl=true], +- AC_MSG_ERROR([Unable to find GNUTLS])) ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) ++ AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) ++ have_ssl=true], ++ AC_MSG_ERROR([Unable to find GNUTLS])) + fi + fi + fi diff -Nru gnome-vfs-2.24.4/debian/patches/series gnome-vfs-2.24.4/debian/patches/series --- gnome-vfs-2.24.4/debian/patches/series 2016-02-18 08:56:12.000000000 +0000 +++ gnome-vfs-2.24.4/debian/patches/series 2012-03-05 15:00:39.000000000 +0000 @@ -28,3 +28,4 @@ gnutls3.patch gnutls_deprecated.diff bugzilla_automake_build.patch + diff -Nru gnome-vfs-2.24.4/debian/rules gnome-vfs-2.24.4/debian/rules --- gnome-vfs-2.24.4/debian/rules 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/rules 2012-03-05 15:00:39.000000000 +0000 @@ -20,7 +20,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc \ +DEB_CONFIGURE_EXTRA_FLAGS := --disable-gtk-doc \ --enable-gnutls \ --enable-avahi \ --disable-openssl \