diff -u gnome-hearts-0.1.2/debian/changelog gnome-hearts-0.1.2/debian/changelog --- gnome-hearts-0.1.2/debian/changelog +++ gnome-hearts-0.1.2/debian/changelog @@ -1,3 +1,12 @@ +gnome-hearts (0.1.2-1ubuntu1.1~proposed) edgy-proposed; urgency=low + + * Added 02_ubuntu_crash_fix.patch for fixing segfault on startup. + - Patch was created by Andreas Henriksson + - closes malone #65274 and #79059 (Hearts crashes on startup) + * Replaced bonded.png with bonded.svn in 01_gnome_cards_data.patch + + -- ville palo Sat, 13 Jan 2007 12:53:22 +0200 + gnome-hearts (0.1.2-1ubuntu1) edgy; urgency=low * debian/control.in: depend on gnome-games-data instead of gnome-cards-data diff -u gnome-hearts-0.1.2/debian/patches/01_gnome_cards_data.patch gnome-hearts-0.1.2/debian/patches/01_gnome_cards_data.patch --- gnome-hearts-0.1.2/debian/patches/01_gnome_cards_data.patch +++ gnome-hearts-0.1.2/debian/patches/01_gnome_cards_data.patch @@ -4898,7 +4898,7 @@ game_rules.east_ai = g_string_new("John"); game_rules.west_ai = g_string_new("John"); - game_card_style = g_string_new("dondorf.svg"); -+ game_card_style = g_string_new("bonded.png"); ++ game_card_style = g_string_new("bonded.svg"); game_background = g_string_new(PACKAGE_DATA_DIR"/pixmaps/gnome-hearts/baize.png"); game_background_tiled = TRUE; } only in patch2: unchanged: --- gnome-hearts-0.1.2.orig/debian/patches/02_ubuntu_crash_fix.patch +++ gnome-hearts-0.1.2/debian/patches/02_ubuntu_crash_fix.patch @@ -0,0 +1,13 @@ +diff -urip gnome-hearts-0.1.2.orig/src/hearts.c gnome-hearts-0.1.2/src/hearts.c +--- gnome-hearts-0.1.2.orig/src/hearts.c 2006-08-03 23:28:02.000000000 +0200 ++++ gnome-hearts-0.1.2/src/hearts.c 2006-10-29 23:34:19.000000000 +0100 +@@ -621,7 +621,8 @@ void card_style_add(gpointer key, gpoint + + gtk_combo_box_append_text(card_style_box, (gchar*)key); + +- if (strcmp(game_card_style->str, (gchar*)key) == 0) ++ if ((strcmp(game_card_style->str, (gchar*)key) == 0) ++ || (cards_image == NULL)) + { + gtk_combo_box_set_active(card_style_box, i); + cards_image = cards_image_from_file(value);