Attachment #79421 for bug #114083

View | Details | Raw Unified | Return to bug 114083
Collapse All | Expand All

Lines 6-12 Link Here

(-)gwyddion/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= gwyddion	8	PORTNAME= gwyddion
9	PORTVERSION= 2.5	9	PORTVERSION= 2.7
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= science graphics	11	CATEGORIES= science graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
Lines 26-32 Link Here
26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
27	LDFLAGS="-L${LOCALBASE}/lib"	27	LDFLAGS="-L${LOCALBASE}/lib"
28	CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \	28	CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
29	--disable-pascal --disable-pygwy	29	--disable-pascal --disable-pygwy \
		30	--mandir=${PREFIX}/man
30		31
31	MAKE_ARGS= pkgconfigdatadir=${PREFIX}/libdata/pkgconfig	32	MAKE_ARGS= pkgconfigdatadir=${PREFIX}/libdata/pkgconfig
32		33

Lines 1-3 Link Here

(-)gwyddion/distinfo (-3 / +3 lines)
1	MD5 (gwyddion-2.5.tar.bz2) = fe2befbac527d54a2b5bad36800321a7	1	MD5 (gwyddion-2.7.tar.bz2) = 6830ab79f12a201694cf8c178c8d77a4
2	SHA256 (gwyddion-2.5.tar.bz2) = 22c9f616a44e0328d577e506aef81d90b20b9838a6ffc4bc880d0784d3283ae1	2	SHA256 (gwyddion-2.7.tar.bz2) = d562f578164a22a48e51cbb363b6a12be505f4c630b7c5ecf31280fdda3c397a
3	SIZE (gwyddion-2.5.tar.bz2) = 2085657	3	SIZE (gwyddion-2.7.tar.bz2) = 2247851




--- data/gwyddion.xml.orig	Fri Mar  9 12:19:43 2007
+++ data/gwyddion.xml	Thu Mar 15 16:23:56 2007
@@ -61,16 +61,6 @@
   <glob pattern="*.GWY"/>
 </mime-type>
 
-<!-- From module hdf4file.c -->
-<mime-type type="application/x-hdf">
-  <comment>Hierarchical Data Format</comment>
-    <magic priority="10">
-    <match type="string" offset="0" value="\x0e\x03\x13\x01"/>
-  </magic>
-  <glob pattern="*.hdf"/>
-  <glob pattern="*.HDF"/>
-</mime-type>
-
 <!-- From module hitachi-afm.c -->
 <mime-type type="application/x-hitachi-spm">
   <comment>Hitachi SPM data</comment>
@@ -137,17 +127,6 @@
     <match type="string" offset="0" value="\\*File list\r\n"/>
     <match type="string" offset="0" value="?*File list\r\n"/>
   </magic>
-</mime-type>
-
-<!-- From module netcdf.c -->
-<mime-type type="application/x-netcdf">
-  <comment>NetCDF data</comment>
-  <magic priority="10">
-    <match type="string" offset="0" value="CDF\x01"/>
-    <match type="string" offset="0" value="CDF\x02"/>
-  </magic>
-  <glob pattern="*.nc"/>
-  <glob pattern="*.NC"/>
 </mime-type>
 
 <!-- From module nt-mdt.c -->




lib/gwyddion/modules/file/witfile.so
lib/gwyddion/modules/file/wsxmfile.so
lib/gwyddion/modules/graph/graph_cd.so
lib/gwyddion/modules/graph/graph_cut.so
lib/gwyddion/modules/graph/graph_export_ascii.so
lib/gwyddion/modules/graph/graph_export_bitmap.so
lib/gwyddion/modules/graph/graph_export_vector.so
lib/gwyddion/modules/graph/graph_fdfit.so
lib/gwyddion/modules/graph/graph_fit.so
lib/gwyddion/modules/graph/graph_level.so
lib/gwyddion/modules/layer/axis.so

lib/gwyddion/modules/layer/line.so
lib/gwyddion/modules/layer/point.so
lib/gwyddion/modules/layer/rectangle.so
lib/gwyddion/modules/process/acf2d.so
lib/gwyddion/modules/process/angle_dist.so
lib/gwyddion/modules/process/arithmetic.so
lib/gwyddion/modules/process/basicops.so

lib/gwyddion/modules/tool/crop.so
lib/gwyddion/modules/tool/distance.so
lib/gwyddion/modules/tool/filter.so
lib/gwyddion/modules/tool/grainmeasure.so
lib/gwyddion/modules/tool/grainremover.so
lib/gwyddion/modules/tool/icolorange.so
lib/gwyddion/modules/tool/level3.so
lib/gwyddion/modules/tool/linestats.so
lib/gwyddion/modules/tool/maskedit.so
lib/gwyddion/modules/tool/pathlevel.so
lib/gwyddion/modules/tool/polynom.so
lib/gwyddion/modules/tool/profile.so
lib/gwyddion/modules/tool/readvalue.so
lib/gwyddion/modules/tool/roughness.so
lib/gwyddion/modules/tool/sfunctions.so
lib/gwyddion/modules/tool/spectro.so
lib/gwyddion/modules/tool/spotremove.so
lib/gwyddion/modules/tool/stats.so
lib/gwyddion/modules/plugin-proxy.so

include/gwyddion/libgwyddion/gwyentities.h
include/gwyddion/libgwyddion/gwyenum.h
include/gwyddion/libgwyddion/gwyexpr.h
include/gwyddion/libgwyddion/gwyfdcurvepreset.h
include/gwyddion/libgwyddion/gwyinventory.h
include/gwyddion/libgwyddion/gwymacros.h
include/gwyddion/libgwyddion/gwymath.h

include/gwyddion/libprocess/level.h
include/gwyddion/libprocess/linestats.h
include/gwyddion/libprocess/simplefft.h
include/gwyddion/libprocess/spectra.h
include/gwyddion/libprocess/stats.h
include/gwyddion/libprocess/tip.h
include/gwyddion/libdraw/gwydraw.h

include/gwyddion/libgwymodule/gwymodulebrowser.h
include/gwyddion/libgwymodule/gwymoduleenums.h
include/gwyddion/libgwymodule/gwymoduleloader.h
include/gwyddion/libgwymodule/gwymoduletypes.h
include/gwyddion/app/app.h
include/gwyddion/app/data-browser.h
include/gwyddion/app/datachooser.h

%%DATADIR%%/pixmaps/gwy_bold-20.png
%%DATADIR%%/pixmaps/gwy_cantilever-24.png
%%DATADIR%%/pixmaps/gwy_color_range-24.png
%%DATADIR%%/pixmaps/gwy_color_range_adaptive-24.png
%%DATADIR%%/pixmaps/gwy_color_range_auto-24.png
%%DATADIR%%/pixmaps/gwy_color_range_fixed-24.png
%%DATADIR%%/pixmaps/gwy_color_range_full-24.png
%%DATADIR%%/pixmaps/gwy_crop-24.png
%%DATADIR%%/pixmaps/gwy_cwt-24.png
%%DATADIR%%/pixmaps/gwy_data_measure-24.png

%%DATADIR%%/pixmaps/gwy_flip_horizontally-24.png
%%DATADIR%%/pixmaps/gwy_flip_vertically-24.png
%%DATADIR%%/pixmaps/gwy_fractal-24.png
%%DATADIR%%/pixmaps/gwy_gl_material-16.png
%%DATADIR%%/pixmaps/gwy_gradient_horizontal-24.png
%%DATADIR%%/pixmaps/gwy_gradient_vertical-24.png
%%DATADIR%%/pixmaps/gwy_grains-24.png
%%DATADIR%%/pixmaps/gwy_grains_graph-24.png
%%DATADIR%%/pixmaps/gwy_grains_measure-24.png
%%DATADIR%%/pixmaps/gwy_grains_remove-24.png
%%DATADIR%%/pixmaps/gwy_grains_water-24.png
%%DATADIR%%/pixmaps/gwy_graph-24.png

%%DATADIR%%/pixmaps/gwy_gwyddion-32.png
%%DATADIR%%/pixmaps/gwy_gwyddion-60.png
%%DATADIR%%/pixmaps/gwy_immerse-24.png
%%DATADIR%%/pixmaps/gwy_iso_roughness-24.png
%%DATADIR%%/pixmaps/gwy_italic-20.png
%%DATADIR%%/pixmaps/gwy_less-24.png
%%DATADIR%%/pixmaps/gwy_level-24.png

%%DATADIR%%/pixmaps/gwy_line_level-24.png
%%DATADIR%%/pixmaps/gwy_logscale_horizontal-24.png
%%DATADIR%%/pixmaps/gwy_logscale_vertical-24.png
%%DATADIR%%/pixmaps/gwy_mask-16.png
%%DATADIR%%/pixmaps/gwy_mask-24.png
%%DATADIR%%/pixmaps/gwy_mask_add-24.png
%%DATADIR%%/pixmaps/gwy_mask_circle-24.png

%%DATADIR%%/pixmaps/gwy_mask_grow-24.png
%%DATADIR%%/pixmaps/gwy_mask_intersect-24.png
%%DATADIR%%/pixmaps/gwy_mask_invert-24.png
%%DATADIR%%/pixmaps/gwy_mask_line-24.png
%%DATADIR%%/pixmaps/gwy_mask_rect_exclusive-24.png
%%DATADIR%%/pixmaps/gwy_mask_rect_inclusive-24.png
%%DATADIR%%/pixmaps/gwy_mask_remove-24.png

%%DATADIR%%/pixmaps/gwy_mask_subtract-24.png
%%DATADIR%%/pixmaps/gwy_merge-24.png
%%DATADIR%%/pixmaps/gwy_more-24.png
%%DATADIR%%/pixmaps/gwy_palettes-16.png
%%DATADIR%%/pixmaps/gwy_palettes-24.png
%%DATADIR%%/pixmaps/gwy_path_level-24.png
%%DATADIR%%/pixmaps/gwy_pointer_measure-24.png
%%DATADIR%%/pixmaps/gwy_polynom-24.png
%%DATADIR%%/pixmaps/gwy_profile-24.png

%%DATADIR%%/pixmaps/gwy_scale_vertically-24.png
%%DATADIR%%/pixmaps/gwy_scars-24.png
%%DATADIR%%/pixmaps/gwy_shader-24.png
%%DATADIR%%/pixmaps/gwy_spectrum-24.png
%%DATADIR%%/pixmaps/gwy_spot_remove-24.png
%%DATADIR%%/pixmaps/gwy_stat_quantities-24.png
%%DATADIR%%/pixmaps/gwy_subscript-20.png

share/mime/application/x-dme-spm.xml
share/mime/application/x-gwyddion-spm.xml
share/mime/application/x-hitachi-spm.xml
share/mime/application/x-jpk-image-scan.xml
share/mime/application/x-mi-spm.xml
share/mime/application/x-nanonis-spm.xml
share/mime/application/x-nanoscope-ii-spm.xml

Return to bug 114083

Lines 1-37 Link Here

(-)gwyddion/files/patch-data-gwyddion.xml (-37 lines)
1	--- data/gwyddion.xml.orig Fri Mar 9 12:19:43 2007
2	+++ data/gwyddion.xml Thu Mar 15 16:23:56 2007
3	@@ -61,16 +61,6 @@
4	<glob pattern="*.GWY"/>
5	</mime-type>
6
7	-<!-- From module hdf4file.c -->
8	-<mime-type type="application/x-hdf">
9	- <comment>Hierarchical Data Format</comment>
10	- <magic priority="10">
11	- <match type="string" offset="0" value="\x0e\x03\x13\x01"/>
12	- </magic>
13	- <glob pattern="*.hdf"/>
14	- <glob pattern="*.HDF"/>
15	-</mime-type>
16	-
17	<!-- From module hitachi-afm.c -->
18	<mime-type type="application/x-hitachi-spm">
19	<comment>Hitachi SPM data</comment>
20	@@ -137,17 +127,6 @@
21	<match type="string" offset="0" value="\\*File list\r\n"/>
22	<match type="string" offset="0" value="?*File list\r\n"/>
23	</magic>
24	-</mime-type>
25	-
26	-<!-- From module netcdf.c -->
27	-<mime-type type="application/x-netcdf">
28	- <comment>NetCDF data</comment>
29	- <magic priority="10">
30	- <match type="string" offset="0" value="CDF\x01"/>
31	- <match type="string" offset="0" value="CDF\x02"/>
32	- </magic>
33	- <glob pattern="*.nc"/>
34	- <glob pattern="*.NC"/>
35	</mime-type>
36
37	<!-- From module nt-mdt.c -->

Lines 53-61 Link Here

(-)gwyddion/pkg-plist (-1 / +23 lines)
53	lib/gwyddion/modules/file/witfile.so	53	lib/gwyddion/modules/file/witfile.so
54	lib/gwyddion/modules/file/wsxmfile.so	54	lib/gwyddion/modules/file/wsxmfile.so
55	lib/gwyddion/modules/graph/graph_cd.so	55	lib/gwyddion/modules/graph/graph_cd.so
		56	lib/gwyddion/modules/graph/graph_cut.so
56	lib/gwyddion/modules/graph/graph_export_ascii.so	57	lib/gwyddion/modules/graph/graph_export_ascii.so
57	lib/gwyddion/modules/graph/graph_export_bitmap.so	58	lib/gwyddion/modules/graph/graph_export_bitmap.so
58	lib/gwyddion/modules/graph/graph_export_vector.so	59	lib/gwyddion/modules/graph/graph_export_vector.so
		60	lib/gwyddion/modules/graph/graph_fdfit.so
59	lib/gwyddion/modules/graph/graph_fit.so	61	lib/gwyddion/modules/graph/graph_fit.so
60	lib/gwyddion/modules/graph/graph_level.so	62	lib/gwyddion/modules/graph/graph_level.so
61	lib/gwyddion/modules/layer/axis.so	63	lib/gwyddion/modules/layer/axis.so
Lines 63-68 Link Here
63	lib/gwyddion/modules/layer/line.so	65	lib/gwyddion/modules/layer/line.so
64	lib/gwyddion/modules/layer/point.so	66	lib/gwyddion/modules/layer/point.so
65	lib/gwyddion/modules/layer/rectangle.so	67	lib/gwyddion/modules/layer/rectangle.so
		68	lib/gwyddion/modules/process/acf2d.so
66	lib/gwyddion/modules/process/angle_dist.so	69	lib/gwyddion/modules/process/angle_dist.so
67	lib/gwyddion/modules/process/arithmetic.so	70	lib/gwyddion/modules/process/arithmetic.so
68	lib/gwyddion/modules/process/basicops.so	71	lib/gwyddion/modules/process/basicops.so
Lines 114-128 Link Here
114	lib/gwyddion/modules/tool/crop.so	117	lib/gwyddion/modules/tool/crop.so
115	lib/gwyddion/modules/tool/distance.so	118	lib/gwyddion/modules/tool/distance.so
116	lib/gwyddion/modules/tool/filter.so	119	lib/gwyddion/modules/tool/filter.so
		120	lib/gwyddion/modules/tool/grainmeasure.so
117	lib/gwyddion/modules/tool/grainremover.so	121	lib/gwyddion/modules/tool/grainremover.so
118	lib/gwyddion/modules/tool/icolorange.so	122	lib/gwyddion/modules/tool/icolorange.so
119	lib/gwyddion/modules/tool/level3.so	123	lib/gwyddion/modules/tool/level3.so
120	lib/gwyddion/modules/tool/linestats.so	124	lib/gwyddion/modules/tool/linestats.so
121	lib/gwyddion/modules/tool/maskedit.so	125	lib/gwyddion/modules/tool/maskedit.so
		126	lib/gwyddion/modules/tool/pathlevel.so
122	lib/gwyddion/modules/tool/polynom.so	127	lib/gwyddion/modules/tool/polynom.so
123	lib/gwyddion/modules/tool/profile.so	128	lib/gwyddion/modules/tool/profile.so
124	lib/gwyddion/modules/tool/readvalue.so	129	lib/gwyddion/modules/tool/readvalue.so
		130	lib/gwyddion/modules/tool/roughness.so
125	lib/gwyddion/modules/tool/sfunctions.so	131	lib/gwyddion/modules/tool/sfunctions.so
		132	lib/gwyddion/modules/tool/spectro.so
126	lib/gwyddion/modules/tool/spotremove.so	133	lib/gwyddion/modules/tool/spotremove.so
127	lib/gwyddion/modules/tool/stats.so	134	lib/gwyddion/modules/tool/stats.so
128	lib/gwyddion/modules/plugin-proxy.so	135	lib/gwyddion/modules/plugin-proxy.so
Lines 144-149 Link Here
144	include/gwyddion/libgwyddion/gwyentities.h	151	include/gwyddion/libgwyddion/gwyentities.h
145	include/gwyddion/libgwyddion/gwyenum.h	152	include/gwyddion/libgwyddion/gwyenum.h
146	include/gwyddion/libgwyddion/gwyexpr.h	153	include/gwyddion/libgwyddion/gwyexpr.h
		154	include/gwyddion/libgwyddion/gwyfdcurvepreset.h
147	include/gwyddion/libgwyddion/gwyinventory.h	155	include/gwyddion/libgwyddion/gwyinventory.h
148	include/gwyddion/libgwyddion/gwymacros.h	156	include/gwyddion/libgwyddion/gwymacros.h
149	include/gwyddion/libgwyddion/gwymath.h	157	include/gwyddion/libgwyddion/gwymath.h
Lines 177-182 Link Here
177	include/gwyddion/libprocess/level.h	185	include/gwyddion/libprocess/level.h
178	include/gwyddion/libprocess/linestats.h	186	include/gwyddion/libprocess/linestats.h
179	include/gwyddion/libprocess/simplefft.h	187	include/gwyddion/libprocess/simplefft.h
		188	include/gwyddion/libprocess/spectra.h
180	include/gwyddion/libprocess/stats.h	189	include/gwyddion/libprocess/stats.h
181	include/gwyddion/libprocess/tip.h	190	include/gwyddion/libprocess/tip.h
182	include/gwyddion/libdraw/gwydraw.h	191	include/gwyddion/libdraw/gwydraw.h
Lines 245-250 Link Here
245	include/gwyddion/libgwymodule/gwymodulebrowser.h	254	include/gwyddion/libgwymodule/gwymodulebrowser.h
246	include/gwyddion/libgwymodule/gwymoduleenums.h	255	include/gwyddion/libgwymodule/gwymoduleenums.h
247	include/gwyddion/libgwymodule/gwymoduleloader.h	256	include/gwyddion/libgwymodule/gwymoduleloader.h
		257	include/gwyddion/libgwymodule/gwymoduletypes.h
248	include/gwyddion/app/app.h	258	include/gwyddion/app/app.h
249	include/gwyddion/app/data-browser.h	259	include/gwyddion/app/data-browser.h
250	include/gwyddion/app/datachooser.h	260	include/gwyddion/app/datachooser.h
Lines 289-294 Link Here
289	%%DATADIR%%/pixmaps/gwy_bold-20.png	299	%%DATADIR%%/pixmaps/gwy_bold-20.png
290	%%DATADIR%%/pixmaps/gwy_cantilever-24.png	300	%%DATADIR%%/pixmaps/gwy_cantilever-24.png
291	%%DATADIR%%/pixmaps/gwy_color_range-24.png	301	%%DATADIR%%/pixmaps/gwy_color_range-24.png
		302	%%DATADIR%%/pixmaps/gwy_color_range_adaptive-24.png
		303	%%DATADIR%%/pixmaps/gwy_color_range_auto-24.png
		304	%%DATADIR%%/pixmaps/gwy_color_range_fixed-24.png
		305	%%DATADIR%%/pixmaps/gwy_color_range_full-24.png
292	%%DATADIR%%/pixmaps/gwy_crop-24.png	306	%%DATADIR%%/pixmaps/gwy_crop-24.png
293	%%DATADIR%%/pixmaps/gwy_cwt-24.png	307	%%DATADIR%%/pixmaps/gwy_cwt-24.png
294	%%DATADIR%%/pixmaps/gwy_data_measure-24.png	308	%%DATADIR%%/pixmaps/gwy_data_measure-24.png
Lines 304-313 Link Here
304	%%DATADIR%%/pixmaps/gwy_flip_horizontally-24.png	318	%%DATADIR%%/pixmaps/gwy_flip_horizontally-24.png
305	%%DATADIR%%/pixmaps/gwy_flip_vertically-24.png	319	%%DATADIR%%/pixmaps/gwy_flip_vertically-24.png
306	%%DATADIR%%/pixmaps/gwy_fractal-24.png	320	%%DATADIR%%/pixmaps/gwy_fractal-24.png
		321	%%DATADIR%%/pixmaps/gwy_gl_material-16.png
307	%%DATADIR%%/pixmaps/gwy_gradient_horizontal-24.png	322	%%DATADIR%%/pixmaps/gwy_gradient_horizontal-24.png
308	%%DATADIR%%/pixmaps/gwy_gradient_vertical-24.png	323	%%DATADIR%%/pixmaps/gwy_gradient_vertical-24.png
309	%%DATADIR%%/pixmaps/gwy_grains-24.png	324	%%DATADIR%%/pixmaps/gwy_grains-24.png
310	%%DATADIR%%/pixmaps/gwy_grains_graph-24.png	325	%%DATADIR%%/pixmaps/gwy_grains_graph-24.png
		326	%%DATADIR%%/pixmaps/gwy_grains_measure-24.png
311	%%DATADIR%%/pixmaps/gwy_grains_remove-24.png	327	%%DATADIR%%/pixmaps/gwy_grains_remove-24.png
312	%%DATADIR%%/pixmaps/gwy_grains_water-24.png	328	%%DATADIR%%/pixmaps/gwy_grains_water-24.png
313	%%DATADIR%%/pixmaps/gwy_graph-24.png	329	%%DATADIR%%/pixmaps/gwy_graph-24.png
Lines 324-329 Link Here
324	%%DATADIR%%/pixmaps/gwy_gwyddion-32.png	340	%%DATADIR%%/pixmaps/gwy_gwyddion-32.png
325	%%DATADIR%%/pixmaps/gwy_gwyddion-60.png	341	%%DATADIR%%/pixmaps/gwy_gwyddion-60.png
326	%%DATADIR%%/pixmaps/gwy_immerse-24.png	342	%%DATADIR%%/pixmaps/gwy_immerse-24.png
		343	%%DATADIR%%/pixmaps/gwy_iso_roughness-24.png
327	%%DATADIR%%/pixmaps/gwy_italic-20.png	344	%%DATADIR%%/pixmaps/gwy_italic-20.png
328	%%DATADIR%%/pixmaps/gwy_less-24.png	345	%%DATADIR%%/pixmaps/gwy_less-24.png
329	%%DATADIR%%/pixmaps/gwy_level-24.png	346	%%DATADIR%%/pixmaps/gwy_level-24.png
Lines 332-337 Link Here
332	%%DATADIR%%/pixmaps/gwy_line_level-24.png	349	%%DATADIR%%/pixmaps/gwy_line_level-24.png
333	%%DATADIR%%/pixmaps/gwy_logscale_horizontal-24.png	350	%%DATADIR%%/pixmaps/gwy_logscale_horizontal-24.png
334	%%DATADIR%%/pixmaps/gwy_logscale_vertical-24.png	351	%%DATADIR%%/pixmaps/gwy_logscale_vertical-24.png
		352	%%DATADIR%%/pixmaps/gwy_mask-16.png
335	%%DATADIR%%/pixmaps/gwy_mask-24.png	353	%%DATADIR%%/pixmaps/gwy_mask-24.png
336	%%DATADIR%%/pixmaps/gwy_mask_add-24.png	354	%%DATADIR%%/pixmaps/gwy_mask_add-24.png
337	%%DATADIR%%/pixmaps/gwy_mask_circle-24.png	355	%%DATADIR%%/pixmaps/gwy_mask_circle-24.png
Lines 343-348 Link Here
343	%%DATADIR%%/pixmaps/gwy_mask_grow-24.png	361	%%DATADIR%%/pixmaps/gwy_mask_grow-24.png
344	%%DATADIR%%/pixmaps/gwy_mask_intersect-24.png	362	%%DATADIR%%/pixmaps/gwy_mask_intersect-24.png
345	%%DATADIR%%/pixmaps/gwy_mask_invert-24.png	363	%%DATADIR%%/pixmaps/gwy_mask_invert-24.png
		364	%%DATADIR%%/pixmaps/gwy_mask_line-24.png
346	%%DATADIR%%/pixmaps/gwy_mask_rect_exclusive-24.png	365	%%DATADIR%%/pixmaps/gwy_mask_rect_exclusive-24.png
347	%%DATADIR%%/pixmaps/gwy_mask_rect_inclusive-24.png	366	%%DATADIR%%/pixmaps/gwy_mask_rect_inclusive-24.png
348	%%DATADIR%%/pixmaps/gwy_mask_remove-24.png	367	%%DATADIR%%/pixmaps/gwy_mask_remove-24.png
Lines 350-356 Link Here
350	%%DATADIR%%/pixmaps/gwy_mask_subtract-24.png	369	%%DATADIR%%/pixmaps/gwy_mask_subtract-24.png
351	%%DATADIR%%/pixmaps/gwy_merge-24.png	370	%%DATADIR%%/pixmaps/gwy_merge-24.png
352	%%DATADIR%%/pixmaps/gwy_more-24.png	371	%%DATADIR%%/pixmaps/gwy_more-24.png
		372	%%DATADIR%%/pixmaps/gwy_palettes-16.png
353	%%DATADIR%%/pixmaps/gwy_palettes-24.png	373	%%DATADIR%%/pixmaps/gwy_palettes-24.png
		374	%%DATADIR%%/pixmaps/gwy_path_level-24.png
354	%%DATADIR%%/pixmaps/gwy_pointer_measure-24.png	375	%%DATADIR%%/pixmaps/gwy_pointer_measure-24.png
355	%%DATADIR%%/pixmaps/gwy_polynom-24.png	376	%%DATADIR%%/pixmaps/gwy_polynom-24.png
356	%%DATADIR%%/pixmaps/gwy_profile-24.png	377	%%DATADIR%%/pixmaps/gwy_profile-24.png
Lines 364-369 Link Here
364	%%DATADIR%%/pixmaps/gwy_scale_vertically-24.png	385	%%DATADIR%%/pixmaps/gwy_scale_vertically-24.png
365	%%DATADIR%%/pixmaps/gwy_scars-24.png	386	%%DATADIR%%/pixmaps/gwy_scars-24.png
366	%%DATADIR%%/pixmaps/gwy_shader-24.png	387	%%DATADIR%%/pixmaps/gwy_shader-24.png
		388	%%DATADIR%%/pixmaps/gwy_spectrum-24.png
367	%%DATADIR%%/pixmaps/gwy_spot_remove-24.png	389	%%DATADIR%%/pixmaps/gwy_spot_remove-24.png
368	%%DATADIR%%/pixmaps/gwy_stat_quantities-24.png	390	%%DATADIR%%/pixmaps/gwy_stat_quantities-24.png
369	%%DATADIR%%/pixmaps/gwy_subscript-20.png	391	%%DATADIR%%/pixmaps/gwy_subscript-20.png
Lines 460-466 Link Here
460	share/mime/application/x-dme-spm.xml	482	share/mime/application/x-dme-spm.xml
461	share/mime/application/x-gwyddion-spm.xml	483	share/mime/application/x-gwyddion-spm.xml
462	share/mime/application/x-hitachi-spm.xml	484	share/mime/application/x-hitachi-spm.xml
463	share/mime/application/x-jpk-spm.xml	485	share/mime/application/x-jpk-image-scan.xml
464	share/mime/application/x-mi-spm.xml	486	share/mime/application/x-mi-spm.xml
465	share/mime/application/x-nanonis-spm.xml	487	share/mime/application/x-nanonis-spm.xml
466	share/mime/application/x-nanoscope-ii-spm.xml	488	share/mime/application/x-nanoscope-ii-spm.xml