The following commit has been merged in the master branch: commit 8fc03e839d525420df79ec42d2725a071a79d872 Author: Vincent Legout <vinc...@legout.info> Date: Thu Jun 9 19:54:57 2011 +0200
Drop patches diff --git a/debian/changelog b/debian/changelog index aa4c91e..b6af31d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,14 @@ -quarry (0.2.0.dfsg.1-5) UNRELEASED; urgency=low +quarry (0.3.0.1-1) UNRELEASED; urgency=low + * New upstream version (lp: #311086, #273557) * debian/control: - Update Standards-Version to 3.9.1. No changes needed - Add yelp in Suggests * debian/rules: - Use --with autotools_dev to refresh config.guess and config.sub - Enable scrollkeeper (and add scrollkeeper in Build-Depends) - * Add debian/patches/03_close_about_dialog.patch (lp: #311086) - * Add debian/patches/04_use_x-www-browser.patch (lp: #273557) - -- Vincent Legout <vinc...@legout.info> Tue, 08 Feb 2011 12:49:39 +0100 + -- Vincent Legout <vinc...@legout.info> Thu, 09 Jun 2011 19:53:16 +0200 quarry (0.2.0.dfsg.1-4) unstable; urgency=low diff --git a/debian/patches/03_close_about_dialog.patch b/debian/patches/03_close_about_dialog.patch deleted file mode 100644 index c631841..0000000 --- a/debian/patches/03_close_about_dialog.patch +++ /dev/null @@ -1,48 +0,0 @@ -Description: Close the about dialog when pressing the close button -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/quarry/+bug/311086 -Forwarded: no -Author: Damir Sultanbekov -Reviewed-by: Vincent Legout <vinc...@legout.info> - -Index: quarry/src/gui-gtk/gtk-goban-window.c -=================================================================== ---- quarry.orig/src/gui-gtk/gtk-goban-window.c 2011-02-08 13:32:08.423645725 +0100 -+++ quarry/src/gui-gtk/gtk-goban-window.c 2011-02-08 13:35:47.187303538 +0100 -@@ -2471,7 +2471,6 @@ - static const char *copyright_string - = N_("Copyright (C) 2003, 2004, 2005, 2006 Paul Pogonyshev and others"); - -- if (!about_dialog) { - #if GTK_2_6_OR_LATER - - GtkAboutDialog *dialog = GTK_ABOUT_DIALOG (gtk_about_dialog_new ()); -@@ -2481,10 +2480,14 @@ - gtk_about_dialog_set_copyright (dialog, _(copyright_string)); - gtk_about_dialog_set_comments (dialog, _(description_string)); - -- about_dialog = GTK_WINDOW (dialog); -+ about_dialog = GTK_DIALOG (dialog); -+ gtk_dialog_run (GTK_DIALOG (about_dialog)); -+ gtk_widget_destroy (GTK_WIDGET (about_dialog)); -+ about_dialog = NULL; - - #else /* not GTK_2_6_OR_LATER */ - -+ if (!about_dialog) { - GtkWidget *dialog = gtk_dialog_new_with_buttons (_("About Quarry"), - NULL, 0, - GTK_STOCK_CLOSE, -@@ -2524,11 +2527,11 @@ - - gtk_utils_standardize_dialog (GTK_DIALOG (dialog), vbox); - gtk_widget_show_all (vbox); -- --#endif /* not GTK_2_6_OR_LATER */ - } - - gtk_window_present (about_dialog); -+ -+#endif /* not GTK_2_6_OR_LATER */ - } - - diff --git a/debian/patches/04_use_x-www-browser.patch b/debian/patches/04_use_x-www-browser.patch deleted file mode 100644 index 135f63e..0000000 --- a/debian/patches/04_use_x-www-browser.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Use x-www-browser instead of mozilla -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/quarry/+bug/273557 -Forwarded: no -Author: Vincent Legout <vinc...@legout.info> - -Index: quarry/src/gui-gtk/gtk-help.c -=================================================================== ---- quarry.orig/src/gui-gtk/gtk-help.c 2011-02-08 13:48:26.383294819 +0100 -+++ quarry/src/gui-gtk/gtk-help.c 2011-02-08 13:48:36.931302572 +0100 -@@ -116,7 +116,7 @@ - GError *error = NULL; - - /* FIXME: Make fallback browser configurable. */ -- child_argv[0] = "mozilla"; -+ child_argv[0] = "x-www-browser"; - - if (link_id) { - child_argv[1] = g_strconcat (("file://" PACKAGE_DATA_DIR diff --git a/debian/patches/series b/debian/patches/series index 4bdf4b4..744237e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ 01_fix_russian_translation 02_desktop_file -03_close_about_dialog.patch -04_use_x-www-browser.patch -- Packaging for quarry _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits