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

[Jan Beyer]

Author: beathovn-guest
Date: 2015-05-17 18:12:35 +0000 (Sun, 17 May 2015)
New Revision: 19243

Removed:
   trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.38-stat-tool-save-crash.patch
Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/control
   trunk/packages/gwyddion/trunk/debian/copyright
   trunk/packages/gwyddion/trunk/debian/patches/series
Log:
changes for gwyddion 2.40-1 release.


Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2015-05-15 19:13:23 UTC (rev 19242)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2015-05-17 18:12:35 UTC (rev 19243)
@@ -1,3 +1,11 @@
+gwyddion (2.40-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/control:
+    - New standards version 3.9.6 (no changes needed)
+
+ -- Jan Beyer <jan at beathovn.de>  Thu, 07 May 2015 21:52:24 +0200
+
 gwyddion (2.38-2) unstable; urgency=medium
 
   * Include upstream patch to fix a crash when saving results from

Modified: trunk/packages/gwyddion/trunk/debian/control
===================================================================
--- trunk/packages/gwyddion/trunk/debian/control	2015-05-15 19:13:23 UTC (rev 19242)
+++ trunk/packages/gwyddion/trunk/debian/control	2015-05-17 18:12:35 UTC (rev 19243)
@@ -7,7 +7,7 @@
 Build-Depends: cdbs, debhelper (>= 9), autotools-dev, pkg-config (>= 0.16),
  libgtk2.0-dev (>= 2.14), libgtkglext1-dev, libfftw3-dev|fftw3-dev,
  libxmu6, python-gtk2-dev, libgtksourceview2.0-dev, python, ruby, libgconf2-dev, libxml2-dev, chrpath
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gwyddion/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/gwyddion/trunk/
 Homepage: http://gwyddion.net/

Modified: trunk/packages/gwyddion/trunk/debian/copyright
===================================================================
--- trunk/packages/gwyddion/trunk/debian/copyright	2015-05-15 19:13:23 UTC (rev 19242)
+++ trunk/packages/gwyddion/trunk/debian/copyright	2015-05-17 18:12:35 UTC (rev 19243)
@@ -5,7 +5,7 @@
 Source: http://gwyddion.net/download
 
 Files: *
-Copyright: 2003-2014 David Necas (Yeti) <yeti at gwyddion.net>
+Copyright: 2003-2015 David Necas (Yeti) <yeti at gwyddion.net>
            2003-2014 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
@@ -224,12 +224,12 @@
 Copyright: 2009 Francois Bianco (fbianco) <francois.bianco at unige.ch>
 License: GPL-2+
 
-Files: modules/file/nanoscantech.c modules/file/oldmda.c modules/file/tiaser.c
+Files: modules/file/nanoscantech.c modules/file/oldmda.c modules/file/renishaw.c modules/file/tiaser.c
        modules/file/wipfile.c modules/graph/graph_dos_spectrum.c modules/graph/graph_filter.c
        modules/process/averaging.c modules/process/grain_edge.c modules/process/mcrop.c
-Copyright: 2010-2012 David Necas (Yeti) <yeti at gwyddion.net>
+Copyright: 2010-2014 David Necas (Yeti) <yeti at gwyddion.net>
            2010-2012 Petr Klapetek <klapetek at gwyddion.net>
-           2010-2012 Daniil Bratashov <dn2010 at gmail.com>
+           2010-2014 Daniil Bratashov <dn2010 at gmail.com>
 License: GPL-2+
 
 Files: libprocess/natural.[ch]
@@ -267,11 +267,11 @@
 Copyright: 2013 Brazilian Nanotechnology National Laboratory
 License: GPL-3+
 
-Files: modules/volume/volume_kmeans.c
+Files: modules/volume/volume_kmeans.c modules/volume/volume_kmedians.c
 Copyright: 2003 David Necas (Yeti) <yeti at gwyddion.net>
            2003 Petr Klapetek <klapetek at gwyddion.net>
            2003 Daniil Bratashov <dn2010 at gmail.com>
-           2003 Evgeniy Ryabov
+           2003 Evgeniy Ryabov <k1u2r3ka at mail.ru>
 License: GPL-2+
 
 License: GPL-2+

Deleted: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.38-stat-tool-save-crash.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.38-stat-tool-save-crash.patch	2015-05-15 19:13:23 UTC (rev 19242)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.38-stat-tool-save-crash.patch	2015-05-17 18:12:35 UTC (rev 19243)
@@ -1,15 +0,0 @@
-Description: This upstream patch fixes a crash when saving results from the Statistics tool.
-Forwarded: no
-Author: David Nečas (Yeti) <yeti at gwyddion.net>
-
---- old/modules/tools/stats.c	(revision 16602)
-+++ new/modules/tools/stats.c	(working copy)
-@@ -1096,7 +1096,7 @@
-     area = report_data->same_units ? fmt_val(area) : g_strdup(_("N.A."));
-     projarea = fmt_val(projarea);
- 
--    vf = gwy_si_unit_get_format_with_digits(siunitarea,
-+    vf = gwy_si_unit_get_format_with_digits(siunitvar,
-                                             GWY_SI_UNIT_FORMAT_PLAIN,
-                                             report_data->results.var, 3, vf);
-     var = fmt_val(var);

Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series	2015-05-15 19:13:23 UTC (rev 19242)
+++ trunk/packages/gwyddion/trunk/debian/patches/series	2015-05-17 18:12:35 UTC (rev 19243)
@@ -1,3 +1,2 @@
 fix-manpage-section-for-debian.diff
 fix-rpath-issue.patch
-gwyddion-2.38-stat-tool-save-crash.patch