diff -u gpaint-0.3.3/debian/control gpaint-0.3.3/debian/control --- gpaint-0.3.3/debian/control +++ gpaint-0.3.3/debian/control @@ -9,7 +9,7 @@ Package: gpaint Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: GNU Paint - a small, easy to use paint program for GNOME This is gpaint (GNU Paint), a small-scale painting program for GNOME, the GNU Desktop Environment. gpaint does not attempt to compete with diff -u gpaint-0.3.3/debian/changelog gpaint-0.3.3/debian/changelog --- gpaint-0.3.3/debian/changelog +++ gpaint-0.3.3/debian/changelog @@ -1,3 +1,12 @@ +gpaint (0.3.3-2.1ubuntu1) karmic; urgency=low + + * Merge with Debian Unstable. + * debian/patches/21_fix_not_printable_string.dpatch: Don't try to + show unprintable characters. (LP: #262648) + * debian/control: Add ${misc:Depends} to Depends. + + -- Andrew Starr-Bochicchio Fri, 21 Aug 2009 13:15:05 -0400 + gpaint (0.3.3-2.1) unstable; urgency=low * Non-maintainer upload. diff -u gpaint-0.3.3/debian/patches/00list gpaint-0.3.3/debian/patches/00list --- gpaint-0.3.3/debian/patches/00list +++ gpaint-0.3.3/debian/patches/00list @@ -7,0 +8 @@ +21_fix_not_printable_string_text only in patch2: unchanged: --- gpaint-0.3.3.orig/debian/patches/21_fix_not_printable_string_text.dpatch +++ gpaint-0.3.3/debian/patches/21_fix_not_printable_string_text.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 21_fix_not_printable_string_text.dpatch by > +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't try to show unprintable characters. +## DP: Upstream bug: https://savannah.gnu.org/bugs/?26923 +## DP: LP Bug: https://bugs.launchpad.net/netbook-remix/+bug/262648 +## DP: Debian Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535217 + +@DPATCH@ +diff -urNad gpaint-0.3.3~/src/text.c gpaint-0.3.3/src/text.c +--- gpaint-0.3.3~/src/text.c 2009-06-30 15:11:40.000000000 -0400 ++++ gpaint-0.3.3/src/text.c 2009-06-30 15:12:58.000000000 -0400 +@@ -235,7 +235,10 @@ + } + else if (keyevent->string) + { +- g_string_append(text->textbuf, keyevent->string); ++ if (isprint(keyevent->string[0])) /* not UTF-8 aware */ ++ { ++ g_string_append(text->textbuf, keyevent->string); ++ } + } + else if ((keyevent->keyval >= GDK_space) && (keyevent->keyval < GDK_Shift_L)) + {