On Sun, Nov 16, 2014 at 03:48:04PM +0000, Jonathan Wiltshire wrote: > > Given the changes are small, seem to match the freeze policy, and > > can anyway be reverted later if needed: if I were you, I would > > skip the pre-approval procedure, upload to sid and then ping this > > bug to avoid more round-trips.
I updated the changelog message as suggested and uploaded the package, here's the debdiff. Thanks, Berto
diff -Nru grilo-plugins-0.2.13/debian/changelog grilo-plugins-0.2.13/debian/changelog --- grilo-plugins-0.2.13/debian/changelog 2014-08-27 14:48:24.000000000 +0300 +++ grilo-plugins-0.2.13/debian/changelog 2014-11-16 17:58:56.000000000 +0200 @@ -1,3 +1,15 @@ +grilo-plugins (0.2.13-2) unstable; urgency=medium + + * debian/control: + - Add build dependency on librest-dev, needed by the Pocket + plugin. This has been working so far because librest-dev is also + a dependency of libgoa-1.0-dev, but we should not rely on that. + - Make grilo-plugins recommend dleyna-server (Closes: #765986). + * fix-dleyna-crash.patch: + - Fix crash due to variable redefinition (Closes: #769357). + + -- Alberto Garcia <[email protected]> Sun, 16 Nov 2014 17:58:49 +0200 + grilo-plugins (0.2.13-1) unstable; urgency=medium * New upstream release (Closes: #750038). diff -Nru grilo-plugins-0.2.13/debian/control grilo-plugins-0.2.13/debian/control --- grilo-plugins-0.2.13/debian/control 2014-08-27 14:48:24.000000000 +0300 +++ grilo-plugins-0.2.13/debian/control 2014-11-16 17:58:56.000000000 +0200 @@ -10,6 +10,7 @@ yelp-tools, python-dbusmock, libarchive-dev, + librest-dev (>= 0.7.90), libglib2.0-dev (>= 2.36), libgrilo-0.2-dev (>= 0.2.11), libxml2-dev, @@ -36,6 +37,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: dleyna-server Description: Framework for discovering and browsing media - Plugins Grilo is a framework focused on making media discovery and browsing easy for application developers. diff -Nru grilo-plugins-0.2.13/debian/patches/fix-dleyna-crash.patch grilo-plugins-0.2.13/debian/patches/fix-dleyna-crash.patch --- grilo-plugins-0.2.13/debian/patches/fix-dleyna-crash.patch 1970-01-01 02:00:00.000000000 +0200 +++ grilo-plugins-0.2.13/debian/patches/fix-dleyna-crash.patch 2014-11-16 17:58:56.000000000 +0200 @@ -0,0 +1,16 @@ +From: Juan A. Suarez Romero <[email protected]> +Subject: Remove variable redefinition +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=740052 +Bug-Debian: https://bugs.debian.org/769357 +Index: grilo-plugins/src/dleyna/grl-dleyna-utils.c +=================================================================== +--- grilo-plugins.orig/src/dleyna/grl-dleyna-utils.c ++++ grilo-plugins/src/dleyna/grl-dleyna-utils.c +@@ -213,7 +213,6 @@ is_our_user_ipv6 (struct sockaddr_in6 *a + + status = g_io_channel_read_line (file, &line, NULL, NULL, NULL); + while (status == G_IO_STATUS_NORMAL) { +- char *line; + int j, k, l; + /* 4*8 for IP, 4 for port, 1 for :, 1 for NUL */ + char buffer[4*8 + 4 + 1 + 1]; diff -Nru grilo-plugins-0.2.13/debian/patches/series grilo-plugins-0.2.13/debian/patches/series --- grilo-plugins-0.2.13/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ grilo-plugins-0.2.13/debian/patches/series 2014-11-16 17:58:56.000000000 +0200 @@ -0,0 +1 @@ +fix-dleyna-crash.patch
