Update to 1.8.0.

5 files changed, 206 insertions, 147 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 8a3c727f2e0b..e03f49a12301 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.7.12
-PORTREVISION=	1
+PORTVERSION=	1.8.0
 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.4:${PORTSDIR}/devel/goffice \
+LIB_DEPENDS=	goffice-0.6.6:${PORTSDIR}/devel/goffice \
 		psiconv.10:${PORTSDIR}/converters/psiconv
 
 USE_BZIP2=	yes
@@ -56,6 +55,9 @@ CONFIGURE_ARGS+=	--without-gda
 PLIST_SUB+=		GNOMEDB="@comment "
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/gnumeric-C.omf ${WRKSRC}/doc/C
+
 post-patch:
 	@${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in
 
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 66e465ea14be..e6309a01b177 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnumeric-1.7.12.tar.bz2) = d00a63bac78e29920e5ea2fce8cfa25e
-SHA256 (gnome2/gnumeric-1.7.12.tar.bz2) = b3ecf3a8fd51183252e692b9502336d6dc988a3748487488c5c06483e8ccb82a
-SIZE (gnome2/gnumeric-1.7.12.tar.bz2) = 13685912
+MD5 (gnome2/gnumeric-1.8.0.tar.bz2) = 5a3a4687203edd4a079d37ff8e1546fe
+SHA256 (gnome2/gnumeric-1.8.0.tar.bz2) = 356dc3207991fad7a6f36c4ca5b4fffc0c05e76f129d773489a470c18d3db4cf
+SIZE (gnome2/gnumeric-1.8.0.tar.bz2) = 14080868
diff --git a/math/gnumeric/files/gnumeric-C.omf b/math/gnumeric/files/gnumeric-C.omf
new file mode 100644
index 000000000000..a18da047fffb
--- /dev/null
+++ b/math/gnumeric/files/gnumeric-C.omf
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
+<omf>
+  <resource>
+    <creator>
+      miguel@gnome.org (Miguel de Icaza)
+    </creator>
+    <maintainer>
+      jody@gnome.org (Jody Goldberg)
+    </maintainer>
+    <contributor>
+      acuster@gmail.com (Adrian Custer)
+    </contributor>
+    <contributor>
+      mrproper@ximian.com (Kevin Breit)
+    </contributor>
+    <contributor>
+      aguelzow@taliesin.ca (Andreas Guelzow)
+    </contributor>
+    <contributor>
+      aaron@ximian.com (Aaron Weber)
+    </contributor>
+    <contributor>
+      tommydal@ihug.com.au (Thomas Canty)
+    </contributor>
+    <contributor>
+      kirillov@math.sunysb.edu (Alexander Kirillov)
+    </contributor>
+    <contributor>
+      k_wayne@linuxpower.org (Wayne Schuller)
+    </contributor>
+    <contributor>
+      jiivonen@hutcs.cs.hut.fi (Jukka-Pekka Iivonen)
+    </contributor>
+    <contributor>
+      adrian@gimp.or (Adrian Likins)
+    </contributor>
+
+    <title>
+      The Gnumeric Manual, version 1.8.
+    </title>
+
+    <date>
+      2007-12-20
+    </date>
+
+    <version identifier="1.7" date="2007-10-27" 
+      description="Updated for 1.8"/>
+    <version identifier="1.3" date="2004-12-09" 
+      description="Updated for 1.4"/>
+
+    <subject category="GNOME|Applications|Office"/>
+
+    <description>
+      This is the user's manual for Gnumeric, a GNOME spreadsheet.
+    </description>
+
+    <type>
+      User's Guide
+    </type>
+
+    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.2//EN"/>
+    <identifier url="gnumeric.xml"/>
+    <language code="C"/>
+    <relation seriesid="c5e3db84-64c3-11d6-85a3-a3e50590e6d1"/>
+    <rights type="GNU FDL" license.version="1.1"
+      license="http://www.gnu.org/licenses/fdl.html" 
+      holder="Miguel de Icaza, Jody Goldberg, Thomas Canty, 
+      Jukka-Pekka Iivonen, Andreas J. Guelzow, Wayne Schuller, 
+      Adrian Custer, Kevin Breit, Aaron Weber, Alexander Kirillov"/>
+  </resource>
+</omf>
diff --git a/math/gnumeric/files/patch-src_wbc-gtk-edit.c b/math/gnumeric/files/patch-src_wbc-gtk-edit.c
deleted file mode 100644
index fb3b8b2f4cea..000000000000
--- a/math/gnumeric/files/patch-src_wbc-gtk-edit.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/wbc-gtk-edit.c.orig	2007-09-16 17:17:41.000000000 -0400
-+++ src/wbc-gtk-edit.c	2007-09-16 17:18:37.000000000 -0400
-@@ -887,8 +887,10 @@ wbcg_edit_start (WBCGtk *wbcg,
- 				GOFormat *new_fmt;
- 				int mbd;
- 
-+#ifndef WITH_GOFFICE_0_4
- 				mbd = go_format_month_before_day (fmt);
- 				if (mbd < 0)
-+#endif
- 					mbd = go_locale_month_before_day ();
- 
- 				fstr = g_string_new (mbd ? "m/d/yyyy" : "d/m/yyyy");
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 4017e0434c2f..953d7bb4d988 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -2,125 +2,123 @@ bin/gnumeric
 bin/gnumeric-%%VERSION%%
 bin/ssconvert
 bin/ssindex
-include/libspreadsheet-1-7/application.h
-include/libspreadsheet-1-7/auto-format.h
-include/libspreadsheet-1-7/cell-draw.h
-include/libspreadsheet-1-7/cell.h
-include/libspreadsheet-1-7/cellspan.h
-include/libspreadsheet-1-7/clipboard.h
-include/libspreadsheet-1-7/cmd-edit.h
-include/libspreadsheet-1-7/collect.h
-include/libspreadsheet-1-7/colrow.h
-include/libspreadsheet-1-7/command-context-stderr.h
-include/libspreadsheet-1-7/command-context.h
-include/libspreadsheet-1-7/commands.h
-include/libspreadsheet-1-7/complete-sheet.h
-include/libspreadsheet-1-7/complete.h
-include/libspreadsheet-1-7/complex.h
-include/libspreadsheet-1-7/consolidate.h
-include/libspreadsheet-1-7/dependent.h
-include/libspreadsheet-1-7/expr-impl.h
-include/libspreadsheet-1-7/expr-name.h
-include/libspreadsheet-1-7/expr.h
-include/libspreadsheet-1-7/file-autoft.h
-include/libspreadsheet-1-7/format-template.h
-include/libspreadsheet-1-7/func-builtin.h
-include/libspreadsheet-1-7/func.h
-include/libspreadsheet-1-7/gnm-datetime.h
-include/libspreadsheet-1-7/gnm-format.h
-include/libspreadsheet-1-7/gnm-graph-window.h
-include/libspreadsheet-1-7/gnm-pane-impl.h
-include/libspreadsheet-1-7/gnm-pane.h
-include/libspreadsheet-1-7/gnm-plugin.h
-include/libspreadsheet-1-7/gnm-so-filled.h
-include/libspreadsheet-1-7/gnm-so-line.h
-include/libspreadsheet-1-7/gnm-so-polygon.h
-include/libspreadsheet-1-7/gnm-style-impl.h
-include/libspreadsheet-1-7/gnumeric-gconf.h
-include/libspreadsheet-1-7/gnumeric-simple-canvas.h
-include/libspreadsheet-1-7/gnumeric.h
-include/libspreadsheet-1-7/graph.h
-include/libspreadsheet-1-7/gui-clipboard.h
-include/libspreadsheet-1-7/gui-file.h
-include/libspreadsheet-1-7/gui-gnumeric.h
-include/libspreadsheet-1-7/gui-util.h
-include/libspreadsheet-1-7/gutils.h
-include/libspreadsheet-1-7/history.h
-include/libspreadsheet-1-7/hlink-impl.h
-include/libspreadsheet-1-7/hlink.h
-include/libspreadsheet-1-7/input-msg.h
-include/libspreadsheet-1-7/item-acetate.h
-include/libspreadsheet-1-7/item-bar.h
-include/libspreadsheet-1-7/item-cursor.h
-include/libspreadsheet-1-7/item-debug.h
-include/libspreadsheet-1-7/item-edit.h
-include/libspreadsheet-1-7/item-grid.h
-include/libspreadsheet-1-7/libgnumeric.h
-include/libspreadsheet-1-7/mathfunc.h
-include/libspreadsheet-1-7/mstyle.h
-include/libspreadsheet-1-7/number-match.h
-include/libspreadsheet-1-7/numbers.h
-include/libspreadsheet-1-7/parse-util.h
-include/libspreadsheet-1-7/pattern.h
-include/libspreadsheet-1-7/pivottable.h
-include/libspreadsheet-1-7/position.h
-include/libspreadsheet-1-7/preview-grid-impl.h
-include/libspreadsheet-1-7/preview-grid.h
-include/libspreadsheet-1-7/print-cell.h
-include/libspreadsheet-1-7/print-info.h
-include/libspreadsheet-1-7/print.h
-include/libspreadsheet-1-7/rangefunc-strings.h
-include/libspreadsheet-1-7/rangefunc.h
-include/libspreadsheet-1-7/ranges.h
-include/libspreadsheet-1-7/regression.h
-include/libspreadsheet-1-7/rendered-value.h
-include/libspreadsheet-1-7/search.h
-include/libspreadsheet-1-7/selection.h
-include/libspreadsheet-1-7/session.h
-include/libspreadsheet-1-7/sheet-autofill.h
-include/libspreadsheet-1-7/sheet-control-gui-priv.h
-include/libspreadsheet-1-7/sheet-control-gui.h
-include/libspreadsheet-1-7/sheet-control-priv.h
-include/libspreadsheet-1-7/sheet-control.h
-include/libspreadsheet-1-7/sheet-filter-combo.h
-include/libspreadsheet-1-7/sheet-filter.h
-include/libspreadsheet-1-7/sheet-merge.h
-include/libspreadsheet-1-7/sheet-object-cell-comment.h
-include/libspreadsheet-1-7/sheet-object-graph.h
-include/libspreadsheet-1-7/sheet-object-image.h
-include/libspreadsheet-1-7/sheet-object-impl.h
-include/libspreadsheet-1-7/sheet-object-widget.h
-include/libspreadsheet-1-7/sheet-object.h
-include/libspreadsheet-1-7/sheet-private.h
-include/libspreadsheet-1-7/sheet-style.h
-include/libspreadsheet-1-7/sheet-view.h
-include/libspreadsheet-1-7/sheet.h
-include/libspreadsheet-1-7/solver.h
-include/libspreadsheet-1-7/sort.h
-include/libspreadsheet-1-7/stf-export.h
-include/libspreadsheet-1-7/stf-parse.h
-include/libspreadsheet-1-7/stf.h
-include/libspreadsheet-1-7/str.h
-include/libspreadsheet-1-7/style-border.h
-include/libspreadsheet-1-7/style-color.h
-include/libspreadsheet-1-7/style-conditions.h
-include/libspreadsheet-1-7/style-font.h
-include/libspreadsheet-1-7/style.h
-include/libspreadsheet-1-7/symbol.h
-include/libspreadsheet-1-7/validation-combo.h
-include/libspreadsheet-1-7/validation.h
-include/libspreadsheet-1-7/value.h
-include/libspreadsheet-1-7/wbc-gtk-impl.h
-include/libspreadsheet-1-7/wbc-gtk.h
-include/libspreadsheet-1-7/workbook-cmd-format.h
-include/libspreadsheet-1-7/workbook-control-priv.h
-include/libspreadsheet-1-7/workbook-control.h
-include/libspreadsheet-1-7/workbook-priv.h
-include/libspreadsheet-1-7/workbook-view.h
-include/libspreadsheet-1-7/workbook.h
-include/libspreadsheet-1-7/xml-io-version.h
-include/libspreadsheet-1-7/xml-io.h
-include/libspreadsheet-1-7/xml-sax.h
+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
+lib/gnumeric/%%VERSION%%/include/gnumeric-features.h
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.la
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
 lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
@@ -250,7 +248,7 @@ lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
 lib/libspreadsheet-%%VERSION%%.so
 lib/libspreadsheet.la
 lib/libspreadsheet.so
-libdata/pkgconfig/libspreadsheet-1.7.pc
+libdata/pkgconfig/libspreadsheet-1.8.pc
 @exec update-desktop-database > /dev/null || /usr/bin/true
 share/applications/gnumeric.desktop
 share/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
@@ -317,6 +315,7 @@ share/gnumeric/%%VERSION%%/glade/function-select.glade
 share/gnumeric/%%VERSION%%/glade/goalseek.glade
 share/gnumeric/%%VERSION%%/glade/goto.glade
 share/gnumeric/%%VERSION%%/glade/hf-config.glade
+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
@@ -324,7 +323,6 @@ share/gnumeric/%%VERSION%%/glade/mean-tests.glade
 share/gnumeric/%%VERSION%%/glade/merge.glade
 share/gnumeric/%%VERSION%%/glade/moving-averages.glade
 share/gnumeric/%%VERSION%%/glade/paste-names.glade
-share/gnumeric/%%VERSION%%/glade/pivottable.glade
 share/gnumeric/%%VERSION%%/glade/plugin-manager.glade
 share/gnumeric/%%VERSION%%/glade/preferences.glade
 share/gnumeric/%%VERSION%%/glade/print.glade
@@ -568,7 +566,6 @@ share/gnome/help/gnumeric/C/figures/example-data.png
 share/gnome/help/gnumeric/C/figures/files-html-example.png
 share/gnome/help/gnumeric/C/figures/files-html32-example.png
 share/gnome/help/gnumeric/C/figures/files-html40-example.png
-share/gnome/help/gnumeric/C/figures/gnumeric-empty.510.png
 share/gnome/help/gnumeric/C/figures/gnumeric-icon-24.png
 share/gnome/help/gnumeric/C/figures/gnumeric-labelled.png
 share/gnome/help/gnumeric/C/figures/gnumeric-power-example.png
@@ -705,10 +702,7 @@ share/gnome/help/gnumeric/C/figures/textguru-import-panel1-withTags.png
 share/gnome/help/gnumeric/C/figures/textguru-import-panel2a-withTags.png
 share/gnome/help/gnumeric/C/figures/textguru-import-panel2b-withTags.png
 share/gnome/help/gnumeric/C/figures/textguru-import-panel3-withTags.png
-share/gnome/help/gnumeric/C/figures/toolbar-format.510.png
 share/gnome/help/gnumeric/C/figures/toolbar-object.png
-share/gnome/help/gnumeric/C/figures/toolbar-standard.510.png
-share/gnome/help/gnumeric/C/figures/toolbars.510.png
 share/gnome/help/gnumeric/C/figures/widget-checkbox.png
 share/gnome/help/gnumeric/C/figures/widget-combobox.png
 share/gnome/help/gnumeric/C/figures/widget-entryBox-outlined.png
@@ -845,8 +839,8 @@ share/locale/nl/LC_MESSAGES/gnumeric-functions.mo
 share/locale/nl/LC_MESSAGES/gnumeric.mo
 share/locale/nn/LC_MESSAGES/gnumeric-functions.mo
 share/locale/nn/LC_MESSAGES/gnumeric.mo
-share/locale/no/LC_MESSAGES/gnumeric-functions.mo
-share/locale/no/LC_MESSAGES/gnumeric.mo
+share/locale/oc/LC_MESSAGES/gnumeric-functions.mo
+share/locale/oc/LC_MESSAGES/gnumeric.mo
 share/locale/pl/LC_MESSAGES/gnumeric-functions.mo
 share/locale/pl/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric-functions.mo
@@ -938,14 +932,18 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins/corba
 @dirrm lib/gnumeric/%%VERSION%%/plugins/applix
 @dirrm lib/gnumeric/%%VERSION%%/plugins
+@dirrm lib/gnumeric/%%VERSION%%/include
 @dirrm lib/gnumeric/%%VERSION%%
 @dirrm lib/gnumeric
-@dirrm include/libspreadsheet-1-7
+@dirrm include/libspreadsheet-1.8/spreadsheet
+@dirrm include/libspreadsheet-1.8
 @unexec update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES