diff -Nru libgpod-0.8.3/debian/changelog libgpod-0.8.3/debian/changelog --- libgpod-0.8.3/debian/changelog 2015-12-20 18:14:45.000000000 +0100 +++ libgpod-0.8.3/debian/changelog 2016-01-29 18:20:01.000000000 +0100 @@ -1,3 +1,11 @@ +libgpod (0.8.3-5ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Port-libgpod-sharp-to-gtk-3-and-glib-3.patch: use gtk-sharp-2.0 + instead of gtk-sharp-3.0 (in universe). + + -- Gianfranco Costamagna Fri, 29 Jan 2016 18:19:00 +0100 + libgpod (0.8.3-5) unstable; urgency=medium * [4af2b06] Refresh list of mono architectures (Closes: #808497) @@ -7,6 +15,58 @@ -- Chow Loong Jin Mon, 21 Dec 2015 01:14:42 +0800 +libgpod (0.8.3-4ubuntu8) xenial; urgency=medium + + * debian/patches/build-with-swing.patch: + - import patch from fedora to fix swing issue + + -- Sebastien Bacher Thu, 19 Nov 2015 16:36:10 +0100 + +libgpod (0.8.3-4ubuntu7) xenial; urgency=medium + + * Rebuild with the new libimobiledevice soname + + -- Sebastien Bacher Thu, 19 Nov 2015 16:28:26 +0100 + +libgpod (0.8.3-4ubuntu6) wily; urgency=medium + + * No change rebuild for the new libplist soname + + -- Sebastien Bacher Thu, 23 Jul 2015 18:30:02 +0200 + +libgpod (0.8.3-4ubuntu5) vivid; urgency=medium + + * No change rebuild to get debug symbol packages for all architectures. + + -- Brian Murray Mon, 01 Dec 2014 09:33:04 -0800 + +libgpod (0.8.3-4ubuntu4) utopic; urgency=high + + * No change rebuild against plist2. + + -- Dimitri John Ledkov Mon, 28 Apr 2014 02:22:48 +0100 + +libgpod (0.8.3-4ubuntu3) trusty; urgency=low + + * [42a13ec] Revert gtk/glib#3 port. Banshee is the only rdepends, and it needs + the gtk#2/glib#2 one. + + -- Chow Loong Jin Mon, 10 Feb 2014 00:28:22 +0800 + +libgpod (0.8.3-4ubuntu2) trusty; urgency=medium + + * Build mono packages for ppc64el. + + -- Matthias Klose Sat, 18 Jan 2014 13:31:12 +0100 + +libgpod (0.8.3-4ubuntu1) trusty; urgency=low + + * [ac0a5fb] Merge from Debian Experimental, remaining changes (LP: #1265371): + - debian/control: + + Add armhf support to get libgpod-cil-dev back. + + -- Chow Loong Jin Thu, 02 Jan 2014 04:39:31 +0800 + libgpod (0.8.3-4) experimental; urgency=low * [2a24768] Patch to disambiguate DateTime class usage @@ -31,6 +91,16 @@ -- Chow Loong Jin Sun, 24 Nov 2013 22:34:03 +0800 +libgpod (0.8.3-1.1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. (LP: #1259706) Remaining changes: + - debian/control: + + Add armhf support to get libgpod-cil-dev back. + * d/p/70_adjust-to-latest-libimobiledevice-API-changes.patch: + - Dropped, fixed upstream. + + -- Artur Rona Fri, 22 Nov 2013 01:06:08 +0100 + libgpod (0.8.3-1.1) unstable; urgency=low * Non-maintainer upload @@ -49,6 +119,32 @@ -- Chow Loong Jin Thu, 31 Oct 2013 02:19:22 +0800 +libgpod (0.8.2-7ubuntu4) saucy; urgency=low + + * 70_adjust-to-latest-libimobiledevice-API-changes.patch: correctly + initialize a variable to avoid a segfault (lp: #1221031) + + -- Sebastien Bacher Mon, 21 Oct 2013 18:09:43 -0400 + +libgpod (0.8.2-7ubuntu3) saucy; urgency=low + + * New patch, 70_adjust-to-latest-libimobiledevice-API-changes, cherry-pick + e620b2f from upsteam to fix breakage with libimobiledevice 1.1.5. + + -- Loïc Minier Mon, 02 Sep 2013 10:24:40 +0200 + +libgpod (0.8.2-7ubuntu2) saucy; urgency=low + + * No-change rebuild against latest libimobiledevice + + -- Jeremy Bicha Thu, 08 Aug 2013 12:16:14 -0400 + +libgpod (0.8.2-7ubuntu1) raring; urgency=low + + * Add armhf support to debian/control to get libgpod-cil-dev back. + + -- Adam Conrad Tue, 06 Nov 2012 11:19:41 -0700 + libgpod (0.8.2-7) unstable; urgency=low * [1c86366] Make -cil packages non-arch-all (Closes: #689054) diff -Nru libgpod-0.8.3/debian/control libgpod-0.8.3/debian/control --- libgpod-0.8.3/debian/control 2015-12-20 18:14:45.000000000 +0100 +++ libgpod-0.8.3/debian/control 2016-01-29 18:15:13.000000000 +0100 @@ -1,7 +1,8 @@ Source: libgpod Priority: optional Section: libs -Maintainer: gtkpod Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: gtkpod Maintainers Uploaders: Chow Loong Jin Build-Depends: debhelper (>= 9), dh-autoreconf, diff -Nru libgpod-0.8.3/debian/patches/Port-libgpod-sharp-to-gtk-3-and-glib-3.patch libgpod-0.8.3/debian/patches/Port-libgpod-sharp-to-gtk-3-and-glib-3.patch --- libgpod-0.8.3/debian/patches/Port-libgpod-sharp-to-gtk-3-and-glib-3.patch 2015-12-20 18:14:45.000000000 +0100 +++ libgpod-0.8.3/debian/patches/Port-libgpod-sharp-to-gtk-3-and-glib-3.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -From: Chow Loong Jin -Date: Sun, 24 Nov 2013 05:35:22 +0800 -Subject: Port libgpod-sharp to gtk#3 and glib#3 - ---- - bindings/mono/libgpod-sharp/libgpod-sharp.pc.in | 2 +- - m4/mono.m4 | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bindings/mono/libgpod-sharp/libgpod-sharp.pc.in b/bindings/mono/libgpod-sharp/libgpod-sharp.pc.in -index e0b6292..8aaec77 100644 ---- a/bindings/mono/libgpod-sharp/libgpod-sharp.pc.in -+++ b/bindings/mono/libgpod-sharp/libgpod-sharp.pc.in -@@ -4,5 +4,5 @@ Name: libgpod-sharp - Description: libgpod-sharp - Version: 0.1 - --Requires: glib-sharp-2.0 gtk-sharp-2.0 -+Requires: glib-sharp-3.0 gtk-sharp-3.0 - Libs: -r:${Libraries} -diff --git a/m4/mono.m4 b/m4/mono.m4 -index 3603108..e3200b0 100644 ---- a/m4/mono.m4 -+++ b/m4/mono.m4 -@@ -58,11 +58,11 @@ AC_DEFUN([CHECK_GLIB_GTK_SHARP], - [ - found_gtksharp="yes" - PKG_CHECK_MODULES(GDKSHARP, -- gtk-sharp-2.0 >= $GTK_SHARP_MIN_VERSION, [], found_gtksharp="no") -+ gtk-sharp-3.0 >= $GTK_SHARP_MIN_VERSION, [], found_gtksharp="no") - AC_SUBST(GDKSHARP_LIBS) - - PKG_CHECK_MODULES(GLIBSHARP, -- glib-sharp-2.0 >= $GTK_SHARP_MIN_VERSION, [], found_gtksharp="no") -+ glib-sharp-3.0 >= $GTK_SHARP_MIN_VERSION, [], found_gtksharp="no") - AC_SUBST(GLIBSHARP_LIBS) - if test "X$found_gtksharp" != "Xyes"; then - if test "X$with_mono" = "Xyes"; then diff -Nru libgpod-0.8.3/debian/patches/series libgpod-0.8.3/debian/patches/series --- libgpod-0.8.3/debian/patches/series 2015-12-20 18:14:45.000000000 +0100 +++ libgpod-0.8.3/debian/patches/series 2016-01-29 18:14:56.000000000 +0100 @@ -1,6 +1,5 @@ Fix-FTBSD-on-kfreeBSD.patch Avoid-that-xsltproc-tries-to-use-an-internet-connect.patch Upstream-change-to-speed-up-itdb_resolve_path-calls.patch -Port-libgpod-sharp-to-gtk-3-and-glib-3.patch Fix-System-GLib.DateTime-ambiguity.patch Fix-wrong-char-for-comments-in-gpod.i.patch