Package: mtpaint Version: 3.31-3 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu natty ubuntu-patch
*** /tmp/tmpP3uFc1 In Ubuntu, we've applied the attached patches: 06_window_icon.dpatch: Add an icon to the window (LP: #727443) 07_fix_binutils_gold.dpatch: Fix FTBFS with binutils gold. (which should fix Debian bug #555756) We thought you might be interested in doing the same. -- System Information: Debian Release: squeeze/sid APT prefers maverick-updates APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500, 'maverick') Architecture: amd64 (x86_64) Kernel: Linux 2.6.35-28-generic (SMP w/8 CPU cores) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -u mtpaint-3.31/debian/changelog mtpaint-3.31/debian/changelog diff -u mtpaint-3.31/debian/patches/00list mtpaint-3.31/debian/patches/00list --- mtpaint-3.31/debian/patches/00list +++ mtpaint-3.31/debian/patches/00list @@ -5,0 +6,2 @@ +06_window_icon.dpatch +07_fix_binutils_gold.dpatch only in patch2: unchanged: --- mtpaint-3.31.orig/debian/patches/06_window_icon.dpatch +++ mtpaint-3.31/debian/patches/06_window_icon.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_window_icon.patch.dpatch by Julien Lavergne <Julien Lavergne <gi...@ubuntu.com>> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add an icon to the window. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mtpaint-3.31~/src/mainwindow.c mtpaint-3.31/src/mainwindow.c +--- mtpaint-3.31~/src/mainwindow.c 2009-02-28 18:07:31.000000000 +0100 ++++ mtpaint-3.31/src/mainwindow.c 2011-03-20 11:59:28.990306001 +0100 +@@ -4706,6 +4706,7 @@ + gtk_widget_set_usize(main_window, 100, 100); // Set minimum width/height + win_restore_pos(main_window, "window", 0, 0, 630, 400); + gtk_window_set_title (GTK_WINDOW (main_window), VERSION ); ++ gtk_window_set_icon_from_file (GTK_WINDOW (main_window), "/usr/share/pixmaps/mtpaint.png", NULL ); + + /* !!! Konqueror needs GDK_ACTION_MOVE to do a drop; we never accept + * move as a move, so have to do some non-default processing - WJ */ only in patch2: unchanged: --- mtpaint-3.31.orig/debian/patches/07_fix_binutils_gold.dpatch +++ mtpaint-3.31/debian/patches/07_fix_binutils_gold.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_fix_binutils_gold.dpatch by Julien Lavergne <Julien Lavergne <gi...@ubuntu.com>> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FTBFS with DSO linking + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mtpaint-3.31~/src/Makefile mtpaint-3.31/src/Makefile +--- mtpaint-3.31~/src/Makefile 2011-03-20 12:14:26.690306003 +0100 ++++ mtpaint-3.31/src/Makefile 2011-03-20 12:14:57.760306004 +0100 +@@ -8,7 +8,7 @@ + toolbar.o channels.o csel.o shifter.o spawn.o font.o fpick.o icons.o cpick.o + + $(BIN): main.o $(OBJS) +- $(CC) main.o $(OBJS) -o $(BIN) $(LDFLAGS) $(LDFLAG) $(GLIB_LIB) ++ $(CC) main.o $(OBJS) -o $(BIN) $(LDFLAGS) $(LDFLAG) $(GLIB_LIB) -lX11 + + .c.o: + $(CC) $(CFLAGS) $(CFLAG) -c -o $*.o $*.c
