diff -Nru gnote-0.8.2/debian/changelog gnote-0.8.2/debian/changelog --- gnote-0.8.2/debian/changelog 2012-01-22 01:14:52.000000000 +0530 +++ gnote-0.8.2/debian/changelog 2012-03-30 22:45:09.000000000 +0530 @@ -1,3 +1,10 @@ +gnote (0.8.2-1ubuntu2) precise; urgency=low + + * debian/patches/quit_applications_for_glib>=2.32.patch + - Fix quit application for glib >= 2.32 (LP: #930985) + + -- Vibhav Pant Fri, 30 Mar 2012 22:41:59 +0530 + gnote (0.8.2-1ubuntu1) precise; urgency=low * Merge from Debian testing (LP: #912407). diff -Nru gnote-0.8.2/debian/patches/quit_applications_for_glib>=2.32.patch gnote-0.8.2/debian/patches/quit_applications_for_glib>=2.32.patch --- gnote-0.8.2/debian/patches/quit_applications_for_glib>=2.32.patch 1970-01-01 05:30:00.000000000 +0530 +++ gnote-0.8.2/debian/patches/quit_applications_for_glib>=2.32.patch 2012-03-30 22:48:37.000000000 +0530 @@ -0,0 +1,46 @@ +Author: Vibhav Pant +Bug-Ubuntu: https://bugs.launchpad.net/bugs/930985 +Origin: https://bugzilla.gnome.org/attachment.cgi?id=209106 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=670104 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnote/+bug/930985 +Forwarded: no +Reviewed-By: Aurimas Černius +Last-Update: 2012-03-30 + +--- gnote-0.8.2.orig/configure.ac ++++ gnote-0.8.2/configure.ac +@@ -64,6 +64,11 @@ AC_LANG_COMPILER_REQUIRE + PKG_CHECK_MODULES(LIBGLIBMM, [glibmm-2.4]) + PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_VERSION]) + PKG_CHECK_MODULES(LIBGTKMM, [gtkmm-3.0 >= $LIBGTKMM_VERSION]) ++# Check for glib 2.32 or higher, which have certain incompatibilities with older ones ++PKG_CHECK_EXISTS(glib-2.0 >= 2.32, ++ [ ++ AC_DEFINE(HAVE_GLIB_2_32, 1, [Define to 1 if glib version is at least 2.32]) ++ ]) + PKG_CHECK_MODULES(LIBXML, [libxml-2.0]) + PKG_CHECK_MODULES(LIBXSLT, [libxslt]) + PKG_CHECK_MODULES(PCRE, [libpcrecpp]) +--- gnote-0.8.2.orig/src/gnote.cpp ++++ gnote-0.8.2/src/gnote.cpp +@@ -381,7 +381,11 @@ namespace gnote { + if(m_is_panel_applet) { + return; + } ++#ifdef HAVE_GLIB_2_32 ++ g_application_quit(G_APPLICATION(m_app)); ++#else + Gtk::Main::quit(); ++#endif + } + + void Gnote::on_preferences_response(int /*res*/) +@@ -638,7 +642,7 @@ namespace gnote { + else { + execute(remote); + } +- Gtk::Main::quit(); ++ Gnote::obj().on_quit_gnote_action(); + } + return 0; + } diff -Nru gnote-0.8.2/debian/patches/series gnote-0.8.2/debian/patches/series --- gnote-0.8.2/debian/patches/series 2012-01-22 01:12:46.000000000 +0530 +++ gnote-0.8.2/debian/patches/series 2012-03-30 22:45:31.000000000 +0530 @@ -1 +1,2 @@ missing_header.patch +quit_applications_for_glib>=2.32.patch