diff -Nru ristretto-0.8.2/debian/changelog ristretto-0.8.2/debian/changelog --- ristretto-0.8.2/debian/changelog 2017-02-10 13:36:45.000000000 +0000 +++ ristretto-0.8.2/debian/changelog 2018-04-09 04:21:37.000000000 +0000 @@ -1,3 +1,10 @@ +ristretto (0.8.2-1ubuntu1) devel; urgency=medium + + * d/p/lp1762242.patch: (LP: #1762242) + - Add an upstream commit to fix loading of bmp files. + + -- Unit 193 Mon, 09 Apr 2018 00:21:37 -0400 + ristretto (0.8.2-1) unstable; urgency=medium * New upstream bugfix release. diff -Nru ristretto-0.8.2/debian/control ristretto-0.8.2/debian/control --- ristretto-0.8.2/debian/control 2017-02-10 13:27:00.000000000 +0000 +++ ristretto-0.8.2/debian/control 2018-04-09 04:21:37.000000000 +0000 @@ -1,7 +1,8 @@ Source: ristretto Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 9), diff -Nru ristretto-0.8.2/debian/patches/lp1762242.patch ristretto-0.8.2/debian/patches/lp1762242.patch --- ristretto-0.8.2/debian/patches/lp1762242.patch 1970-01-01 00:00:00.000000000 +0000 +++ ristretto-0.8.2/debian/patches/lp1762242.patch 2018-04-09 04:21:37.000000000 +0000 @@ -0,0 +1,28 @@ +From 751834055dfc8831bfe06ed5e493c69b8347668a Mon Sep 17 00:00:00 2001 +From: Igor +Date: Wed, 7 Jun 2017 15:27:42 -0400 +Subject: Fix BMP files failing to load with libmagic + +Fixes https://bugzilla.xfce.org/show_bug.cgi?id=13489 +--- + src/file.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +Index: ristretto-0.8.2/src/file.c +=================================================================== +--- ristretto-0.8.2.orig/src/file.c ++++ ristretto-0.8.2/src/file.c +@@ -411,6 +411,13 @@ rstto_file_get_content_type ( RsttoFile + content_type = magic_file(magic, rstto_file_get_path(r_file)); + if ( NULL != content_type ) + { ++ /* "image/x-ms-bmp" isn't supported by gdk_pixbuf_loader_new_with_mime_type () ++ see https://bugzilla.xfce.org/show_bug.cgi?id=13489 */ ++ if ( g_strcmp0 (content_type, "image/x-ms-bmp") == 0 ) ++ { ++ content_type = "image/bmp"; ++ } ++ + r_file->priv->content_type = g_strdup (content_type); + } + } diff -Nru ristretto-0.8.2/debian/patches/series ristretto-0.8.2/debian/patches/series --- ristretto-0.8.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ristretto-0.8.2/debian/patches/series 2018-04-09 04:21:37.000000000 +0000 @@ -0,0 +1,2 @@ +lp1762242.patch +