Update to 1.12.3.

This version is based on Gtk3.

3 files changed, 201 insertions, 256 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 16309f855a66..2b1c315c7b78 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,50 +1,44 @@
 # Created by: Yukihiro Nakai <Nakai@technologist.com>
 # $FreeBSD$
-#   $MCom: ports-stable/math/gnumeric/Makefile,v 1.5 2010/06/29 11:24:22 kwm Exp $
-# When updating, remember to update pkg-plist of gchemutils.
+#   $MCom: ports/trunk/math/gnumeric/Makefile 18444 2013-05-11 12:51:26Z kwm $
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.10.17
-PORTREVISION=	2
+PORTVERSION=	1.12.3
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	The GNOME 2 spreadsheet
+COMMENT=	GNOME spreadsheet program
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	goffice-0.8:${PORTSDIR}/devel/goffice \
+LIB_DEPENDS=	goffice-0.10:${PORTSDIR}/devel/goffice010 \
 		psiconv:${PORTSDIR}/converters/psiconv
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_XZ=		yes
+USES=		desktop-file-utils gettext pathfix shared-mime-info
 USE_GMAKE=	yes
-USES=		pathfix gettext
-USE_GNOME=	gnomeprefix intlhack gnomehier pygtk2 \
-		desktopfileutils libgsf
-USE_PYTHON=	yes
+USE_GNOME=	gnomehier gnomeprefix intlhack libgsf pygobject3
+USE_PYTHON=	-2.7
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-USE_CSTD=	gnu89
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gnome=no --disable-silent-rules
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
-		python_prog=${PYTHON_VERSION}
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 GLIB_SCHEMAS=	org.gnome.gnumeric.dialogs.gschema.xml \
 		org.gnome.gnumeric.gschema.xml \
 		org.gnome.gnumeric.plugin.gschema.xml
 
-MAN1=		gnumeric.1 ssconvert.1 ssindex.1 ssgrep.1
+MAN1=		gnumeric.1 ssconvert.1 ssdiff.1 ssindex.1 ssgrep.1
 
-PLIST_SUB=	VERSION=${PORTVERSION} GOFFICE=0.8.17
+PLIST_SUB=	VERSION=${PORTVERSION} GOFFICE=0.10 SHORT_VER=1.12
 
 OPTIONS_DEFINE=	PERL
 OPTIONS_DEFAULT=PERL
@@ -70,16 +64,12 @@ PLIST_SUB+=		GNOMEDB="@comment "
 #.endif
 
 post-patch:
-	@${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in
-	@${REINPLACE_CMD} -e 's|gda-3.0 >= 3.1.1|gda-3.0 >= 3.0.1|g' \
-		-e 's|gnomedb-3.0 >= 3.0.1|gnomedb-3.0 >= 3.0.0|g' \
-		-e 's|gnumeric_with_gconf=true|gnumeric_with_gconf=false|g' \
-			${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|^GETTEXT_PACKAGE=gnumeric-$${VERSION}|GETTEXT_PACKAGE=gnumeric|g' \
+		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/gnumeric.mime ${PREFIX}/share/mime-info
-	@-update-desktop-database
 .for dir in share lib
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${dir}/gnumeric
 .endfor
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index ce43d4759100..97bc96c7d448 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnumeric-1.10.17.tar.xz) = 8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963
-SIZE (gnome2/gnumeric-1.10.17.tar.xz) = 14332716
+SHA256 (gnome3/gnumeric-1.12.3.tar.xz) = b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6
+SIZE (gnome3/gnumeric-1.12.3.tar.xz) = 15503384
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 0301d0f5fe63..a959b0136948 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -1,139 +1,141 @@
 bin/gnumeric
 bin/gnumeric-%%VERSION%%
 bin/ssconvert
+bin/ssdiff
 bin/ssindex
 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-command-impl.h
-include/libspreadsheet-1.10/spreadsheet/gnm-commands-slicer.h
-include/libspreadsheet-1.10/spreadsheet/gnm-data-cache-source.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-random.h
-include/libspreadsheet-1.10/spreadsheet/gnm-sheet-slicer.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-features.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/go-data-cache-field.h
-include/libspreadsheet-1.10/spreadsheet/go-data-cache-source.h
-include/libspreadsheet-1.10/spreadsheet/go-data-cache.h
-include/libspreadsheet-1.10/spreadsheet/go-data-slicer-field.h
-include/libspreadsheet-1.10/spreadsheet/go-data-slicer.h
-include/libspreadsheet-1.10/spreadsheet/go-val.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-bar.h
-include/libspreadsheet-1.10/spreadsheet/item-cursor.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-widget-impl.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-utils.h
-include/libspreadsheet-1.10/spreadsheet/sheet-view.h
-include/libspreadsheet-1.10/spreadsheet/sheet.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/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/tools/dao.h
-include/libspreadsheet-1.10/spreadsheet/tools/gnm-solver.h
-include/libspreadsheet-1.10/spreadsheet/tools/tools.h
-include/libspreadsheet-1.10/spreadsheet/undo.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/widgets/gnm-notebook.h
-include/libspreadsheet-1.10/spreadsheet/widgets/gnumeric-expr-entry.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-sax.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/application.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/auto-format.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/cell-draw.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/cell.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/cellspan.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/clipboard.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/cmd-edit.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/collect.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/colrow.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/command-context-stderr.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/command-context.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/commands.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/complete-sheet.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/complete.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/complex.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/consolidate.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/dependent.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/expr-impl.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/expr-name.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/expr.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/file-autoft.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/format-template.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/func-builtin.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/func.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-command-impl.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-commands-slicer.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-data-cache-source.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-datetime.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-format.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-graph-window.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-pane.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-plugin.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-random.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-sheet-slicer.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-so-filled.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-so-line.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-so-path.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-so-polygon.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-style-impl.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric-conf.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric-features.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric-fwd.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric-simple-canvas.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/go-data-cache-field.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/go-data-cache-source.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/go-data-cache.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/go-data-slicer-field.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/go-data-slicer.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/go-val.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/graph.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gui-clipboard.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gui-file.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gui-util.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gutils.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/history.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/hlink-impl.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/hlink.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/input-msg.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/item-bar.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/item-cursor.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/item-edit.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/item-grid.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/libgnumeric.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/mathfunc.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/mstyle.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/number-match.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/numbers.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/parse-util.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/pattern.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/position.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/preview-grid.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/print-cell.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/print-info.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/print.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/rangefunc-strings.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/rangefunc.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/ranges.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/regression.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/rendered-value.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/search.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/selection.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/session.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-autofill.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-control-gui-priv.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-control-gui.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-control-priv.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-control.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-filter-combo.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-filter.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-merge.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-cell-comment.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-component.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-graph.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-image.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-impl.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-widget.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-widget-impl.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-private.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-style.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-utils.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-view.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sort.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/stf-export.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/stf-parse.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/stf.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/style-border.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/style-color.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/style-conditions.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/style-font.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/style.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/tools/dao.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/tools/gnm-solver.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/tools/tools.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/undo.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/validation-combo.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/validation.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/value.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/wbc-gtk-impl.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/wbc-gtk.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/widgets/gnm-notebook.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/widgets/gnumeric-expr-entry.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook-cmd-format.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook-control-priv.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook-control.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook-priv.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook-view.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/xml-io-version.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/xml-sax.h
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.la
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
 lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
@@ -283,8 +285,7 @@ lib/goffice/%%GOFFICE%%/plugins/gnumeric/plugin.xml
 lib/libspreadsheet-%%VERSION%%.so
 lib/libspreadsheet.la
 lib/libspreadsheet.so
-libdata/pkgconfig/libspreadsheet-1.10.pc
-@exec update-desktop-database > /dev/null || /usr/bin/true
+libdata/pkgconfig/libspreadsheet-%%SHORT_VER%%.pc
 share/applications/gnumeric.desktop
 share/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
 share/gnumeric/%%VERSION%%/Gnumeric-embed.xml
@@ -322,86 +323,6 @@ share/gnumeric/%%VERSION%%/templates/invoice.gnumeric
 share/gnumeric/%%VERSION%%/templates/loan.gnumeric
 share/gnumeric/%%VERSION%%/templates/mileage.gnumeric
 share/gnumeric/%%VERSION%%/templates/purchase_order.gnumeric
-share/gnumeric/%%VERSION%%/ui/advanced-filter.ui
-share/gnumeric/%%VERSION%%/ui/anova-one.ui
-share/gnumeric/%%VERSION%%/ui/anova-two.ui
-share/gnumeric/%%VERSION%%/ui/autofilter-expression.ui
-share/gnumeric/%%VERSION%%/ui/autofilter-top10.ui
-share/gnumeric/%%VERSION%%/ui/autoformat.ui
-share/gnumeric/%%VERSION%%/ui/autosave.ui
-share/gnumeric/%%VERSION%%/ui/cell-comment.ui
-share/gnumeric/%%VERSION%%/ui/cell-format.ui
-share/gnumeric/%%VERSION%%/ui/cell-format-cond.ui
-share/gnumeric/%%VERSION%%/ui/cell-sort.ui
-share/gnumeric/%%VERSION%%/ui/chi-squared.ui
-share/gnumeric/%%VERSION%%/ui/col-width.ui
-share/gnumeric/%%VERSION%%/ui/colrow.ui
-share/gnumeric/%%VERSION%%/ui/consolidate.ui
-share/gnumeric/%%VERSION%%/ui/correlation.ui
-share/gnumeric/%%VERSION%%/ui/covariance.ui
-share/gnumeric/%%VERSION%%/ui/dao.ui
-share/gnumeric/%%VERSION%%/ui/data-slicer.ui
-share/gnumeric/%%VERSION%%/ui/data-table.ui
-share/gnumeric/%%VERSION%%/ui/define-name.ui
-share/gnumeric/%%VERSION%%/ui/delete-cells.ui
-share/gnumeric/%%VERSION%%/ui/descriptive-stats.ui
-share/gnumeric/%%VERSION%%/ui/dialog-stf-export.ui
-share/gnumeric/%%VERSION%%/ui/dialog-stf.ui
-share/gnumeric/%%VERSION%%/ui/dialog-zoom.ui
-share/gnumeric/%%VERSION%%/ui/doc-meta-data.ui
-share/gnumeric/%%VERSION%%/ui/exp-smoothing.ui
-share/gnumeric/%%VERSION%%/ui/fill-series.ui
-share/gnumeric/%%VERSION%%/ui/font-sel.ui
-share/gnumeric/%%VERSION%%/ui/formula-guru.ui
-share/gnumeric/%%VERSION%%/ui/fourier-analysis.ui
-share/gnumeric/%%VERSION%%/ui/frequency.ui
-share/gnumeric/%%VERSION%%/ui/function-select.ui
-share/gnumeric/%%VERSION%%/ui/goalseek.ui
-share/gnumeric/%%VERSION%%/ui/goto.ui
-share/gnumeric/%%VERSION%%/ui/hf-config.ui
-share/gnumeric/%%VERSION%%/ui/hf-dt-format.ui
-share/gnumeric/%%VERSION%%/ui/histogram.ui
-share/gnumeric/%%VERSION%%/ui/hyperlink.ui
-share/gnumeric/%%VERSION%%/ui/insert-cells.ui
-share/gnumeric/%%VERSION%%/ui/kaplan-meier.ui
-share/gnumeric/%%VERSION%%/ui/mean-tests.ui
-share/gnumeric/%%VERSION%%/ui/merge.ui
-share/gnumeric/%%VERSION%%/ui/moving-averages.ui
-share/gnumeric/%%VERSION%%/ui/normality-tests.ui
-share/gnumeric/%%VERSION%%/ui/paste-special.ui
-share/gnumeric/%%VERSION%%/ui/plugin-manager.ui
-share/gnumeric/%%VERSION%%/ui/preferences.ui
-share/gnumeric/%%VERSION%%/ui/principal-components.ui
-share/gnumeric/%%VERSION%%/ui/print.ui
-share/gnumeric/%%VERSION%%/ui/random-generation-cor.ui
-share/gnumeric/%%VERSION%%/ui/random-generation.ui
-share/gnumeric/%%VERSION%%/ui/rank.ui
-share/gnumeric/%%VERSION%%/ui/regression.ui
-share/gnumeric/%%VERSION%%/ui/row-height.ui
-share/gnumeric/%%VERSION%%/ui/sampling.ui
-share/gnumeric/%%VERSION%%/ui/scenario-add.ui
-share/gnumeric/%%VERSION%%/ui/scenario-manager.ui
-share/gnumeric/%%VERSION%%/ui/search.ui
-share/gnumeric/%%VERSION%%/ui/search-replace.ui
-share/gnumeric/%%VERSION%%/ui/sheet-order.ui
-share/gnumeric/%%VERSION%%/ui/sheet-resize.ui
-share/gnumeric/%%VERSION%%/ui/sheetobject-size.ui
-share/gnumeric/%%VERSION%%/ui/shuffle.ui
-share/gnumeric/%%VERSION%%/ui/sign-test-two.ui
-share/gnumeric/%%VERSION%%/ui/sign-test.ui
-share/gnumeric/%%VERSION%%/ui/simulation.ui
-share/gnumeric/%%VERSION%%/ui/so-button.ui
-share/gnumeric/%%VERSION%%/ui/so-checkbox.ui
-share/gnumeric/%%VERSION%%/ui/so-frame.ui
-share/gnumeric/%%VERSION%%/ui/so-list.ui
-share/gnumeric/%%VERSION%%/ui/so-radiobutton.ui
-share/gnumeric/%%VERSION%%/ui/so-scrollbar.ui
-share/gnumeric/%%VERSION%%/ui/solver.ui
-share/gnumeric/%%VERSION%%/ui/tabulate.ui
-share/gnumeric/%%VERSION%%/ui/variance-tests.ui
-share/gnumeric/%%VERSION%%/ui/view.ui
-share/gnumeric/%%VERSION%%/ui/wilcoxon-mann-whitney.ui
-share/gnumeric/%%VERSION%%/ui/workbook-attr.ui
 share/gnome/help/gnumeric/C/about-authors.xml
 share/gnome/help/gnumeric/C/about-history.xml
 share/gnome/help/gnumeric/C/about-license.xml
@@ -415,18 +336,19 @@ share/gnome/help/gnumeric/C/analysis-statistical.xml
 share/gnome/help/gnumeric/C/appendix-glossary.xml
 share/gnome/help/gnumeric/C/appendix-keybindings.xml
 share/gnome/help/gnumeric/C/bugs.xml
+share/gnome/help/gnumeric/C/compiling.xml
 share/gnome/help/gnumeric/C/configuration-localization.xml
 share/gnome/help/gnumeric/C/configuration-overview.xml
 share/gnome/help/gnumeric/C/configuration-plugins.xml
 share/gnome/help/gnumeric/C/configuration-preferences.xml
 share/gnome/help/gnumeric/C/configuration-toolbars.xml
-share/gnome/help/gnumeric/C/compiling.xml
 share/gnome/help/gnumeric/C/data-commentNlink.xml
 share/gnome/help/gnumeric/C/data-delete.xml
 share/gnome/help/gnumeric/C/data-entry-advanced.xml
 share/gnome/help/gnumeric/C/data-entry-external.xml
 share/gnome/help/gnumeric/C/data-entry.xml
 share/gnome/help/gnumeric/C/data-filter.xml
+share/gnome/help/gnumeric/C/data-format-conditional.xml
 share/gnome/help/gnumeric/C/data-format.xml
 share/gnome/help/gnumeric/C/data-generate.xml
 share/gnome/help/gnumeric/C/data-insert.xml
@@ -442,6 +364,20 @@ share/gnome/help/gnumeric/C/extending-plugins.xml
 share/gnome/help/gnumeric/C/extending-python.xml
 share/gnome/help/gnumeric/C/figures/advanced-filter-1.png
 share/gnome/help/gnumeric/C/figures/advanced-filter-2.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-confidence-interval-equation.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-demand-ex1.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-demand-ex2.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-interations-equation1.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-interations-equation2.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-maximumtime-dialog.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-options-dialog.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-output-dialog.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-profit-ex1.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-profit-ex2.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-report-screen.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-simtable-screen.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-summary-dialog.png
+share/gnome/help/gnumeric/C/figures/analysis-simulation-variables-dialog.png
 share/gnome/help/gnumeric/C/figures/analysistools-ANOVA1-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-ANOVA1-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-ANOVA2w-ex1.png
@@ -480,11 +416,11 @@ 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-ex4.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex5.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-kaplan-ex1.png
@@ -559,6 +495,7 @@ share/gnome/help/gnumeric/C/figures/button-align-right.png
 share/gnome/help/gnumeric/C/figures/button-arrow.png
 share/gnome/help/gnumeric/C/figures/button-bold.png
 share/gnome/help/gnumeric/C/figures/button-borders.png
+share/gnome/help/gnumeric/C/figures/button-button.png
 share/gnome/help/gnumeric/C/figures/button-center-across-selection.png
 share/gnome/help/gnumeric/C/figures/button-checkbox.png
 share/gnome/help/gnumeric/C/figures/button-combo.png
@@ -592,6 +529,7 @@ share/gnome/help/gnumeric/C/figures/button-paste.png
 share/gnome/help/gnumeric/C/figures/button-percent.png
 share/gnome/help/gnumeric/C/figures/button-preview.png
 share/gnome/help/gnumeric/C/figures/button-print.png
+share/gnome/help/gnumeric/C/figures/button-radio.png
 share/gnome/help/gnumeric/C/figures/button-rectangle.png
 share/gnome/help/gnumeric/C/figures/button-redo-and-history.png
 share/gnome/help/gnumeric/C/figures/button-save.png
@@ -601,7 +539,9 @@ share/gnome/help/gnumeric/C/figures/button-sort-az.png
 share/gnome/help/gnumeric/C/figures/button-sort-za.png
 share/gnome/help/gnumeric/C/figures/button-spin.png
 share/gnome/help/gnumeric/C/figures/button-split.png
+share/gnome/help/gnumeric/C/figures/button-subscript.png
 share/gnome/help/gnumeric/C/figures/button-sum.png
+share/gnome/help/gnumeric/C/figures/button-superscript.png
 share/gnome/help/gnumeric/C/figures/button-text-colour.png
 share/gnome/help/gnumeric/C/figures/button-thousands.png
 share/gnome/help/gnumeric/C/figures/button-underline.png
@@ -666,9 +606,11 @@ 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/formula-dmedian.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
+share/gnome/help/gnumeric/C/figures/graph-axes-grid.png
 share/gnome/help/gnumeric/C/figures/graph-components.png
 share/gnome/help/gnumeric/C/figures/graph-example-area.png
 share/gnome/help/gnumeric/C/figures/graph-example-bar.png
@@ -718,6 +660,9 @@ share/gnome/help/gnumeric/C/figures/graphs-types-ring.png
 share/gnome/help/gnumeric/C/figures/graphs-types-stock.png
 share/gnome/help/gnumeric/C/figures/graphs-types-surface.png
 share/gnome/help/gnumeric/C/figures/graphs-types-xyplot.png
+share/gnome/help/gnumeric/C/figures/icon-locked.png
+share/gnome/help/gnumeric/C/figures/icon-unlocked.png
+share/gnome/help/gnumeric/C/figures/icon-visible.png
 share/gnome/help/gnumeric/C/figures/info-area.png
 share/gnome/help/gnumeric/C/figures/menu-context-col-row-header.png
 share/gnome/help/gnumeric/C/figures/menu-context-graph-order.png
@@ -725,11 +670,15 @@ share/gnome/help/gnumeric/C/figures/menu-context-graph.png
 share/gnome/help/gnumeric/C/figures/menu-context-grid.png
 share/gnome/help/gnumeric/C/figures/menu-context-object-order.png
 share/gnome/help/gnumeric/C/figures/menu-context-object.png
+share/gnome/help/gnumeric/C/figures/menu-context-sheet-tabs.png
 share/gnome/help/gnumeric/C/figures/menu-context-tabs.png
 share/gnome/help/gnumeric/C/figures/menu-context-toolbars.png
+share/gnome/help/gnumeric/C/figures/menu-data-export.png
+share/gnome/help/gnumeric/C/figures/menu-data-import.png
 share/gnome/help/gnumeric/C/figures/menu-data-labelled.png
 share/gnome/help/gnumeric/C/figures/menu-edit-delete-cells.png
 share/gnome/help/gnumeric/C/figures/menu-edit-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-edit-modify-names.png
 share/gnome/help/gnumeric/C/figures/menu-edit-paste-special.png
 share/gnome/help/gnumeric/C/figures/menu-edit-select.png
 share/gnome/help/gnumeric/C/figures/menu-file-labelled.png
@@ -738,10 +687,16 @@ share/gnome/help/gnumeric/C/figures/menu-format-column.png
 share/gnome/help/gnumeric/C/figures/menu-format-labelled.png
 share/gnome/help/gnumeric/C/figures/menu-format-sheet.png
 share/gnome/help/gnumeric/C/figures/menu-help-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-insert-comment.png
+share/gnome/help/gnumeric/C/figures/menu-insert-fw.png
+share/gnome/help/gnumeric/C/figures/menu-insert-hyperlink.png
 share/gnome/help/gnumeric/C/figures/menu-insert-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-insert-names.png
+share/gnome/help/gnumeric/C/figures/menu-statistics-labelled.png
 share/gnome/help/gnumeric/C/figures/menu-tools-labelled.png
 share/gnome/help/gnumeric/C/figures/menu-torn-off.png
 share/gnome/help/gnumeric/C/figures/menu-view-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-view-properties-dialog-cm.png
 share/gnome/help/gnumeric/C/figures/menu-view-properties-dialog.png
 share/gnome/help/gnumeric/C/figures/menubar.png
 share/gnome/help/gnumeric/C/figures/number-format-border-dialog.png
@@ -812,7 +767,10 @@ 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-extension-menu.png
 share/gnome/help/gnumeric/C/figures/toolbar-object.png
+share/gnome/help/gnumeric/C/figures/toolbar-standard.png
+share/gnome/help/gnumeric/C/figures/toolbars.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
@@ -827,6 +785,7 @@ share/gnome/help/gnumeric/C/figures/worksheet-data-1.png
 share/gnome/help/gnumeric/C/figures/worksheet-data-2.png
 share/gnome/help/gnumeric/C/figures/worksheet-data-3.png
 share/gnome/help/gnumeric/C/figures/worksheet-data-4.png
+share/gnome/help/gnumeric/C/figures/worksheet-managing-dialog.png
 share/gnome/help/gnumeric/C/figures/worksheet-rows-1.png
 share/gnome/help/gnumeric/C/figures/worksheet-running-calc-1.png
 share/gnome/help/gnumeric/C/files-email.xml
@@ -872,17 +831,11 @@ 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/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/gnumeric-about.png
-share/pixmaps/gnumeric/orient-horizontal.png
-share/pixmaps/gnumeric/orient-vertical.png
-share/pixmaps/gnumeric/right-down.png
-share/pixmaps/gnumeric/stf-druid.png
 share/pixmaps/gnumeric/win32-gnumeric.ico
 share/pixmaps/win32-gnumeric.ico
 share/locale/am/LC_MESSAGES/gnumeric-functions.mo
@@ -913,6 +866,8 @@ share/locale/en_CA/LC_MESSAGES/gnumeric-functions.mo
 share/locale/en_CA/LC_MESSAGES/gnumeric.mo
 share/locale/en_GB/LC_MESSAGES/gnumeric-functions.mo
 share/locale/en_GB/LC_MESSAGES/gnumeric.mo
+share/locale/eo/LC_MESSAGES/gnumeric-functions.mo
+share/locale/eo/LC_MESSAGES/gnumeric.mo
 share/locale/es/LC_MESSAGES/gnumeric-functions.mo
 share/locale/es/LC_MESSAGES/gnumeric.mo
 share/locale/et/LC_MESSAGES/gnumeric-functions.mo
@@ -999,6 +954,8 @@ share/locale/vi/LC_MESSAGES/gnumeric-functions.mo
 share/locale/vi/LC_MESSAGES/gnumeric.mo
 share/locale/zh_CN/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_CN/LC_MESSAGES/gnumeric.mo
+share/locale/zh_HK/LC_MESSAGES/gnumeric-functions.mo
+share/locale/zh_HK/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm share/pixmaps/gnumeric
@@ -1006,10 +963,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm share/gnome/help/gnumeric/C/figures
 @dirrm share/gnome/help/gnumeric/C
 @dirrm share/gnome/help/gnumeric
-@dirrm share/gnumeric/%%VERSION%%/ui
 @dirrm share/gnumeric/%%VERSION%%/templates
-@dirrm share/gnumeric/%%VERSION%%/doc/C
-@dirrm share/gnumeric/%%VERSION%%/doc
 @dirrm share/gnumeric/%%VERSION%%/autoformat-templates/List
 @dirrm share/gnumeric/%%VERSION%%/autoformat-templates/General
 @dirrm share/gnumeric/%%VERSION%%/autoformat-templates/Financial
@@ -1069,12 +1023,13 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins
 @dirrm lib/gnumeric/%%VERSION%%
 @dirrm lib/gnumeric
-@dirrm include/libspreadsheet-1.10/spreadsheet/widgets
-@dirrm include/libspreadsheet-1.10/spreadsheet/tools
-@dirrm include/libspreadsheet-1.10/spreadsheet
-@dirrm include/libspreadsheet-1.10
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@dirrm include/libspreadsheet-%%SHORT_VER%%/spreadsheet/widgets
+@dirrm include/libspreadsheet-%%SHORT_VER%%/spreadsheet/tools
+@dirrm include/libspreadsheet-%%SHORT_VER%%/spreadsheet
+@dirrm include/libspreadsheet-%%SHORT_VER%%
 @dirrmtry share/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/rw/LC_MESSAGES