[med-svn] r13063 - in trunk/packages/gwyddion/trunk/debian: . patches

[Jan Beyer]

Author: beathovn-guest
Date: 2013-02-22 20:10:38 +0000 (Fri, 22 Feb 2013)
New Revision: 13063

Removed:
   trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.30-color-button-debris-crash.patch
Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/patches/series
Log:
Prepare new upstream release. Remove patch applied upstream.

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2013-02-22 19:59:49 UTC (rev 13062)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2013-02-22 20:10:38 UTC (rev 13063)
@@ -1,3 +1,9 @@
+gwyddion (2.31-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Jan Beyer <jan at beathovn.de>  Fri, 22 Feb 2013 21:07:16 +0100
+
 gwyddion (2.30-2) experimental; urgency=low
 
   * Include upstream patch to fix crashing colour selectors

Deleted: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.30-color-button-debris-crash.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.30-color-button-debris-crash.patch	2013-02-22 19:59:49 UTC (rev 13062)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.30-color-button-debris-crash.patch	2013-02-22 20:10:38 UTC (rev 13063)
@@ -1,41 +0,0 @@
-Description: fixes crash changing mask colour in various data processing functions
-Forwarded: not-needed
-Author: David Necas <yeti at gwyddion.net>
-
-Index: modules/file/pixmap.c
-===================================================================
---- gwyddion-2.30.orig/modules/file/pixmap.c	(revision 13902)
-+++ gwyddion-2.30/modules/file/pixmap.c	(revision 13903)
-@@ -2933,8 +2933,6 @@
-     gwy_rgba_to_gdk_color(&controls->args->inset_color, &gdkcolor);
- 
-     dialog = gtk_color_selection_dialog_new(_("Change Inset Color"));
--    if (gtk_major_version == 2 && gtk_minor_version < 10)
--
-     selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel;
-     gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(selector),
-                                           &gdkcolor);
-Index: libgwydgets/gwygraphareadialog.c
-===================================================================
---- gwyddion-2.30.orig/libgwydgets/gwygraphareadialog.c	(revision 13902)
-+++ gwyddion-2.30/libgwydgets/gwygraphareadialog.c	(revision 13903)
-@@ -383,7 +383,6 @@
-     dialog->color_dialog = selector;
-     dialog->old_color = cmodel->color;
- 
--    if (gtk_major_version == 2 && gtk_minor_version < 10)
-     colorsel = GTK_COLOR_SELECTION_DIALOG(selector)->colorsel;
-     g_signal_connect(selector, "response",
-                      G_CALLBACK(colorsel_response_cb), dialog);
-Index: libgwydgets/gwydgetutils.c
-===================================================================
---- gwyddion-2.30.orig/libgwydgets/gwydgetutils.c	(revision 13902)
-+++ gwyddion-2.30/libgwydgets/gwydgetutils.c	(revision 13903)
-@@ -561,7 +561,6 @@
-     dialog = gtk_color_selection_dialog_new(dialog_title
-                                             ? dialog_title
-                                             : _("Change Mask Color"));
--    if (gtk_major_version == 2 && gtk_minor_version < 10)
-     selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel;
-     gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(selector),
-                                           &gdkcolor);

Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series	2013-02-22 19:59:49 UTC (rev 13062)
+++ trunk/packages/gwyddion/trunk/debian/patches/series	2013-02-22 20:10:38 UTC (rev 13063)
@@ -1,3 +1,2 @@
 fix-manpage-section-for-debian.diff
 fix-rpath-issue.patch
-gwyddion-2.30-color-button-debris-crash.patch