[med-svn] r3409 - in trunk/packages/gwyddion/trunk/debian: . patches
Jan Beyer
beathovn-guest at alioth.debian.org
Thu May 21 20:14:49 UTC 2009
Author: beathovn-guest
Date: 2009-05-21 20:14:49 +0000 (Thu, 21 May 2009)
New Revision: 3409
Removed:
trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.14-browser-invalid-iter.patch
Modified:
trunk/packages/gwyddion/trunk/debian/changelog
trunk/packages/gwyddion/trunk/debian/copyright
trunk/packages/gwyddion/trunk/debian/patches/series
Log:
New upstream release.
-- Dese und die folgenden Zeilen werden ignoriert --
M trunk/debian/patches/series
D trunk/debian/patches/gwyddion-2.14-browser-invalid-iter.patch
M trunk/debian/changelog
M trunk/debian/copyright
Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog 2009-05-21 13:16:07 UTC (rev 3408)
+++ trunk/packages/gwyddion/trunk/debian/changelog 2009-05-21 20:14:49 UTC (rev 3409)
@@ -1,7 +1,15 @@
+gwyddion (2.15-1) unstable; urgency=low
+
+ * New upstream release.
+ - Dropping upstream patch gwyddion-2.14-browser-invalid-iter.patch
+ which was added in 2.14-2.
+
+ -- Jan Beyer <jan at beathovn.de> Thu, 21 May 2009 20:47:54 +0200
+
gwyddion (2.14-2) unstable; urgency=low
* Incorporating an upstream patch to fix critical warnings on creation of
- new channels or graphs, which may lead to a shutdown of gwyddion.
+ new channels or graphs, which may lead to a shutdown of gwyddion.
* Make backporter's life easier by adjusting build-dependency for FFTW3 to
libfftw3 | fftw3.
Modified: trunk/packages/gwyddion/trunk/debian/copyright
===================================================================
--- trunk/packages/gwyddion/trunk/debian/copyright 2009-05-21 13:16:07 UTC (rev 3408)
+++ trunk/packages/gwyddion/trunk/debian/copyright 2009-05-21 20:14:49 UTC (rev 3409)
@@ -28,7 +28,7 @@
PARTICULAR PURPOSE.
Files: INSTALL
-Copyright: Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free SoftwareFoundation, Inc.
+Copyright: Copyright 1994-1996, 1999- 2002 Free SoftwareFoundation, Inc.
License: other
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -59,7 +59,7 @@
Copyright: Copyright 2007 Petr Klapetek <klapetek at gwyddion.net>
License: GPL-2+
-Files: app/validate.[c,h], libgwyddion/gwymathfallback.h, libgwydgets/gwygrainvaluemenu.[c,h], libprocess/gwygrainvalue.[c,h], modules/file/burleigh_exp.c, modules/file/gwytiff.h, modules/file/mapvue.c, modules/file/sensolytics.c, modules/file/shimadzu.c, modules/file/spip-asc.c, modules/process/acf2d.c, modules/process/fft_synth.c, modules/process/grain_cross.c, modules/process/mark_with.c, modules/tools/grainmeasure.c, modules/tools/pathlevel.c, modules/file/opdfile.c, modules/file/rawgraph.c, modules/spmlabf.c, modules/process/tilt.c
+Files: app/validate.[c,h], libgwyddion/gwymathfallback.h, libgwydgets/gwygrainvaluemenu.[c,h], libprocess/gwygrainvalue.[c,h], modules/file/burleigh_exp.c, modules/file/gwytiff.h, modules/file/mapvue.c, modules/file/sensolytics.c, modules/file/shimadzu.c, modules/file/spip-asc.c, modules/process/acf2d.c, modules/process/fft_synth.c, modules/process/grain_cross.c, modules/process/mark_with.c, modules/tools/grainmeasure.c, modules/tools/pathlevel.c, modules/file/nanoeducator.c, modules/file/opdfile.c, modules/file/rawgraph.c, modules/spmlabf.c, modules/process/tilt.c
Copyright: Copyright 2007-2009 David Necas (Yeti) <yeti at gwyddion.net>
License: GPL-2+
@@ -90,10 +90,10 @@
FSF changes to this file are in the public domain.
-Files: libgwyddion/gwyfdcurvepreset.c, libgwyddion/gwynlfit.[c,h], libgwyddion/gwynlfitpreset.[c,h]
-Copyright: Copyright 2000-2003 Martin Siler
-Copyright: Copyright 2004, 2005 David Necas (Yeti) <yeti at gwyddion.net>
-Copyright: Copyright 2004, 2005 Petr Klapetek <klapetek at gwyddion.net>
+Files: libgwyddion/gwyfdcurvepreset.c, libgwyddion/gwynlfit.[c,h], libgwyddion/gwynlfitpreset.[c,h], libgwydgets/gwy3dview.[c,h]
+Copyright: Copyright 2000-2004 Martin Siler <silerm at physics.muni.cz>
+Copyright: Copyright 2003-2006 David Necas (Yeti) <yeti at gwyddion.net>
+Copyright: Copyright 2003-2006 Petr Klapetek <klapetek at gwyddion.net>
License: GPL-2+
Files: libgwyddion/gwymath.c
@@ -103,10 +103,6 @@
and the GNU Lesser General Public License (LGPL) can be found in
`/usr/share/common-licenses/'.
-Files: libgwydgets/gwy3dview.[c,h]
-Copyright: Copyright 2004 Martin Siler <silerm at physics.muni.cz>
-License: GPL-2+
-
Files: libgwydgets/gwycolorbutton.[c,h]
Copyright: Copyright 1998, 1999 Red Hat, Inc.
License: LGPL-2+
Deleted: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.14-browser-invalid-iter.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.14-browser-invalid-iter.patch 2009-05-21 13:16:07 UTC (rev 3408)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.14-browser-invalid-iter.patch 2009-05-21 20:14:49 UTC (rev 3409)
@@ -1,129 +0,0 @@
-Author: upstream
-Copyright: the same as gwyddion
-License: the same as gwyddion
-Description: Fixes Critical warnings when a new channel or graph is created,
- depending on your runtime Gtk+ environment Gwyddion might abort on such
- warning.
---- gwyddion-2.14.orig/app/data-browser.c
-+++ gwyddion-2.14/app/data-browser.c
-@@ -497,11 +497,10 @@
- static void
- gwy_app_data_proxy_add_object(GwyAppDataList *list,
- gint i,
-+ GtkTreeIter *iter,
- GObject *object)
- {
-- GtkTreeIter iter;
--
-- gtk_list_store_insert_with_values(list->store, &iter, G_MAXINT,
-+ gtk_list_store_insert_with_values(list->store, iter, G_MAXINT,
- MODEL_ID, i,
- MODEL_OBJECT, object,
- MODEL_WIDGET, NULL,
-@@ -584,12 +583,14 @@
- static void
- gwy_app_data_proxy_connect_channel(GwyAppDataProxy *proxy,
- gint i,
-+ GtkTreeIter *iter,
- GObject *object)
- {
- gchar key[24];
- GQuark quark;
-
-- gwy_app_data_proxy_add_object(&proxy->lists[PAGE_CHANNELS], i, object);
-+ gwy_app_data_proxy_add_object(&proxy->lists[PAGE_CHANNELS], i, iter,
-+ object);
- g_snprintf(key, sizeof(key), "/%d/data", i);
- gwy_debug("%p: %d in %p", object, i, proxy->container);
- quark = g_quark_from_string(key);
-@@ -700,11 +701,13 @@
- static void
- gwy_app_data_proxy_connect_graph(GwyAppDataProxy *proxy,
- gint i,
-+ GtkTreeIter *iter,
- GObject *object)
- {
- GQuark quark;
-
-- gwy_app_data_proxy_add_object(&proxy->lists[PAGE_GRAPHS], i, object);
-+ gwy_app_data_proxy_add_object(&proxy->lists[PAGE_GRAPHS], i, iter,
-+ object);
- gwy_debug("%p: %d in %p", object, i, proxy->container);
- quark = gwy_app_get_graph_key_for_id(i);
- g_object_set_qdata(object, container_quark, proxy->container);
-@@ -813,11 +816,12 @@
- static void
- gwy_app_data_proxy_connect_spectra(GwyAppDataProxy *proxy,
- gint i,
-+ GtkTreeIter *iter,
- GObject *object)
- {
- GQuark quark;
-
-- gwy_app_data_proxy_add_object(&proxy->lists[PAGE_SPECTRA], i, object);
-+ gwy_app_data_proxy_add_object(&proxy->lists[PAGE_SPECTRA], i, iter, object);
- gwy_debug("%p: %d in %p", object, i, proxy->container);
- quark = gwy_app_get_spectra_key_for_id(i);
- g_object_set_qdata(object, container_quark, proxy->container);
-@@ -906,6 +910,7 @@
- GwyAppDataProxy *proxy = (GwyAppDataProxy*)userdata;
- const gchar *strkey;
- GwyAppKeyType type;
-+ GtkTreeIter iter;
- GObject *object;
- gint i;
-
-@@ -920,7 +925,7 @@
- g_return_if_fail(G_VALUE_HOLDS_OBJECT(gvalue));
- object = g_value_get_object(gvalue);
- g_return_if_fail(GWY_IS_DATA_FIELD(object));
-- gwy_app_data_proxy_connect_channel(proxy, i, object);
-+ gwy_app_data_proxy_connect_channel(proxy, i, &iter, object);
- break;
-
- case KEY_IS_GRAPH:
-@@ -928,7 +933,7 @@
- g_return_if_fail(G_VALUE_HOLDS_OBJECT(gvalue));
- object = g_value_get_object(gvalue);
- g_return_if_fail(GWY_IS_GRAPH_MODEL(object));
-- gwy_app_data_proxy_connect_graph(proxy, i, object);
-+ gwy_app_data_proxy_connect_graph(proxy, i, &iter, object);
- break;
-
- case KEY_IS_SPECTRA:
-@@ -936,7 +941,7 @@
- g_return_if_fail(G_VALUE_HOLDS_OBJECT(gvalue));
- object = g_value_get_object(gvalue);
- g_return_if_fail(GWY_IS_SPECTRA(object));
-- gwy_app_data_proxy_connect_spectra(proxy, i, object);
-+ gwy_app_data_proxy_connect_spectra(proxy, i, &iter, object);
- break;
-
- case KEY_IS_MASK:
-@@ -1101,7 +1106,7 @@
- found ? "present" : "missing");
- g_return_if_fail(object || found);
- if (object && !found)
-- gwy_app_data_proxy_connect_channel(proxy, id, object);
-+ gwy_app_data_proxy_connect_channel(proxy, id, &iter, object);
- else if (!object && found)
- gwy_app_data_proxy_disconnect_channel(proxy, &iter);
- else {
-@@ -1124,7 +1129,7 @@
- found ? "present" : "missing");
- g_return_if_fail(object || found);
- if (object && !found)
-- gwy_app_data_proxy_connect_graph(proxy, id, object);
-+ gwy_app_data_proxy_connect_graph(proxy, id, &iter, object);
- else if (!object && found)
- gwy_app_data_proxy_disconnect_graph(proxy, &iter);
- else {
-@@ -1147,7 +1152,7 @@
- found ? "present" : "missing");
- g_return_if_fail(object || found);
- if (object && !found)
-- gwy_app_data_proxy_connect_spectra(proxy, id, object);
-+ gwy_app_data_proxy_connect_spectra(proxy, id, &iter, object);
- else if (!object && found)
- gwy_app_data_proxy_disconnect_spectra(proxy, &iter);
- else {
Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series 2009-05-21 13:16:07 UTC (rev 3408)
+++ trunk/packages/gwyddion/trunk/debian/patches/series 2009-05-21 20:14:49 UTC (rev 3409)
@@ -1,3 +1,2 @@
fix-manpage-section-for-debian.diff
fix-rpath-issue.patch
-gwyddion-2.14-browser-invalid-iter.patch
More information about the debian-med-commit
mailing list