Merge lp:~ari-tczew/ubuntu/maverick/gnome-bluetooth/fix-632358 into lp:~rye/ubuntu/maverick/gnome-bluetooth/fix-632358

Proposed by Artur Rona
Status: Merged
Merged at revision: 46
Proposed branch: lp:~ari-tczew/ubuntu/maverick/gnome-bluetooth/fix-632358
Merge into: lp:~rye/ubuntu/maverick/gnome-bluetooth/fix-632358
Diff against target: 28 lines (+6/-4)
2 files modified
debian/changelog (+1/-1)
debian/patches/02_fix_plugin_info_structure.patch (+5/-3)
To merge this branch: bzr merge lp:~ari-tczew/ubuntu/maverick/gnome-bluetooth/fix-632358
Reviewer Review Type Date Requested Status
Roman Yepishev Approve
Review via email: mp+35306@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Roman Yepishev (rye) wrote :

Thank you very much!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-09-13 07:38:49 +0000
+++ debian/changelog 2010-09-13 16:58:41 +0000
@@ -1,7 +1,7 @@
1gnome-bluetooth (2.31.6-0ubuntu4) maverick; urgency=low1gnome-bluetooth (2.31.6-0ubuntu4) maverick; urgency=low
22
3 * debian/patches/02_fix_plugin_info_structure.patch:3 * debian/patches/02_fix_plugin_info_structure.patch:
4 - Fix broken plugin_info structure crashing nautilus-sendto (lp: #632358)4 - Fix broken plugin_info structure crashing nautilus-sendto (LP: #632358)
55
6 -- Roman Yepishev <roman.yepishev@canonical.com> Mon, 13 Sep 2010 10:37:14 +03006 -- Roman Yepishev <roman.yepishev@canonical.com> Mon, 13 Sep 2010 10:37:14 +0300
77
88
=== modified file 'debian/patches/02_fix_plugin_info_structure.patch'
--- debian/patches/02_fix_plugin_info_structure.patch 2010-09-13 07:38:49 +0000
+++ debian/patches/02_fix_plugin_info_structure.patch 2010-09-13 16:58:41 +0000
@@ -1,6 +1,8 @@
1# Description: fix plugin_info structure1From: Roman Yepishev <roman.yepishev@canonical.com>
2# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=6294532Description: Fix broken plugin_info structure crashing nautilus-sendto.
3# Ubuntu: https://launchpad.net/bugs/6323583Bug: https://launchpad.net/bugs/632358
4Bug: upstream, https://bugzilla.gnome.org/show_bug.cgi?id=629453
5Origin: upstream, http://git.gnome.org/browse/gnome-bluetooth/commit/?h=gnome-2-32&id=f471d694ddd48d4a1b5ccd0e59c6dd7d5234a55d
4diff -ruN gnome-bluetooth-2.31.6.orig//sendto/nautilus-sendto-plugin.c gnome-bluetooth-2.31.6/sendto/nautilus-sendto-plugin.c6diff -ruN gnome-bluetooth-2.31.6.orig//sendto/nautilus-sendto-plugin.c gnome-bluetooth-2.31.6/sendto/nautilus-sendto-plugin.c
5--- gnome-bluetooth-2.31.6.orig//sendto/nautilus-sendto-plugin.c 2010-08-04 14:38:01.000000000 +03007--- gnome-bluetooth-2.31.6.orig//sendto/nautilus-sendto-plugin.c 2010-08-04 14:38:01.000000000 +0300
6+++ gnome-bluetooth-2.31.6/sendto/nautilus-sendto-plugin.c 2010-09-12 22:40:35.318461172 +03008+++ gnome-bluetooth-2.31.6/sendto/nautilus-sendto-plugin.c 2010-09-12 22:40:35.318461172 +0300

Subscribers

People subscribed via source and target branches

to all changes: