diff -Nru pioneers-0.10.2/debian/changelog pioneers-0.10.2/debian/changelog --- pioneers-0.10.2/debian/changelog 2006-11-18 12:40:19.000000000 +0200 +++ pioneers-0.10.2/debian/changelog 2006-11-18 12:40:19.000000000 +0200 @@ -1,3 +1,11 @@ +pioneers (0.10.2-2ubuntu1) feisty; urgency=low + + * Added ubuntu_segfault.dpatch for fixing segfault when moving slider. + Closes malone #69344 + * Added support for dpatch + + -- ville palo Sat, 18 Nov 2006 12:20:40 +0200 + pioneers (0.10.2-2) unstable; urgency=low * Use CFLAGS, so DEB_BUILD_OPTIONS=noopt actually works. (Thanks to A diff -Nru pioneers-0.10.2/debian/control pioneers-0.10.2/debian/control --- pioneers-0.10.2/debian/control 2006-11-18 12:40:19.000000000 +0200 +++ pioneers-0.10.2/debian/control 2006-11-18 12:40:19.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Bas Wijnen Uploaders: Steve Langasek , Roman Hodek -Build-Depends: debhelper (>= 5.0.0), libgnome2-dev, scrollkeeper, gnome-common, imagemagick, librsvg2-bin, netpbm, libgtk2.0-dev, automake1.9, autoconf (>= 2.53) +Build-Depends: debhelper (>= 5.0.0), libgnome2-dev, scrollkeeper, gnome-common, imagemagick, librsvg2-bin, netpbm, libgtk2.0-dev, automake1.9, autoconf (>= 2.53), dpatch Standards-Version: 3.7.2 Package: pioneers-client diff -Nru pioneers-0.10.2/debian/patches/00list pioneers-0.10.2/debian/patches/00list --- pioneers-0.10.2/debian/patches/00list 1970-01-01 02:00:00.000000000 +0200 +++ pioneers-0.10.2/debian/patches/00list 2006-11-18 12:40:19.000000000 +0200 @@ -0,0 +1 @@ +ubuntu_segfault.dpatch diff -Nru pioneers-0.10.2/debian/patches/ubuntu_segfault.dpatch pioneers-0.10.2/debian/patches/ubuntu_segfault.dpatch --- pioneers-0.10.2/debian/patches/ubuntu_segfault.dpatch 1970-01-01 02:00:00.000000000 +0200 +++ pioneers-0.10.2/debian/patches/ubuntu_segfault.dpatch 2006-11-18 12:40:19.000000000 +0200 @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu_segfault.dpatch by ville palo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad pioneers-0.10.2~/common/gtk/guimap.c pioneers-0.10.2/common/gtk/guimap.c +--- pioneers-0.10.2~/common/gtk/guimap.c 2006-09-16 22:27:32.000000000 +0300 ++++ pioneers-0.10.2/common/gtk/guimap.c 2006-11-18 10:46:47.000000000 +0200 +@@ -881,6 +881,9 @@ + if (gmap->hex_region != NULL) + return; + ++ if (gmap->x_point == 0 && gmap->y_point == 0 && gmap->hex_radius == 0) ++ return; ++ + poly.points = points; + poly.num_points = G_N_ELEMENTS(points); + get_hex_polygon(gmap, &poly, FALSE); +@@ -932,7 +935,10 @@ + } + + gmap->gc = gdk_gc_new(gmap->pixmap); ++ + build_hex_region(gmap); ++ if (!gmap->hex_region) ++ return; + + gdk_gc_set_fill(gmap->gc, GDK_TILED); + gdk_gc_set_tile(gmap->gc, diff -Nru pioneers-0.10.2/debian/rules pioneers-0.10.2/debian/rules --- pioneers-0.10.2/debian/rules 2006-11-18 12:40:19.000000000 +0200 +++ pioneers-0.10.2/debian/rules 2006-11-18 12:40:19.000000000 +0200 @@ -15,6 +15,8 @@ CFLAGS = -Wall -g +include /usr/share/dpatch/dpatch.make + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else @@ -40,7 +42,7 @@ compile build: build-stamp -build-stamp: +build-stamp: patch-stamp dh_testdir if diff debian/copyright AUTHORS | grep ^'>' >&2 ; then \ echo >&2 "The above lines are present in the AUTHORS file, but not in debian/copyright. Please fix this" ; \ @@ -62,7 +64,7 @@ rm pioneers-server32.png touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp install-stamp pioneers.xpm pioneers-server.xpm