[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Would it be possible to have gpaint 0.3.3-2 in lenny

[ Please CC me on replies, since I'm not subscribed to the list ]

Hi,

Thomas Viehmann recently uploaded gpaint 0.3.3-1.1 fixing gpaint's only RC bug (497484) which, hopefully, will be able to migrate into lenny (it's still 3 of 10 days old). I'm wondering if it would be possible to upload 0.3.3-2 now and have it still be included in Lenny. This revision completes the fix uploaded by Thomas and fixes another annoying crash in gpaint. Here's the relevant debian/changelog entry (the complete diff from 0.3.3-1.1 to 0.3.3-2 is attached to this message):

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.

 -- Goedson Teixeira Paixao <goedson@debian.org>  Tue, 23 Sep 2008 15:20:14 -0300

Should I upload 0.3.3-2 right now or should I wait 0.3.3-1.1 to migrate before uploading?

Best Regards,
Goedson

diff --git a/debian/changelog b/debian/changelog
index c13b214..f9a4ae6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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.
+
+ -- Goedson Teixeira Paixao <goedson@debian.org>  Tue, 23 Sep 2008 15:20:14 -0300
+
 gpaint (0.3.3-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 1711754..277d03b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,8 @@
 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 <goedson@debian.org>
 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
diff --git a/debian/patches/00list b/debian/patches/00list
index 200d9d0..055fe1c 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,4 +2,5 @@
 02_remove_menu_h_reference
 #04_update_pt_br_translation
 09_fix_menu_entry
+10_fix_crash_on_font_select
 20_fix_line_width_combo
diff --git a/debian/patches/01_drawing.dpatch b/debian/patches/01_drawing.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/02_remove_menu_h_reference.dpatch b/debian/patches/02_remove_menu_h_reference.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/09_fix_menu_entry.dpatch b/debian/patches/09_fix_menu_entry.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/10_fix_crash_on_font_select.dpatch b/debian/patches/10_fix_crash_on_font_select.dpatch
new file mode 100755
index 0000000..f90129a
--- /dev/null
+++ b/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 <goedson@debian.org>
+##
+## 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 @@
+ 		  <child>
+ 		    <widget class="GtkFontButton" id="fontpicker">
+ 		      <property name="visible">True</property>
++		      <property name="sensitive">False</property>
+ 		      <property name="can_focus">True</property>
+ 		      <property name="show_style">True</property>
+ 		      <property name="show_size">True</property>
+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
diff --git a/debian/patches/20_fix_line_width_combo.dpatch b/debian/patches/20_fix_line_width_combo.dpatch
old mode 100644
new mode 100755
index 3c01d8e..2208dec
--- a/debian/patches/20_fix_line_width_combo.dpatch
+++ b/debian/patches/20_fix_line_width_combo.dpatch
@@ -6,8 +6,9 @@
 ## DP: part again in gpaint.glade.
 
 @DPATCH@
---- gpaint-0.3.3~/gpaint.glade
-+++ gpaint-0.3.3/gpaint.glade
+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 @@
  		      <property name="column_spacing">0</property>
  
@@ -43,7 +44,7 @@
  			<widget class="GtkCombo" id="line_width_combo">
  			  <property name="width_request">60</property>
  			  <property name="height_request">25</property>
-@@ -1238,27 +1266,211 @@
+@@ -1238,27 +1266,264 @@
  			  <property name="case_sensitive">False</property>
  			  <property name="enable_arrow_keys">True</property>
  			  <property name="enable_arrows_always">False</property>
@@ -186,7 +187,7 @@
 +				  <child>
 +				    <widget class="GtkLabel" id="convertwidget11">
 +				      <property name="visible">True</property>
-+				      <property name="label" translatable="yes">6</property>
++				      <property name="label" translatable="yes">5</property>
 +				      <property name="use_underline">False</property>
 +				      <property name="use_markup">False</property>
 +				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -205,6 +206,7 @@
 +				</widget>
 +			      </child>
 +
++
 +			      <child>
 +				<widget class="GtkListItem" id="convertwidget12">
 +				  <property name="visible">True</property>
@@ -212,7 +214,7 @@
 +				  <child>
 +				    <widget class="GtkLabel" id="convertwidget13">
 +				      <property name="visible">True</property>
-+				      <property name="label" translatable="yes">8</property>
++				      <property name="label" translatable="yes">6</property>
 +				      <property name="use_underline">False</property>
 +				      <property name="use_markup">False</property>
 +				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -238,7 +240,59 @@
 +				  <child>
 +				    <widget class="GtkLabel" id="convertwidget15">
 +				      <property name="visible">True</property>
-+				      <property name="label" translatable="yes"></property>
++				      <property name="label" translatable="yes">7</property>
++				      <property name="use_underline">False</property>
++				      <property name="use_markup">False</property>
++				      <property name="justify">GTK_JUSTIFY_LEFT</property>
++				      <property name="wrap">False</property>
++				      <property name="selectable">False</property>
++				      <property name="xalign">0</property>
++				      <property name="yalign">0.5</property>
++				      <property name="xpad">0</property>
++				      <property name="ypad">0</property>
++				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++				      <property name="width_chars">-1</property>
++				      <property name="single_line_mode">False</property>
++				      <property name="angle">0</property>
++				    </widget>
++				  </child>
++				</widget>
++			      </child>
++
++			      <child>
++				<widget class="GtkListItem" id="convertwidget16">
++				  <property name="visible">True</property>
++
++				  <child>
++				    <widget class="GtkLabel" id="convertwidget17">
++				      <property name="visible">True</property>
++				      <property name="label" translatable="yes">8</property>
++				      <property name="use_underline">False</property>
++				      <property name="use_markup">False</property>
++				      <property name="justify">GTK_JUSTIFY_LEFT</property>
++				      <property name="wrap">False</property>
++				      <property name="selectable">False</property>
++				      <property name="xalign">0</property>
++				      <property name="yalign">0.5</property>
++				      <property name="xpad">0</property>
++				      <property name="ypad">0</property>
++				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++				      <property name="width_chars">-1</property>
++				      <property name="single_line_mode">False</property>
++				      <property name="angle">0</property>
++				    </widget>
++				  </child>
++				</widget>
++			      </child>
++
++			      <child>
++				<widget class="GtkListItem" id="convertwidget18">
++				  <property name="visible">True</property>
++
++				  <child>
++				    <widget class="GtkLabel" id="convertwidget19">
++				      <property name="visible">True</property>
++				      <property name="label" translatable="yes">9</property>
 +				      <property name="use_underline">False</property>
 +				      <property name="use_markup">False</property>
 +				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -259,7 +313,7 @@
  			    </widget>
  			  </child>
  			</widget>
-@@ -1271,35 +1483,6 @@
+@@ -1271,35 +1536,6 @@
  			  <property name="y_options"></property>
  			</packing>
  		      </child>
Reply to: