3 files changed, 162 insertions, 129 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 999e8b85cfa4..72647b7839ac 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gnumeric/Makefile,v 1.42 2008/03/11 12:45:31 ahze Exp $
+#   $MCom: ports/math/gnumeric/Makefile,v 1.46 2008/10/20 21:37:28 kwm Exp $
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.8.3
-PORTREVISION=	1
+PORTVERSION=	1.9.3
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -17,7 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The GNOME 2 spreadsheet
 
-LIB_DEPENDS=	goffice-0.6.6:${PORTSDIR}/devel/goffice \
+LIB_DEPENDS=	goffice-0.8.7:${PORTSDIR}/devel/goffice \
 		psiconv.10:${PORTSDIR}/converters/psiconv
 
 USE_BZIP2=	yes
@@ -29,6 +28,7 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier \
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
+INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-guile --with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -38,7 +38,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 GCONF_SCHEMAS=	gnumeric-dialogs.schemas gnumeric-general.schemas \
 		gnumeric-plugins.schemas
 
-MAN1=		gnumeric.1 ssconvert.1 ssindex.1
+MAN1=		gnumeric.1 ssconvert.1 ssindex.1 ssgrep.1
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index ed5a0f3927d3..0f28e41aaafe 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnumeric-1.8.3.tar.bz2) = 3ce6ba6483ccd6fe9974cface582337a
-SHA256 (gnome2/gnumeric-1.8.3.tar.bz2) = 173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07
-SIZE (gnome2/gnumeric-1.8.3.tar.bz2) = 14087309
+MD5 (gnome2/gnumeric-1.9.3.tar.bz2) = 75f7ea180af40103ecf6a16b68cd5c9c
+SHA256 (gnome2/gnumeric-1.9.3.tar.bz2) = b456d85770af3734a6974900ac45604f40c37217f87b4ea4b4595ed85465914f
+SIZE (gnome2/gnumeric-1.9.3.tar.bz2) = 15294207
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index dd8c2595dc48..904b10617b49 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -2,122 +2,123 @@ bin/gnumeric
 bin/gnumeric-%%VERSION%%
 bin/ssconvert
 bin/ssindex
-include/libspreadsheet-1.8/spreadsheet/application.h
-include/libspreadsheet-1.8/spreadsheet/auto-format.h
-include/libspreadsheet-1.8/spreadsheet/cell-draw.h
-include/libspreadsheet-1.8/spreadsheet/cell.h
-include/libspreadsheet-1.8/spreadsheet/cellspan.h
-include/libspreadsheet-1.8/spreadsheet/clipboard.h
-include/libspreadsheet-1.8/spreadsheet/cmd-edit.h
-include/libspreadsheet-1.8/spreadsheet/collect.h
-include/libspreadsheet-1.8/spreadsheet/colrow.h
-include/libspreadsheet-1.8/spreadsheet/command-context-stderr.h
-include/libspreadsheet-1.8/spreadsheet/command-context.h
-include/libspreadsheet-1.8/spreadsheet/commands.h
-include/libspreadsheet-1.8/spreadsheet/complete-sheet.h
-include/libspreadsheet-1.8/spreadsheet/complete.h
-include/libspreadsheet-1.8/spreadsheet/complex.h
-include/libspreadsheet-1.8/spreadsheet/consolidate.h
-include/libspreadsheet-1.8/spreadsheet/dependent.h
-include/libspreadsheet-1.8/spreadsheet/expr-impl.h
-include/libspreadsheet-1.8/spreadsheet/expr-name.h
-include/libspreadsheet-1.8/spreadsheet/expr.h
-include/libspreadsheet-1.8/spreadsheet/file-autoft.h
-include/libspreadsheet-1.8/spreadsheet/format-template.h
-include/libspreadsheet-1.8/spreadsheet/func-builtin.h
-include/libspreadsheet-1.8/spreadsheet/func.h
-include/libspreadsheet-1.8/spreadsheet/gnm-datetime.h
-include/libspreadsheet-1.8/spreadsheet/gnm-format.h
-include/libspreadsheet-1.8/spreadsheet/gnm-graph-window.h
-include/libspreadsheet-1.8/spreadsheet/gnm-pane.h
-include/libspreadsheet-1.8/spreadsheet/gnm-plugin.h
-include/libspreadsheet-1.8/spreadsheet/gnm-so-filled.h
-include/libspreadsheet-1.8/spreadsheet/gnm-so-line.h
-include/libspreadsheet-1.8/spreadsheet/gnm-so-polygon.h
-include/libspreadsheet-1.8/spreadsheet/gnm-style-impl.h
-include/libspreadsheet-1.8/spreadsheet/gnumeric-gconf.h
-include/libspreadsheet-1.8/spreadsheet/gnumeric-simple-canvas.h
-include/libspreadsheet-1.8/spreadsheet/gnumeric.h
-include/libspreadsheet-1.8/spreadsheet/graph.h
-include/libspreadsheet-1.8/spreadsheet/gui-clipboard.h
-include/libspreadsheet-1.8/spreadsheet/gui-file.h
-include/libspreadsheet-1.8/spreadsheet/gui-gnumeric.h
-include/libspreadsheet-1.8/spreadsheet/gui-util.h
-include/libspreadsheet-1.8/spreadsheet/gutils.h
-include/libspreadsheet-1.8/spreadsheet/history.h
-include/libspreadsheet-1.8/spreadsheet/hlink-impl.h
-include/libspreadsheet-1.8/spreadsheet/hlink.h
-include/libspreadsheet-1.8/spreadsheet/input-msg.h
-include/libspreadsheet-1.8/spreadsheet/item-acetate.h
-include/libspreadsheet-1.8/spreadsheet/item-bar.h
-include/libspreadsheet-1.8/spreadsheet/item-cursor.h
-include/libspreadsheet-1.8/spreadsheet/item-debug.h
-include/libspreadsheet-1.8/spreadsheet/item-edit.h
-include/libspreadsheet-1.8/spreadsheet/item-grid.h
-include/libspreadsheet-1.8/spreadsheet/libgnumeric.h
-include/libspreadsheet-1.8/spreadsheet/mathfunc.h
-include/libspreadsheet-1.8/spreadsheet/mstyle.h
-include/libspreadsheet-1.8/spreadsheet/number-match.h
-include/libspreadsheet-1.8/spreadsheet/numbers.h
-include/libspreadsheet-1.8/spreadsheet/parse-util.h
-include/libspreadsheet-1.8/spreadsheet/pattern.h
-include/libspreadsheet-1.8/spreadsheet/position.h
-include/libspreadsheet-1.8/spreadsheet/preview-grid.h
-include/libspreadsheet-1.8/spreadsheet/print-cell.h
-include/libspreadsheet-1.8/spreadsheet/print-info.h
-include/libspreadsheet-1.8/spreadsheet/print.h
-include/libspreadsheet-1.8/spreadsheet/rangefunc-strings.h
-include/libspreadsheet-1.8/spreadsheet/rangefunc.h
-include/libspreadsheet-1.8/spreadsheet/ranges.h
-include/libspreadsheet-1.8/spreadsheet/regression.h
-include/libspreadsheet-1.8/spreadsheet/rendered-value.h
-include/libspreadsheet-1.8/spreadsheet/search.h
-include/libspreadsheet-1.8/spreadsheet/selection.h
-include/libspreadsheet-1.8/spreadsheet/session.h
-include/libspreadsheet-1.8/spreadsheet/sheet-autofill.h
-include/libspreadsheet-1.8/spreadsheet/sheet-control-gui-priv.h
-include/libspreadsheet-1.8/spreadsheet/sheet-control-gui.h
-include/libspreadsheet-1.8/spreadsheet/sheet-control-priv.h
-include/libspreadsheet-1.8/spreadsheet/sheet-control.h
-include/libspreadsheet-1.8/spreadsheet/sheet-filter-combo.h
-include/libspreadsheet-1.8/spreadsheet/sheet-filter.h
-include/libspreadsheet-1.8/spreadsheet/sheet-merge.h
-include/libspreadsheet-1.8/spreadsheet/sheet-object-cell-comment.h
-include/libspreadsheet-1.8/spreadsheet/sheet-object-graph.h
-include/libspreadsheet-1.8/spreadsheet/sheet-object-image.h
-include/libspreadsheet-1.8/spreadsheet/sheet-object-impl.h
-include/libspreadsheet-1.8/spreadsheet/sheet-object-widget.h
-include/libspreadsheet-1.8/spreadsheet/sheet-object.h
-include/libspreadsheet-1.8/spreadsheet/sheet-private.h
-include/libspreadsheet-1.8/spreadsheet/sheet-style.h
-include/libspreadsheet-1.8/spreadsheet/sheet-view.h
-include/libspreadsheet-1.8/spreadsheet/sheet.h
-include/libspreadsheet-1.8/spreadsheet/solver.h
-include/libspreadsheet-1.8/spreadsheet/sort.h
-include/libspreadsheet-1.8/spreadsheet/stf-export.h
-include/libspreadsheet-1.8/spreadsheet/stf-parse.h
-include/libspreadsheet-1.8/spreadsheet/stf.h
-include/libspreadsheet-1.8/spreadsheet/str.h
-include/libspreadsheet-1.8/spreadsheet/style-border.h
-include/libspreadsheet-1.8/spreadsheet/style-color.h
-include/libspreadsheet-1.8/spreadsheet/style-conditions.h
-include/libspreadsheet-1.8/spreadsheet/style-font.h
-include/libspreadsheet-1.8/spreadsheet/style.h
-include/libspreadsheet-1.8/spreadsheet/symbol.h
-include/libspreadsheet-1.8/spreadsheet/validation-combo.h
-include/libspreadsheet-1.8/spreadsheet/validation.h
-include/libspreadsheet-1.8/spreadsheet/value.h
-include/libspreadsheet-1.8/spreadsheet/wbc-gtk-impl.h
-include/libspreadsheet-1.8/spreadsheet/wbc-gtk.h
-include/libspreadsheet-1.8/spreadsheet/workbook-cmd-format.h
-include/libspreadsheet-1.8/spreadsheet/workbook-control-priv.h
-include/libspreadsheet-1.8/spreadsheet/workbook-control.h
-include/libspreadsheet-1.8/spreadsheet/workbook-priv.h
-include/libspreadsheet-1.8/spreadsheet/workbook-view.h
-include/libspreadsheet-1.8/spreadsheet/workbook.h
-include/libspreadsheet-1.8/spreadsheet/xml-io-version.h
-include/libspreadsheet-1.8/spreadsheet/xml-io.h
-include/libspreadsheet-1.8/spreadsheet/xml-sax.h
+bin/ssgrep
+include/libspreadsheet-1.10/spreadsheet/application.h
+include/libspreadsheet-1.10/spreadsheet/auto-format.h
+include/libspreadsheet-1.10/spreadsheet/cell-draw.h
+include/libspreadsheet-1.10/spreadsheet/cell.h
+include/libspreadsheet-1.10/spreadsheet/cellspan.h
+include/libspreadsheet-1.10/spreadsheet/clipboard.h
+include/libspreadsheet-1.10/spreadsheet/cmd-edit.h
+include/libspreadsheet-1.10/spreadsheet/collect.h
+include/libspreadsheet-1.10/spreadsheet/colrow.h
+include/libspreadsheet-1.10/spreadsheet/command-context-stderr.h
+include/libspreadsheet-1.10/spreadsheet/command-context.h
+include/libspreadsheet-1.10/spreadsheet/commands.h
+include/libspreadsheet-1.10/spreadsheet/complete-sheet.h
+include/libspreadsheet-1.10/spreadsheet/complete.h
+include/libspreadsheet-1.10/spreadsheet/complex.h
+include/libspreadsheet-1.10/spreadsheet/consolidate.h
+include/libspreadsheet-1.10/spreadsheet/dependent.h
+include/libspreadsheet-1.10/spreadsheet/expr-impl.h
+include/libspreadsheet-1.10/spreadsheet/expr-name.h
+include/libspreadsheet-1.10/spreadsheet/expr.h
+include/libspreadsheet-1.10/spreadsheet/file-autoft.h
+include/libspreadsheet-1.10/spreadsheet/format-template.h
+include/libspreadsheet-1.10/spreadsheet/func-builtin.h
+include/libspreadsheet-1.10/spreadsheet/func.h
+include/libspreadsheet-1.10/spreadsheet/gnm-datetime.h
+include/libspreadsheet-1.10/spreadsheet/gnm-format.h
+include/libspreadsheet-1.10/spreadsheet/gnm-graph-window.h
+include/libspreadsheet-1.10/spreadsheet/gnm-pane.h
+include/libspreadsheet-1.10/spreadsheet/gnm-plugin.h
+include/libspreadsheet-1.10/spreadsheet/gnm-so-filled.h
+include/libspreadsheet-1.10/spreadsheet/gnm-so-line.h
+include/libspreadsheet-1.10/spreadsheet/gnm-so-polygon.h
+include/libspreadsheet-1.10/spreadsheet/gnm-style-impl.h
+include/libspreadsheet-1.10/spreadsheet/gnumeric-gconf.h
+include/libspreadsheet-1.10/spreadsheet/gnumeric-simple-canvas.h
+include/libspreadsheet-1.10/spreadsheet/gnumeric.h
+include/libspreadsheet-1.10/spreadsheet/graph.h
+include/libspreadsheet-1.10/spreadsheet/gui-clipboard.h
+include/libspreadsheet-1.10/spreadsheet/gui-file.h
+include/libspreadsheet-1.10/spreadsheet/gui-gnumeric.h
+include/libspreadsheet-1.10/spreadsheet/gui-util.h
+include/libspreadsheet-1.10/spreadsheet/gutils.h
+include/libspreadsheet-1.10/spreadsheet/history.h
+include/libspreadsheet-1.10/spreadsheet/hlink-impl.h
+include/libspreadsheet-1.10/spreadsheet/hlink.h
+include/libspreadsheet-1.10/spreadsheet/input-msg.h
+include/libspreadsheet-1.10/spreadsheet/item-acetate.h
+include/libspreadsheet-1.10/spreadsheet/item-bar.h
+include/libspreadsheet-1.10/spreadsheet/item-cursor.h
+include/libspreadsheet-1.10/spreadsheet/item-debug.h
+include/libspreadsheet-1.10/spreadsheet/item-edit.h
+include/libspreadsheet-1.10/spreadsheet/item-grid.h
+include/libspreadsheet-1.10/spreadsheet/libgnumeric.h
+include/libspreadsheet-1.10/spreadsheet/mathfunc.h
+include/libspreadsheet-1.10/spreadsheet/mstyle.h
+include/libspreadsheet-1.10/spreadsheet/number-match.h
+include/libspreadsheet-1.10/spreadsheet/numbers.h
+include/libspreadsheet-1.10/spreadsheet/parse-util.h
+include/libspreadsheet-1.10/spreadsheet/pattern.h
+include/libspreadsheet-1.10/spreadsheet/position.h
+include/libspreadsheet-1.10/spreadsheet/preview-grid.h
+include/libspreadsheet-1.10/spreadsheet/print-cell.h
+include/libspreadsheet-1.10/spreadsheet/print-info.h
+include/libspreadsheet-1.10/spreadsheet/print.h
+include/libspreadsheet-1.10/spreadsheet/rangefunc-strings.h
+include/libspreadsheet-1.10/spreadsheet/rangefunc.h
+include/libspreadsheet-1.10/spreadsheet/ranges.h
+include/libspreadsheet-1.10/spreadsheet/regression.h
+include/libspreadsheet-1.10/spreadsheet/rendered-value.h
+include/libspreadsheet-1.10/spreadsheet/search.h
+include/libspreadsheet-1.10/spreadsheet/selection.h
+include/libspreadsheet-1.10/spreadsheet/session.h
+include/libspreadsheet-1.10/spreadsheet/sheet-autofill.h
+include/libspreadsheet-1.10/spreadsheet/sheet-control-gui-priv.h
+include/libspreadsheet-1.10/spreadsheet/sheet-control-gui.h
+include/libspreadsheet-1.10/spreadsheet/sheet-control-priv.h
+include/libspreadsheet-1.10/spreadsheet/sheet-control.h
+include/libspreadsheet-1.10/spreadsheet/sheet-filter-combo.h
+include/libspreadsheet-1.10/spreadsheet/sheet-filter.h
+include/libspreadsheet-1.10/spreadsheet/sheet-merge.h
+include/libspreadsheet-1.10/spreadsheet/sheet-object-cell-comment.h
+include/libspreadsheet-1.10/spreadsheet/sheet-object-graph.h
+include/libspreadsheet-1.10/spreadsheet/sheet-object-image.h
+include/libspreadsheet-1.10/spreadsheet/sheet-object-impl.h
+include/libspreadsheet-1.10/spreadsheet/sheet-object-widget.h
+include/libspreadsheet-1.10/spreadsheet/sheet-object.h
+include/libspreadsheet-1.10/spreadsheet/sheet-private.h
+include/libspreadsheet-1.10/spreadsheet/sheet-style.h
+include/libspreadsheet-1.10/spreadsheet/sheet-view.h
+include/libspreadsheet-1.10/spreadsheet/sheet.h
+include/libspreadsheet-1.10/spreadsheet/solver.h
+include/libspreadsheet-1.10/spreadsheet/sort.h
+include/libspreadsheet-1.10/spreadsheet/stf-export.h
+include/libspreadsheet-1.10/spreadsheet/stf-parse.h
+include/libspreadsheet-1.10/spreadsheet/stf.h
+include/libspreadsheet-1.10/spreadsheet/str.h
+include/libspreadsheet-1.10/spreadsheet/style-border.h
+include/libspreadsheet-1.10/spreadsheet/style-color.h
+include/libspreadsheet-1.10/spreadsheet/style-conditions.h
+include/libspreadsheet-1.10/spreadsheet/style-font.h
+include/libspreadsheet-1.10/spreadsheet/style.h
+include/libspreadsheet-1.10/spreadsheet/symbol.h
+include/libspreadsheet-1.10/spreadsheet/validation-combo.h
+include/libspreadsheet-1.10/spreadsheet/validation.h
+include/libspreadsheet-1.10/spreadsheet/value.h
+include/libspreadsheet-1.10/spreadsheet/wbc-gtk-impl.h
+include/libspreadsheet-1.10/spreadsheet/wbc-gtk.h
+include/libspreadsheet-1.10/spreadsheet/workbook-cmd-format.h
+include/libspreadsheet-1.10/spreadsheet/workbook-control-priv.h
+include/libspreadsheet-1.10/spreadsheet/workbook-control.h
+include/libspreadsheet-1.10/spreadsheet/workbook-priv.h
+include/libspreadsheet-1.10/spreadsheet/workbook-view.h
+include/libspreadsheet-1.10/spreadsheet/workbook.h
+include/libspreadsheet-1.10/spreadsheet/xml-io-version.h
+include/libspreadsheet-1.10/spreadsheet/xml-io.h
+include/libspreadsheet-1.10/spreadsheet/xml-sax.h
 lib/gnumeric/%%VERSION%%/include/gnumeric-features.h
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.la
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
@@ -248,10 +249,11 @@ lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
 lib/libspreadsheet-%%VERSION%%.so
 lib/libspreadsheet.la
 lib/libspreadsheet.so
-libdata/pkgconfig/libspreadsheet-1.8.pc
+libdata/pkgconfig/libspreadsheet-1.10.pc
 @exec update-desktop-database > /dev/null || /usr/bin/true
 share/applications/gnumeric.desktop
 share/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
+share/gnumeric/%%VERSION%%/Gnumeric-embed.xml
 share/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
 share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
 share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml
@@ -307,6 +309,7 @@ share/gnumeric/%%VERSION%%/glade/dialog-stf.glade
 share/gnumeric/%%VERSION%%/glade/dialog-zoom.glade
 share/gnumeric/%%VERSION%%/glade/doc-meta-data.glade
 share/gnumeric/%%VERSION%%/glade/exp-smoothing.glade
+share/gnumeric/%%VERSION%%/glade/frequency.glade
 share/gnumeric/%%VERSION%%/glade/fill-series.glade
 share/gnumeric/%%VERSION%%/glade/font-sel.glade
 share/gnumeric/%%VERSION%%/glade/formula-guru.glade
@@ -319,6 +322,7 @@ share/gnumeric/%%VERSION%%/glade/hf-dt-format.glade
 share/gnumeric/%%VERSION%%/glade/histogram.glade
 share/gnumeric/%%VERSION%%/glade/hyperlink.glade
 share/gnumeric/%%VERSION%%/glade/insert-cells.glade
+share/gnumeric/%%VERSION%%/glade/kaplan-meier.glade
 share/gnumeric/%%VERSION%%/glade/mean-tests.glade
 share/gnumeric/%%VERSION%%/glade/merge.glade
 share/gnumeric/%%VERSION%%/glade/moving-averages.glade
@@ -409,18 +413,37 @@ share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex1-options.png
 share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-descstats.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-a-holt-winters-formula.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-a-holt-winters-stderr.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-holt-formula.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-holt-stderr.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-hunter-formula.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-hunter-stderr.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-m-holt-winters-formula.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-m-holt-winters-stderr.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-roberts-formula.png
+share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-roberts-stderr.png
 share/gnome/help/gnumeric/C/figures/analysistools-fourier-formula.png
 share/gnome/help/gnumeric/C/figures/analysistools-fourier.png
 share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-ftest.png
 share/gnome/help/gnumeric/C/figures/analysistools-histogram-bins.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram-cutoffs.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex4.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex5.png
 share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex3.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram-graphs.png
 share/gnome/help/gnumeric/C/figures/analysistools-histogram.png
 share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex3.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average-formula-central.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average-formula-spencer.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average-formula-weighted.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average-options.png
 share/gnome/help/gnumeric/C/figures/analysistools-moving-average.png
 share/gnome/help/gnumeric/C/figures/analysistools-outputoptions.png
 share/gnome/help/gnumeric/C/figures/analysistools-random-ex1.png
@@ -439,6 +462,12 @@ share/gnome/help/gnumeric/C/figures/analysistools-sampling-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-sampling.png
 share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex3.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex4.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex5.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex6.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex7.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex8.png
 share/gnome/help/gnumeric/C/figures/analysistools-smoothing.png
 share/gnome/help/gnumeric/C/figures/analysistools-tools.png
 share/gnome/help/gnumeric/C/figures/analysistools-ttest-equal-ex1.png
@@ -749,6 +778,12 @@ share/gnome/help/gnumeric/C/quick-start.xml
 share/gnome/help/gnumeric/C/welcome.xml
 share/gnome/help/gnumeric/C/workbooks.xml
 share/gnome/help/gnumeric/C/worksheets.xml
+share/icons/hicolor/16x16/apps/gnumeric.png
+share/icons/hicolor/22x22/apps/gnumeric.png
+share/icons/hicolor/24x24/apps/gnumeric.png
+share/icons/hicolor/32x32/apps/gnumeric.png
+share/icons/hicolor/48x48/apps/gnumeric.png
+share/icons/hicolor/scalable/apps/gnumeric.svg
 share/mime-info/gnumeric.mime
 share/omf/gnumeric/gnumeric-C.omf
 share/pixmaps/gnome-application-vnd.lotus-1-2-3.png
@@ -756,14 +791,12 @@ share/pixmaps/gnome-application-x-applix-spreadsheet.png
 share/pixmaps/gnome-application-x-generic-spreadsheet.png
 share/pixmaps/gnome-application-x-gnumeric.png
 share/pixmaps/gnome-application-x-xls.png
-share/pixmaps/gnome-gnumeric.png
 share/pixmaps/gnumeric/down-right.png
 share/pixmaps/gnumeric/gnome-application-vnd.lotus-1-2-3.png
 share/pixmaps/gnumeric/gnome-application-x-applix-spreadsheet.png
 share/pixmaps/gnumeric/gnome-application-x-generic-spreadsheet.png
 share/pixmaps/gnumeric/gnome-application-x-gnumeric.png
 share/pixmaps/gnumeric/gnome-application-x-xls.png
-share/pixmaps/gnumeric/gnome-gnumeric.png
 share/pixmaps/gnumeric/gnumeric-about.png
 share/pixmaps/gnumeric/orient-horizontal.png
 share/pixmaps/gnumeric/orient-vertical.png
@@ -935,8 +968,8 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/include
 @dirrm lib/gnumeric/%%VERSION%%
 @dirrm lib/gnumeric
-@dirrm include/libspreadsheet-1.8/spreadsheet
-@dirrm include/libspreadsheet-1.8
+@dirrm include/libspreadsheet-1.10/spreadsheet
+@dirrm include/libspreadsheet-1.10
 @unexec update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/applications
 @dirrmtry share/locale/te/LC_MESSAGES