Author: beathovn-guest Date: 2009-12-17 21:18:44 +0000 (Thu, 17 Dec 2009) New Revision: 4455
Removed: trunk/packages/gwyddion/trunk/debian/patches/fix-shared-mime-info.patch trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.18-remote-new-x11.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. Two patches removed. copyright updated. Modified: trunk/packages/gwyddion/trunk/debian/changelog =================================================================== --- trunk/packages/gwyddion/trunk/debian/changelog 2009-12-16 16:58:37 UTC (rev 4454) +++ trunk/packages/gwyddion/trunk/debian/changelog 2009-12-17 21:18:44 UTC (rev 4455) @@ -1,3 +1,12 @@ +gwyddion (2.19-1) unstable; urgency=low + + * New upstream release + * Removed patch gwyddion-2.18-remote-new-x11.patch, as the problem is fixed + upstream + * Removed patch fix-shared-mime-info.patch, as the problem is fixed upstream + + -- Jan Beyer <j...@beathovn.de> Thu, 17 Dec 2009 22:17:12 +0100 + gwyddion (2.18-2) unstable; urgency=low * Include patch gwyddion-2.18-remote-new-x11.patch from upstream, Modified: trunk/packages/gwyddion/trunk/debian/copyright =================================================================== --- trunk/packages/gwyddion/trunk/debian/copyright 2009-12-16 16:58:37 UTC (rev 4454) +++ trunk/packages/gwyddion/trunk/debian/copyright 2009-12-17 21:18:44 UTC (rev 4455) @@ -59,7 +59,7 @@ Copyright: Copyright 2007 Petr Klapetek <klape...@gwyddion.net> License: GPL-2+ -Files: app/remote-unique.c, app/validate.[c,h], libgwyddion/gwymathfallback.h, libgwydgets/gwygrainvaluemenu.[c,h], libprocess/gwygrainvalue.[c,h], libprocess/triangulation.[c,h], modules/file/attocube.c, modules/file/burleigh_exp.c, modules/file/gwytiff.h, modules/file/mapvue.c, modules/file/nanoscan.c, modules/file/pltfile.c, modules/file/rawxyz.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/igorfile.c, modules/file/nanoeducator.c, modules/file/nanonics.c, modules/file/opdfile.c, modules/file/rawgraph.c, modules/file/rhk-sm4.c, modules/spmlabf.c, modules/process/curvature.c, modules/process/dimensions.h, modules/process/obj_synth.c, modules/process/tilt.c, modules/process/fft_profile.c, modules/tools/selectionmanager.c +Files: app/remote-unique.c, app/validate.[c,h], libgwyddion/gwymathfallback.h, libgwydgets/gwygrainvaluemenu.[c,h], libprocess/gwygrainvalue.[c,h], libprocess/triangulation.[c,h], modules/file/aistfile.c, modules/file/attocube.c, modules/file/burleigh_exp.c, modules/file/gwytiff.h, modules/file/mapvue.c, modules/file/nanoscan.c, modules/file/pltfile.c, modules/file/pt3file.c, modules/file/rawxyz.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/igorfile.c, modules/file/nanoeducator.c, modules/file/nanonics.c, modules/file/opdfile.c, modules/file/rawgraph.c, modules/file/rhk-sm4.c, modules/spmlabf.c, modules/process/curvature.c, modules/process/dimensions.h, modules/process/obj_synth.c, modules/process/tilt.c, modules/process/fft_profile.c, modules/tools/selectionmanager.c Copyright: Copyright 2007-2009 David Necas (Yeti) <y...@gwyddion.net> License: GPL-2+ @@ -230,3 +230,7 @@ Copyright: Copyright 2009 Andrey Gruzdev <gruz...@ntmdt.ru> License: GPL-2+ +Files: modules/file/omicronflat.c +Copyright: Copyright 2009 Francois Bianco (fbianco) <francois.bia...@unige.ch> +License: GPL-2+ + Deleted: trunk/packages/gwyddion/trunk/debian/patches/fix-shared-mime-info.patch =================================================================== --- trunk/packages/gwyddion/trunk/debian/patches/fix-shared-mime-info.patch 2009-12-16 16:58:37 UTC (rev 4454) +++ trunk/packages/gwyddion/trunk/debian/patches/fix-shared-mime-info.patch 2009-12-17 21:18:44 UTC (rev 4455) @@ -1,26 +0,0 @@ -Description: fix a wrong offset notation -Forwarded: private mail to maintainer 2009-11-06 -Author: Jan Beyer <j...@beathovn.de> - ---- gwyddion-2.18.orig/data/gwyddion.xml -+++ gwyddion-2.18/data/gwyddion.xml -@@ -350,7 +350,7 @@ - <comment>Nanosurf PLT data</comment> - <magic priority="80"> - <match type="string" offset="0" value="#Channel: "> -- <match type="string" offset="12-32" value="#Frame :"/> -+ <match type="string" offset="12:32" value="#Frame :"/> - </match> - </magic> - <glob pattern="*.plt"/> ---- gwyddion-2.18.orig/modules/file/pltfile.c -+++ gwyddion-2.18/modules/file/pltfile.c -@@ -23,7 +23,7 @@ - * <comment>Nanosurf PLT data</comment> - * <magic priority="80"> - * <match type="string" offset="0" value="#Channel: "> -- * <match type="string" offset="12-32" value="#Frame :"/> -+ * <match type="string" offset="12:32" value="#Frame :"/> - * </match> - * </magic> - * <glob pattern="*.plt"/> Deleted: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.18-remote-new-x11.patch =================================================================== --- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.18-remote-new-x11.patch 2009-12-16 16:58:37 UTC (rev 4454) +++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.18-remote-new-x11.patch 2009-12-17 21:18:44 UTC (rev 4455) @@ -1,20 +0,0 @@ -From: David Necas (Yeti) <y...@gwyddion.net> -Subject: Fixes failure to start with option --remote-new on X11 which is how the - default desktop menu entries and launchers run Gwyddion. -Origin: upstream, http://gwyddion.net/download/2.18/gwyddion-2.18-remote-new-x11.patch - -Index: gwyddion-2.18/app/remote-x11.c -=================================================================== ---- gwyddion-2.18-old/app/remote-x11.c (revision 10360) -+++ gwyddion-2.18/app/remote-x11.c (revision 10361) -@@ -132,6 +132,10 @@ - } - - XFree(xchildren); -+ if (!remote->winid) { -+ gwy_remote_free(remote); -+ remote = NULL; -+ } - - return remote; - } Modified: trunk/packages/gwyddion/trunk/debian/patches/series =================================================================== --- trunk/packages/gwyddion/trunk/debian/patches/series 2009-12-16 16:58:37 UTC (rev 4454) +++ trunk/packages/gwyddion/trunk/debian/patches/series 2009-12-17 21:18:44 UTC (rev 4455) @@ -1,4 +1,2 @@ fix-manpage-section-for-debian.diff fix-rpath-issue.patch -fix-shared-mime-info.patch -gwyddion-2.18-remote-new-x11.patch _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit