--- gpaint-0.3.3.orig/debian/compat +++ gpaint-0.3.3/debian/compat @@ -0,0 +1 @@ +4 --- gpaint-0.3.3.orig/debian/changelog +++ gpaint-0.3.3/debian/changelog @@ -0,0 +1,262 @@ +gpaint (0.3.3-2) unstable; urgency=low + + * debian/patches/20_fix_line_width_combo.dpatch: Add missing line + widths (5, 7 and 9). + * debian/patches/10_fix_crash_on_font_select.dpatch: Make the font + selection button active only when the text tool is selected, + avoiding a crash that occurs if the user selects a font without + selecting the text tool. (Closes: #497201) (LP: #262889) + * debian/control: Added packaging Vcs information. + * debian/patches/11_fix_image_rotation.dpatch: Use the + gdk_pixbuf_rotate_simple function to do image rotation in multiples + of 90 degrees (Closes: #497487) (LP: #262942) + + -- Goedson Teixeira Paixao Tue, 30 Sep 2008 16:09:14 -0300 + +gpaint (0.3.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/20_fix_line_width_combo.dpatch: Add items to the + line width combo box in gpaint.glade. Fixes the combo box grabbing + the curser when clicked. Closes: #497484. + * Patch configure in debian/rules to avoid rpath. + * Fix debian/copyright. + + -- Thomas Viehmann Sat, 20 Sep 2008 00:27:22 +0200 + +gpaint (0.3.3-1) unstable; urgency=low + + * New upstream release + * debian/patches/01_drawing.dpatch:fix wrong response value for a GTK dialog. + * debian/copyright: fixed spelling error. + + -- Goedson Teixeira Paixao Wed, 19 Sep 2007 17:59:24 -0300 + +gpaint (0.3.2-1) unstable; urgency=low + + * New upstream release + * debian/copyright: updated download location and GPL version reference. + * debian/patches: removed patches applied in upstream release. + + -- Goedson Teixeira Paixao Tue, 04 Sep 2007 11:03:41 -0300 + +gpaint (0.3.1-3) unstable; urgency=low + + * debian/patches/10_real_clipboard.dpatch: implemented copying to/from the + system clipboard. Thanks Steven McCoy for the patch. + (Closes: #419767) (LP: #125397). + * debian/patches/11_keyboard_accelerators.dpatch: added keyboard accelerators + to for the most common operations. + * debian/menu: changed section name from "Apps" to "Applications". + * debian/patches/12_fix_line_width.dpatch: fixes crash when 0 is entered in + the line width edit box (as reported upstream in + http://savannah.gnu.org/bugs/index.php?20562) + + -- Goedson Teixeira Paixao Sat, 18 Aug 2007 19:02:49 -0300 + +gpaint (0.3.1-2) unstable; urgency=low + + * Fix crash when copying the whole image (LP: #102539) + * Updated pt_BR translation + + -- Goedson Teixeira Paixao Mon, 02 Jul 2007 23:03:52 -0300 + +gpaint (0.3.1-1) unstable; urgency=low + + * New upstream release + * debian/patches: Removed patches that were applied upstream + - 10_fix_gcc_warnings + - 11_update_pt_BR_translation + - 12_add_de_translation + - 13_add_rectangular_Select_tool + - 14_fix_window_title + - 15_use_gtk_file_chooser + * debian/patches/01_fix_color_palette_button_sizes.dpatch: makes the + color palette buttons fixed width. + * debian/rules: remove po/*.gmo files in the clean target (Closes: #424364) + * Added debian/watch file. + + -- Goedson Teixeira Paixao Mon, 11 Jun 2007 22:37:02 -0300 + +gpaint (0.2.4+0.3.0pre5-5) unstable; urgency=low + + * debian/patches/13_add_rectangular_select_tool.dpatch: + implement rectangular selection tool (Closes: #419765) + * debian/patches/14_fix_window_title.dpatch: fix a bug that would display + the .po file header as the window title. Thanks Yavor Doganov for + the patch. + * debian/patches/15_use_gtk_file_chooser.dpatch: + use GtkFileChooser instead of GtkFileSelection to implement the + open and save dialogs. (Closes: #419768) + + -- Goedson Teixeira Paixao Sun, 22 Apr 2007 15:35:25 -0300 + +gpaint (0.2.4+0.3.0pre5-4) unstable; urgency=low + + * debian/patches/12_add_de_translation.dpatch: removed autom4te.cache + directory. + + -- Goedson Teixeira Paixao Fri, 2 Feb 2007 23:58:04 -0200 + +gpaint (0.2.4+0.3.0pre5-3) unstable; urgency=low + + * Added German translation. + * Bumped Standards-Version to 3.7.2, no changes needed. + + -- Goedson Teixeira Paixao Wed, 3 Jan 2007 15:48:59 -0200 + +gpaint (0.2.4+0.3.0pre5-2) unstable; urgency=low + + * Use the new menu scheme. Thanks to Adam + Zimmerman for the bugreport (Closes: #296698). + * Updated pt_BR translation. + * Fixed some GCC warnings during compilation. + + -- Goedson Teixeira Paixao Sun, 20 Mar 2005 14:53:00 -0300 + +gpaint (0.2.4+0.3.0pre5-1) unstable; urgency=low + + * New upstream release + + -- Goedson Teixeira Paixao Tue, 1 Feb 2005 19:23:01 -0200 + +gpaint (0.2.4+0.3.0pre4-1) unstable; urgency=low + + * New upstream release + + -- Goedson Teixeira Paixao Fri, 31 Dec 2004 16:46:59 -0200 + +gpaint (0.2.4-1) unstable; urgency=low + + * New upstream release + - bug fix release commiting our patches + * debian/patches/00list: + - disabled the patches commited upstream + * debian/control: + - changed Section: to gnome + + -- Goedson Teixeira Paixao Mon, 29 Nov 2004 11:29:04 -0200 + +gpaint (0.2.3-8) unstable; urgency=low + + * Fixed file saving issues. + - Thanks Emily Dai for the patch. + * Fixed unquoted fields in Debian menu file. + * Fixed manpage section. + + -- Goedson Teixeira Paixao Fri, 17 Sep 2004 08:42:25 -0300 + +gpaint (0.2.3-7) unstable; urgency=low + + * Added warning when saving file fails (closes: #227866). + * debian/control: + updated Standards-Version to 3.6.1. No changes needed. + * debian/rules: + use cdbs + + -- Goedson Teixeira Paixao Tue, 24 Feb 2004 09:39:46 -0300 + +gpaint (0.2.3-6) unstable; urgency=low + + * Changed Maintainer: field to @debian.org address. + * Use dpatch to apply the build-time patches. + * When opening an image, open it in a new window if the current image + has unsaved modifications. + + -- Goedson Teixeira Paixao Sun, 22 Jun 2003 22:22:08 -0300 + +gpaint (0.2.3-5) unstable; urgency=low + + * Added versioning to debhelper build-dependency (closes: #181158) + + -- Goedson Teixeira Paixao Wed, 19 Feb 2003 23:21:36 -0300 + +gpaint (0.2.3-4) unstable; urgency=low + + * Fixed dimension and color map for the menu icon. + + -- Goedson Teixeira Paixao Mon, 27 Jan 2003 22:09:43 -0200 + +gpaint (0.2.3-3) unstable; urgency=low + + * Fix window close handling. (closes: #175456) + * Update to GNOME 2.2 API. + + -- Goedson Teixeira Paixao Mon, 20 Jan 2003 21:13:28 -0200 + +gpaint (0.2.3-2) unstable; urgency=low + + * Added warning when closing changed files. (closes: #175456) + + -- Goedson Teixeira Paixao Sun, 12 Jan 2003 10:00:22 -0200 + +gpaint (0.2.3-1) unstable; urgency=low + + * New upstream release + - load files specified by command line parameters (closes: #144189) + + -- Goedson Teixeira Paixao Wed, 18 Dec 2002 11:27:46 -0200 + +gpaint (0.2.2-4) unstable; urgency=low + + * Copied gnome-graphics.png as gpaint.xpm to use as menu icon + * Added Debian menu icon (closes: #148769) + * Removed dependency to gnome-panel-data and gnome-desktop-data + + -- Goedson Teixeira Paixao Sat, 8 Jun 2002 07:04:46 -0300 + +gpaint (0.2.2-3) unstable; urgency=low + + * General cleanup + * Removed dependency on autoconf and automake when building (closes: #146075, #147534) + + -- Goedson Teixeira Paixao Sat, 1 Jun 2002 15:01:02 -0300 + +gpaint (0.2.2-2) unstable; urgency=low + + * Just suggest gnome-panel-data|gnome-desktop-data (closes: #140280) + + -- Goedson Teixeira Paixao Tue, 2 Apr 2002 19:17:27 -0300 + +gpaint (0.2.2-1) unstable; urgency=low + + * New upstream release. + * Change dependecies so gnom2 users can install it. + + -- Goedson Teixeira Paixao Sun, 17 Mar 2002 12:27:19 -0300 + +gpaint (0.2.1-1) unstable; urgency=low + + * New upstream release. + * New maintainer. (closes: #136670, #138499) + * Added pt_BR locale. + * Modified Makefiles to avoid installing pixmaps/*.pl files into + /usr/share/pixmaps. + * Modified Makefiles to accept DESTDIR as an indication of where is + the base of the instalation tree. + + -- Goedson Teixeira Paixao Sat, 16 Mar 2002 15:20:28 -0300 + +gpaint (0.2-3) unstable; urgency=low + + * Removed over-colourful menu icon. (closes: #100359) + + -- Robert McQueen Tue, 12 Jun 2001 19:52:37 +0100 + +gpaint (0.2-2) unstable; urgency=low + + * Added libxml-dev build dep. + * Added manpage. + * Thanks to Stephen Stafford for + these two fixes. + + -- Robert McQueen Fri, 8 Jun 2001 19:09:40 +0100 + +gpaint (0.2-1) unstable; urgency=low + + * Initial release. (closes: #98377) + * Made gpaint.1 undocumented until a manpage is written. + + -- Robert McQueen Thu, 7 Jun 2001 01:20:01 +0100 + + --- gpaint-0.3.3.orig/debian/menu +++ gpaint-0.3.3/debian/menu @@ -0,0 +1,7 @@ +?package(gpaint):\ +needs="X11"\ +section="Applications/Graphics"\ +title="GNU Paint"\ +command="/usr/bin/gpaint"\ +icon="/usr/share/pixmaps/gpaint.xpm" + --- gpaint-0.3.3.orig/debian/watch +++ gpaint-0.3.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://alpha.gnu.org/gnu/gpaint/gpaint-2-(.*)\.tar\.gz --- gpaint-0.3.3.orig/debian/docs +++ gpaint-0.3.3/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- gpaint-0.3.3.orig/debian/control +++ gpaint-0.3.3/debian/control @@ -0,0 +1,26 @@ +Source: gpaint +Section: gnome +Priority: optional +Vcs-Git: git://git.debian.org/git/users/goedson/pkg-gpaint.git +Vcs-Browser: http://git.debian.org/?p=users/goedson/pkg-gpaint.git;a=summary +Maintainer: Goedson Teixeira Paixao +Build-Depends: debhelper (>= 4.1.46), libgnomeui-dev, zlib1g-dev, libxml2-dev, libgnomeprint2.2-dev, libgnomeprintui2.2-dev, autotools-dev, dpatch, cdbs +Standards-Version: 3.7.2 + +Package: gpaint +Architecture: any +Depends: ${shlibs: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 + GIMP, it is just a simple drawing package based on xpaint, along the + lines of 'Paintbrush' from a popular non-free operating system. + . + Currently gpaint has the following features: + * Drawing tools such as ovals, freehand, polygon and text, with + fill or shadow for polygons and closed freehand shapes. + * Cut and paste by selecting irregular regions or polygons. + * Preliminary print support using gnome-print. + * Modern, ease-to-use user interface with tool and color palettes. + * Multiple-image editing in a single instance of the program. + * All the image processing features present in xpaint. --- gpaint-0.3.3.orig/debian/rules +++ gpaint-0.3.3/debian/rules @@ -0,0 +1,47 @@ +#!/usr/bin/make -f +# Copyright 2003 Goedson Teixeira Paixao +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/gnome.mk + +# Use dpatch to apply patches +include /usr/share/dpatch/dpatch.make +makebuilddir:: + [ -f $(CURDIR)/configure.backup ] || cp $(CURDIR)/configure $(CURDIR)/configure.backup + sed -i -r 's/(hardcode_into_libs)=.*$$/\1=no/;s/(hardcode_libdir_flag_spec)=.*--rpath.*$$//' $(CURDIR)/configure +post-patches:: patch +clean:: unpatch + -rm po/*.gmo + [ ! -f $(CURDIR)/configure.backup ] || mv $(CURDIR)/configure.backup $(CURDIR)/configure + +install/gpaint:: + # Rename executable + mv $(CURDIR)/debian/gpaint/usr/bin/gpaint-2 $(CURDIR)/debian/gpaint/usr/bin/gpaint + + # Install GNOME menu item + mkdir -p debian/gpaint/usr/share/applications + install -o root -g root -m 644 gpaint.desktop debian/gpaint/usr/share/applications/gpaint.desktop + mkdir -p debian/gpaint/usr/share/pixmaps + install -o root -g root -m 644 debian/gpaint.xpm debian/gpaint/usr/share/pixmaps/gpaint.xpm + + # Install manpage + mkdir -p debian/gpaint/usr/share/man/man1/ + install -o root -g root -m 644 debian/gpaint.1 debian/gpaint/usr/share/man/man1/ + + --- gpaint-0.3.3.orig/debian/copyright +++ gpaint-0.3.3/debian/copyright @@ -0,0 +1,26 @@ +gpaint was packaged for Debian by Robert McQueen on +Tue, 22 May 2001 22:16:33 +0100. The package is currently maintained +by Goedson Teixeira Paixao + +It was downloaded from: + http://alpha.gnu.org/gnu/gpaint/ + +Copyright: + Copyright (C) 2000-2003, 2007 Li-Cheng (Andy) Tai + Copyright (C) 2003 Michael A. Meffie III + Copyright (C) 2003 Free Software Foundation + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and + Josh MacDonald + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 3 of +the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. --- gpaint-0.3.3.orig/debian/gpaint.1 +++ gpaint-0.3.3/debian/gpaint.1 @@ -0,0 +1,53 @@ +.TH GPAINT 1 "June 7, 2001" + +.SH NAME +gpaint \- a small easy to use paint program for GNOME + +.SH SYNOPSIS +gpaint [filename]... + +.SH DESCRIPTION +This manual page briefly documents gpaint (GNU Paint), a small-scale +painting program for GNOME, the GNU Desktop Environment. gpaint does +not attempt to compete with GIMP, it is just a simple drawing package +based on xpaint, along the lines of 'Paintbrush' from a popular +non-free operating system. + +gpaint is still work in progress and many features are still being +developed. However, gpaint is usable and useful for simple image +editing tasks. + +.SH FEATURES +Currently gpaint has the following features: +.TP +* Drawing tools such as ovals, freehand, polygon and text, with fill or shadow for polygons and closed freehand shapes. +.TP +* Cut and paste by selecting irregular regions or polygons. +.TP +* Preliminary print support using gnome-print. +.TP +* Modern, easy to use user interface with tool and color palettes. +.TP +* Multiple-image editing in a single instance of the program. +.TP +* All the image processing features present in xpaint. + +.SH TODO +Future plans include the implementation of zooming in/out, image +scaling/rotation, and turning gpaint into a Bonobo component for +simple image editing tasks inside other programs. + +.SH BUGS +For bugs or general comments you can send mail to the developers list , or you can enter a bug into the Debian Bug Tracking +system. Details of how to use this system can be found on +http://bugs.debian.org/. + +.SH SEE-ALSO +\fB X (1), gnome (1)\fP + +.SH AUTHOR +This manual page was written by Stephen Stafford +, for the Debian GNU/Linux system, but +may be used by others. It is based on the README file included in +the source distribution of gpaint which was written by Andy Tai +. --- gpaint-0.3.3.orig/debian/gpaint.xpm +++ gpaint-0.3.3/debian/gpaint.xpm @@ -0,0 +1,53 @@ +/* XPM */ +static char *gnome-graphics[] = { +/* columns rows colors chars-per-pixel */ +"32 32 15 1", +" c black", +". c #191919", +"X c gray20", +"o c #7F0000", +"O c #7F007F", +"+ c #7F7F00", +"@ c #4C4C4C", +"# c #666667", +"$ c gray50", +"% c red", +"& c gray60", +"* c #B2B2B2", +"= c gray80", +"- c gray90", +"; c None", +/* pixels */ +";;;;;;;;;;;;;;;;;;;;;@#$$%&$#@oX", +";;;;;;;;;;;;;;;;;;;;.+#$&&%#o@X.", +";;;;;;;;;;;;;;;;;;;.@$$$&&##XXX.", +";;;;;;;;;;;;;;;;;; X#%&&$oo#Xo..", +";;;;;;;;;;;;;;;;; X$##$$$@@Xo...", +";;;;;;;;;;;;;;;;;#&*=*#@O@oX...o", +";;;;;;;;;;;;;;;;.#*---&#Xoo.....", +";;;;;;;;;;;;;;;;#&=--=*$@X.....;", +";;;;;;;;;;;;;;;.$=--=*&#@X....;;", +";;;;;;;;;;;;;;.&*---*&#@#@.X.;;;", +";;;;;;;;;;;;; @*---*&#@@#@..;;;;", +";;;;;;;;;;;;;@&=--*&@@##@..;;;;;", +";;;;;;;;;;;;.#*--=&@@@#@X. ;;;;;", +";;;;;;;;;;;;X&=-*&#@##@...;;;;;;", +";;;;;;;;;;.X@*==&$@##@X.;;;;;;;;", +";;;;;;;;; X&*&&&$@@#XX ;;;;;;;;;", +";;;;;;;;.@@#**$@@##XX.;;;;;;;;;;", +";;;;;;; @@$$@&$@X@XX.;; ;;;;;", +";;;;;;;X@$&#XX#@XX. ; ;;", +";;;;;;;.@&&@...@XX ", +";;;;;;.@$&#.... . ", +";;;; ;X@&$X.. ", +";;; X$&X.. . ", +";;; .##X.. . ", +";;; .X@X.. . .. ......... ", +";@#@XXX. . . . ...o.XoXo.. ;", +" ##X.o. . o...o.o@oXoXXXXo. ;", +". .o@@#@@X@o@o+#+$+oXXoXo.. ;;", +";;;.+****&%&&$%$&&%+@o. . ; ;;;", +";;; Xo$%+#$++%$+%$%$+oXo ;;;;;;;", +";;; XoXoX..o....oXX..o. ;;;;;;;", +";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;" +}; --- gpaint-0.3.3.orig/debian/patches/04_update_pt_br_translation.dpatch +++ gpaint-0.3.3/debian/patches/04_update_pt_br_translation.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_update_pt_br_translation.dpatch by Goedson Teixeira Paixao +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Updates the Brazilian Portuguese translation. + +@DPATCH@ +diff -urNad gpaint-0.3.2~/po/pt_BR.po gpaint-0.3.2/po/pt_BR.po +--- gpaint-0.3.2~/po/pt_BR.po 2007-09-01 21:49:18.000000000 -0300 ++++ gpaint-0.3.2/po/pt_BR.po 2007-09-03 16:15:30.000000000 -0300 +@@ -7,7 +7,7 @@ + "Project-Id-Version: gpaint 0.2.1POT-Creation-Date\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2007-09-01 17:49-0700\n" +-"PO-Revision-Date: 2007-07-02 23:03-0300\n" ++"PO-Revision-Date: 2007-09-03 16:15-0300\n" + "Last-Translator: Goedson Teixeira Paixão \n" + "Language-Team: Portuguese/Brazil \n" + "MIME-Version: (null)\n" +@@ -35,17 +35,12 @@ + msgstr "sobre" + + #: src/ui.c:214 +-#, fuzzy + msgid "" + "This program is free software; you may redistribute it and/or modify it " + "under the terms of the GNU General Public License as published by the Free " + "Software Foundation, either version 3, or (at your opinion) any later " + "version.\n" +-msgstr "" +-"Este programa é software livre; você pode redistribui-lo e/ou modificá-lo " +-"sob os termos da Licença Pública Geral GNU (GPL) publicada pela Free " +-"Software Foundation, podendo optar, a seu critério, pela versão 2 ou " +-"qualquer versão posterior.\n" ++msgstr "Este programa é software livre; você pode redistribui-lo e/ou modificá-lo sob os termos da Licença Pública Geral GNU (GPL) publicada pela Free Software Foundation, podendo optar, a seu critério, pela versão 3 ou qualquer versão posterior.\n" + + #: src/ui.c:223 + msgid "" --- gpaint-0.3.3.orig/debian/patches/09_fix_menu_entry.dpatch +++ gpaint-0.3.3/debian/patches/09_fix_menu_entry.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_fix_menu_entry.dpatch by Goedson Teixeira Paixao +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes the gpaint.desktop file to work in the new menu scheme. + +@DPATCH@ +diff -urNad gpaint-0.3.1~/gpaint.desktop gpaint-0.3.1/gpaint.desktop +--- gpaint-0.3.1~/gpaint.desktop 2005-01-03 15:37:58.000000000 -0200 ++++ gpaint-0.3.1/gpaint.desktop 2007-08-18 16:55:38.000000000 -0300 +@@ -3,11 +3,9 @@ + Comment=A small-scale painting program for GNOME, the GNU Desktop + Comment[fr]=Un petit outil de dessin pour GNOME, le desktop GNU + Comment[pt_BR]=Um pequeno programa de desenho para o GNOME, o Desktop GNU +-TryExec=gpaint-2 +-Exec=gpaint-2 +-Icon=gnome-logo-icon-transparent.png ++TryExec=gpaint ++Exec=gpaint ++Icon=gpaint.xpm + Terminal=0 + Type=Application +- +- +- ++Categories=Graphics;2DGraphics;RasterGraphics; --- gpaint-0.3.3.orig/debian/patches/11_fix_image_rotation.dpatch +++ gpaint-0.3.3/debian/patches/11_fix_image_rotation.dpatch @@ -0,0 +1,109 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_fix_image_rotation.dpatch by Goedson Teixeira Paixao +## +## DP: Implement rotation in multiples of 90 degrees using the +## DP: gdk_pixbuf_rotate_simple function instead of the custom (and broken) +## DP: rotation algorithm. + +@DPATCH@ +diff --git a/src/drawing.c b/src/drawing.c +index 4f69569..c498c7d 100644 +--- a/src/drawing.c ++++ b/src/drawing.c +@@ -462,12 +462,23 @@ drawing_prompt_to_save(gpaint_drawing *drawing) + } + + void +-drawing_rotate(gpaint_drawing *drawing, double degrees) ++drawing_rotate(gpaint_drawing *drawing, int degrees) + { + gpaint_image *image = drawing_create_image(drawing); + if (image) + { +- image_rotate(image, degrees); ++ switch (degrees) ++ { ++ case 0: ++ case 90: ++ case 180: ++ case 270: ++ image_rotate_simple(image, degrees); ++ break; ++ default: ++ image_rotate(image, degrees); ++ break; ++ } + + /* copy rotated image on the pixmap */ + gdk_pixmap_unref(drawing->backing_pixmap); +diff --git a/src/drawing.h b/src/drawing.h +index 6eae802..6cf1f84 100644 +--- a/src/drawing.h ++++ b/src/drawing.h +@@ -58,6 +58,6 @@ gpaint_image *drawing_create_image(gpaint_drawing *drawing); + void drawing_clear(gpaint_drawing *drawing); + void drawing_clear_selection(gpaint_drawing *drawing, gpaint_point_array *points); + gboolean drawing_prompt_to_save(gpaint_drawing *drawing); +-void drawing_rotate(gpaint_drawing *drawing, double degrees); ++void drawing_rotate(gpaint_drawing *drawing, int degrees); + + #endif +diff --git a/src/image.c b/src/image.c +index 0720d75..189d8a8 100644 +--- a/src/image.c ++++ b/src/image.c +@@ -628,6 +628,27 @@ image_rotate(gpaint_image *image, double degrees) + return 0; + } + ++int ++image_rotate_simple (gpaint_image *image, int degrees) ++{ ++ GdkPixbuf *newpixbuf; ++ ++ switch (degrees) ++ { ++ case GDK_PIXBUF_ROTATE_NONE: ++ case GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE: ++ case GDK_PIXBUF_ROTATE_UPSIDEDOWN: ++ case GDK_PIXBUF_ROTATE_CLOCKWISE: ++ newpixbuf = gdk_pixbuf_rotate_simple (image->pixbuf, degrees); ++ gdk_pixbuf_unref (image->pixbuf); ++ image->pixbuf = newpixbuf; ++ return 0; ++ break; ++ default: ++ return 1; ++ } ++} ++ + + GdkPixbuf* image_pixbuf(gpaint_image* image) { + return image->pixbuf; +diff --git a/src/image.h b/src/image.h +index d2402f9..ab25f5f 100644 +--- a/src/image.h ++++ b/src/image.h +@@ -45,5 +45,6 @@ gpaint_image* image_from_selection(GdkPixmap *pixmap, gpaint_point_array *pa); + int image_flip_x(gpaint_image *image); + int image_flip_y(gpaint_image *image); + int image_rotate(gpaint_image *image, double radians); ++int image_rotate_simple(gpaint_image *image, int degrees); + GdkPixbuf* image_pixbuf(gpaint_image *image); + #endif +diff --git a/src/menu.c b/src/menu.c +index 29441f4..df2d647 100644 +--- a/src/menu.c ++++ b/src/menu.c +@@ -487,9 +487,9 @@ on_rotate_menu_activate (GtkMenuItem *menuitem, + + sscanf(name, "rotate_%c%d_menu", &sign, °rees); + debug2("sign = %c degrees = %d", sign, degrees); +- if (sign=='n') ++ if (sign=='p') + { +- degrees *= -1; ++ degrees = 360 - degrees; + } + canvas_focus_lost(canvas); + drawing_rotate(canvas->drawing, degrees); --- gpaint-0.3.3.orig/debian/patches/20_fix_line_width_combo.dpatch +++ gpaint-0.3.3/debian/patches/20_fix_line_width_combo.dpatch @@ -0,0 +1,351 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_fix_line_width_combo.dpatch by Thomas Viehmann +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes line width combo box by putting items in the drop down +## DP: part again in gpaint.glade. + +@DPATCH@ +diff -urNad gpaint-0.3.3~/gpaint.glade gpaint-0.3.3/gpaint.glade +--- gpaint-0.3.3~/gpaint.glade 2008-09-20 16:27:27.000000000 -0300 ++++ gpaint-0.3.3/gpaint.glade 2008-09-20 16:29:57.000000000 -0300 +@@ -1229,6 +1229,34 @@ + 0 + + ++ ++ True ++ line width ++ False ++ False ++ GTK_JUSTIFY_CENTER ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ 0 ++ 1 ++ 0 ++ 1 ++ ++ ++ ++ ++ + + 60 + 25 +@@ -1238,27 +1266,264 @@ + False + True + False +- + ++ + + +- ++ + True ++ line width + True + True + True + 0 + + True +- • ++ * + False ++ + + + + +- ++ + True + GTK_SELECTION_BROWSE ++ ++ ++ ++ True ++ ++ ++ ++ True ++ 1 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ True ++ 2 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ True ++ 3 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ True ++ 4 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ True ++ 5 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ True ++ 6 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ True ++ 7 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ True ++ 8 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ True ++ 9 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ + + + +@@ -1271,35 +1536,6 @@ + + + +- +- +- +- True +- line width +- False +- False +- GTK_JUSTIFY_CENTER +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- +- 0 +- 1 +- 0 +- 1 +- +- +- +- + + + --- gpaint-0.3.3.orig/debian/patches/00list +++ gpaint-0.3.3/debian/patches/00list @@ -0,0 +1,7 @@ +01_drawing +02_remove_menu_h_reference +#04_update_pt_br_translation +09_fix_menu_entry +10_fix_crash_on_font_select +11_fix_image_rotation +20_fix_line_width_combo --- gpaint-0.3.3.orig/debian/patches/10_fix_crash_on_font_select.dpatch +++ gpaint-0.3.3/debian/patches/10_fix_crash_on_font_select.dpatch @@ -0,0 +1,96 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_fix_crash_on_font_select.dpatch by Goedson Teixeira Paixao +## +## DP: Makes the font selection button active only when the text tool +## DP: is selected avoid a crash that would occur when the user selects +## DP: a font without selecting the text tool. + +@DPATCH@ +diff --git a/gpaint.glade b/gpaint.glade +index 1437dbb..d2c789e 100644 +--- a/gpaint.glade ++++ b/gpaint.glade +@@ -1137,6 +1137,7 @@ + + + True ++ False + True + True + True +diff --git a/src/main.c b/src/main.c +index c382735..273e2ff 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -73,6 +73,10 @@ static void main_window_ui_initial_adjustment(GtkWidget *main_window) + tool_palette_set_active_button(main_window, "pen_button"); + /* make the pen tool the default initial tool so the user can draw right away */ + ++ gpaint_tool *text_tool = tool_palette_get_tool(main_window, "text"); ++ widget = lookup_widget(main_window, "fontpicker"); ++ text_set_fontpicker(text_tool, widget); ++ + #if (!defined(HAVE_GTK_PRINT) && !defined(HAVE_GNOME_PRINT)) + /* disable print menus and buttons if no print support available*/ + widget = lookup_widget(main_window, "print_button"); +diff --git a/src/text.c b/src/text.c +index 810bc94..af9dc58 100644 +--- a/src/text.c ++++ b/src/text.c +@@ -54,6 +54,7 @@ typedef struct _gpaint_text + GString *textbuf; + int max_width; + int max_height; ++ GtkFontButton *fontpicker; + } gpaint_text; + + +@@ -94,6 +95,7 @@ gpaint_tool *text_create(const char *name) + GPAINT_TOOL(text)->commit_change = text_commit_change; + + text->textbuf = g_string_new(0); ++ text->fontpicker = NULL; + return GPAINT_TOOL(text); + } + +@@ -118,6 +120,7 @@ text_select(gpaint_tool *tool) + g_string_printf(text->textbuf, ""); + text->timer = g_timeout_add(TEXT_CURSOR_BLINK_RATE, + (GtkFunction)(text_handle_timeout), text); ++ gtk_widget_set_sensitive(GTK_WIDGET(text->fontpicker), TRUE); + } + + static void +@@ -145,7 +148,7 @@ text_deselect(gpaint_tool *tool) + text_draw_string(text); + } + text_clear(text); +- ++ gtk_widget_set_sensitive(GTK_WIDGET(text->fontpicker), FALSE); + } + + static gboolean +@@ -474,6 +477,8 @@ static void set_layout_foreground_color(PangoLayout *layout, GdkColor *foregroun + + } + +- +- +- ++void text_set_fontpicker(gpaint_tool *tool, GtkFontButton *fontpicker) ++{ ++ gpaint_text *text = GPAINT_TEXT(tool); ++ text->fontpicker = fontpicker; ++} +diff --git a/src/text.h b/src/text.h +index aa64291..9b8c7ac 100644 +--- a/src/text.h ++++ b/src/text.h +@@ -30,6 +30,6 @@ + + + gpaint_tool* text_create(const char *name); +- ++void text_set_fontpicker(gpaint_tool *tool, GtkFontButton *fontpicker); + + #endif --- gpaint-0.3.3.orig/debian/patches/01_drawing.dpatch +++ gpaint-0.3.3/debian/patches/01_drawing.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_drawing.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gpaint-0.3.3~/src/drawing.c gpaint-0.3.3/src/drawing.c +--- gpaint-0.3.3~/src/drawing.c 2007-09-08 21:49:46.000000000 -0300 ++++ gpaint-0.3.3/src/drawing.c 2007-09-19 17:00:35.000000000 -0300 +@@ -427,7 +427,7 @@ + _("Do you want to save the changes you made to \"%s\"?\nYour changes will be lost if you don't save them."), + drawing->filename->str); + #ifdef GTK_STOCK_DISCARD +- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_DISCARD,GTK_RESPONSE_DISCARD); ++ gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_DISCARD,GTK_RESPONSE_NO); + #else + gtk_dialog_add_button(GTK_DIALOG(dialog), _("Close _without Saving"), GTK_RESPONSE_NO); + #endif /* !GTK_STOCK_DISCARD */ --- gpaint-0.3.3.orig/debian/patches/02_remove_menu_h_reference.dpatch +++ gpaint-0.3.3/debian/patches/02_remove_menu_h_reference.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_remove_old_reference_to_menu_h.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Removes a reference to a non-existing menu.h file + +@DPATCH@ +diff -urNad gpaint-0.3.1~/src/menu.c gpaint-0.3.1/src/menu.c +--- gpaint-0.3.1~/src/menu.c 2007-06-11 05:34:57.000000000 -0300 ++++ gpaint-0.3.1/src/menu.c 2007-06-12 18:42:29.000000000 -0300 +@@ -31,7 +31,6 @@ + #include "image.h" + #include "image_processing.h" + #include "tool_palette.h" +-#include "menu.h" + #include "print.h" + #include "file.h" +