3 files changed, 190 insertions, 169 deletions

diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 0ab5990c991e..a28968cafd06 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -8,8 +8,7 @@
 # !!! When updating goffice, don't forget to update science/gchempaint pkg-plists too! !!!
 
 PORTNAME=	goffice
-PORTVERSION=	0.4.3
-PORTREVISION=	2
+PORTVERSION=	0.6.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/goffice/distinfo b/devel/goffice/distinfo
index fdd79a8cb6ca..430d74d6cdd3 100644
--- a/devel/goffice/distinfo
+++ b/devel/goffice/distinfo
@@ -1,3 +1,3 @@
-MD5 (goffice-0.4.3.tar.bz2) = f299e3a469e11609910d72d007420aa7
-SHA256 (goffice-0.4.3.tar.bz2) = 1687a01596888093b23a2c835e8c0c62af79d572fa3dfbf79b22625d056debba
-SIZE (goffice-0.4.3.tar.bz2) = 1767305
+MD5 (goffice-0.6.1.tar.bz2) = faa72fc615f34b4da8c72d06420f5260
+SHA256 (goffice-0.6.1.tar.bz2) = a8956a3a12f7d959c95f9213fcf29e54e1e0a3d2cb2326bd3f79e6446e877e82
+SIZE (goffice-0.6.1.tar.bz2) = 1869159
diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist
index d74849541cd1..773ba1a45064 100644
--- a/devel/goffice/pkg-plist
+++ b/devel/goffice/pkg-plist
@@ -1,138 +1,143 @@
-include/libgoffice-0.4/goffice/app/error-info.h
-include/libgoffice-0.4/goffice/app/file.h
-include/libgoffice-0.4/goffice/app/go-cmd-context-impl.h
-include/libgoffice-0.4/goffice/app/go-cmd-context.h
-include/libgoffice-0.4/goffice/app/go-doc-control-impl.h
-include/libgoffice-0.4/goffice/app/go-doc-control.h
-include/libgoffice-0.4/goffice/app/go-doc-impl.h
-include/libgoffice-0.4/goffice/app/go-doc.h
-include/libgoffice-0.4/goffice/app/go-plugin-loader-module.h
-include/libgoffice-0.4/goffice/app/go-plugin-loader.h
-include/libgoffice-0.4/goffice/app/go-plugin-service-impl.h
-include/libgoffice-0.4/goffice/app/go-plugin-service.h
-include/libgoffice-0.4/goffice/app/go-plugin.h
-include/libgoffice-0.4/goffice/app/goffice-app.h
-include/libgoffice-0.4/goffice/app/io-context-priv.h
-include/libgoffice-0.4/goffice/app/io-context.h
-include/libgoffice-0.4/goffice/app/module-plugin-defs.h
-include/libgoffice-0.4/goffice/component/go-component-factory.h
-include/libgoffice-0.4/goffice/component/go-component.h
-include/libgoffice-0.4/goffice/component/goffice-component.h
-include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
-include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
-include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
-include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
-include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
-include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
-include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
-include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas.h
-include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/libfoocanvas.h
-include/libgoffice-0.4/goffice/data/go-data-impl.h
-include/libgoffice-0.4/goffice/data/go-data-simple.h
-include/libgoffice-0.4/goffice/data/go-data.h
-include/libgoffice-0.4/goffice/data/goffice-data.h
-include/libgoffice-0.4/goffice/drawing/god-anchor.h
-include/libgoffice-0.4/goffice/drawing/god-default-attributes.h
-include/libgoffice-0.4/goffice/drawing/god-drawing-group.h
-include/libgoffice-0.4/goffice/drawing/god-drawing-renderer-gdk.h
-include/libgoffice-0.4/goffice/drawing/god-drawing-view.h
-include/libgoffice-0.4/goffice/drawing/god-drawing.h
-include/libgoffice-0.4/goffice/drawing/god-image-store.h
-include/libgoffice-0.4/goffice/drawing/god-image.h
-include/libgoffice-0.4/goffice/drawing/god-paragraph-attributes.h
-include/libgoffice-0.4/goffice/drawing/god-property-table.h
-include/libgoffice-0.4/goffice/drawing/god-shape.h
-include/libgoffice-0.4/goffice/drawing/god-text-model.h
-include/libgoffice-0.4/goffice/goffice-features.h
-include/libgoffice-0.4/goffice/goffice.h
-include/libgoffice-0.4/goffice/graph/goffice-graph.h
-include/libgoffice-0.4/goffice/graph/gog-axis-line-impl.h
-include/libgoffice-0.4/goffice/graph/gog-axis-line.h
-include/libgoffice-0.4/goffice/graph/gog-axis.h
-include/libgoffice-0.4/goffice/graph/gog-chart-impl.h
-include/libgoffice-0.4/goffice/graph/gog-chart.h
-include/libgoffice-0.4/goffice/graph/gog-control-foocanvas.h
-include/libgoffice-0.4/goffice/graph/gog-data-allocator.h
-include/libgoffice-0.4/goffice/graph/gog-data-set.h
-include/libgoffice-0.4/goffice/graph/gog-error-bar.h
-include/libgoffice-0.4/goffice/graph/gog-graph-impl.h
-include/libgoffice-0.4/goffice/graph/gog-graph.h
-include/libgoffice-0.4/goffice/graph/gog-grid-line.h
-include/libgoffice-0.4/goffice/graph/gog-grid.h
-include/libgoffice-0.4/goffice/graph/gog-guru.h
-include/libgoffice-0.4/goffice/graph/gog-label.h
-include/libgoffice-0.4/goffice/graph/gog-legend.h
-include/libgoffice-0.4/goffice/graph/gog-object-xml.h
-include/libgoffice-0.4/goffice/graph/gog-object.h
-include/libgoffice-0.4/goffice/graph/gog-outlined-object.h
-include/libgoffice-0.4/goffice/graph/gog-plot-engine.h
-include/libgoffice-0.4/goffice/graph/gog-plot-impl.h
-include/libgoffice-0.4/goffice/graph/gog-plot.h
-include/libgoffice-0.4/goffice/graph/gog-reg-curve.h
-include/libgoffice-0.4/goffice/graph/gog-renderer-cairo.h
-include/libgoffice-0.4/goffice/graph/gog-renderer-gnome-print.h
-include/libgoffice-0.4/goffice/graph/gog-renderer-impl.h
-include/libgoffice-0.4/goffice/graph/gog-renderer.h
-include/libgoffice-0.4/goffice/graph/gog-series-impl.h
-include/libgoffice-0.4/goffice/graph/gog-series-lines.h
-include/libgoffice-0.4/goffice/graph/gog-series.h
-include/libgoffice-0.4/goffice/graph/gog-smoothed-curve.h
-include/libgoffice-0.4/goffice/graph/gog-style.h
-include/libgoffice-0.4/goffice/graph/gog-styled-object.h
-include/libgoffice-0.4/goffice/graph/gog-theme.h
-include/libgoffice-0.4/goffice/graph/gog-trend-line.h
-include/libgoffice-0.4/goffice/graph/gog-view.h
-include/libgoffice-0.4/goffice/gtk/go-action-combo-color.h
-include/libgoffice-0.4/goffice/gtk/go-action-combo-pixmaps.h
-include/libgoffice-0.4/goffice/gtk/go-action-combo-stack.h
-include/libgoffice-0.4/goffice/gtk/go-action-combo-text.h
-include/libgoffice-0.4/goffice/gtk/go-charmap-sel.h
-include/libgoffice-0.4/goffice/gtk/go-color-group.h
-include/libgoffice-0.4/goffice/gtk/go-color-palette.h
-include/libgoffice-0.4/goffice/gtk/go-color-selector.h
-include/libgoffice-0.4/goffice/gtk/go-combo-box.h
-include/libgoffice-0.4/goffice/gtk/go-combo-color.h
-include/libgoffice-0.4/goffice/gtk/go-combo-pixmaps.h
-include/libgoffice-0.4/goffice/gtk/go-combo-text.h
-include/libgoffice-0.4/goffice/gtk/go-font-sel.h
-include/libgoffice-0.4/goffice/gtk/go-format-sel.h
-include/libgoffice-0.4/goffice/gtk/go-gradient-selector.h
-include/libgoffice-0.4/goffice/gtk/go-graph-widget.h
-include/libgoffice-0.4/goffice/gtk/go-line-selector.h
-include/libgoffice-0.4/goffice/gtk/go-locale-sel.h
-include/libgoffice-0.4/goffice/gtk/go-marker-selector.h
-include/libgoffice-0.4/goffice/gtk/go-optionmenu.h
-include/libgoffice-0.4/goffice/gtk/go-palette.h
-include/libgoffice-0.4/goffice/gtk/go-pattern-selector.h
-include/libgoffice-0.4/goffice/gtk/go-rotation-sel.h
-include/libgoffice-0.4/goffice/gtk/go-selector.h
-include/libgoffice-0.4/goffice/gtk/goffice-gtk.h
-include/libgoffice-0.4/goffice/ms-compat/go-ms-parser.h
-include/libgoffice-0.4/goffice/ms-compat/god-drawing-ms-client-handler.h
-include/libgoffice-0.4/goffice/ms-compat/god-drawing-ms.h
-include/libgoffice-0.4/goffice/ms-compat/god-image-ms.h
-include/libgoffice-0.4/goffice/utils/datetime.h
-include/libgoffice-0.4/goffice/utils/go-color.h
-include/libgoffice-0.4/goffice/utils/go-cspline.h
-include/libgoffice-0.4/goffice/utils/go-file.h
-include/libgoffice-0.4/goffice/utils/go-font.h
-include/libgoffice-0.4/goffice/utils/go-format.h
-include/libgoffice-0.4/goffice/utils/go-geometry.h
-include/libgoffice-0.4/goffice/utils/go-glib-extras.h
-include/libgoffice-0.4/goffice/utils/go-gradient.h
-include/libgoffice-0.4/goffice/utils/go-image.h
-include/libgoffice-0.4/goffice/utils/go-libxml-extras.h
-include/libgoffice-0.4/goffice/utils/go-line.h
-include/libgoffice-0.4/goffice/utils/go-locale.h
-include/libgoffice-0.4/goffice/utils/go-marker.h
-include/libgoffice-0.4/goffice/utils/go-math.h
-include/libgoffice-0.4/goffice/utils/go-pattern.h
-include/libgoffice-0.4/goffice/utils/go-rangefunc.h
-include/libgoffice-0.4/goffice/utils/go-regression.h
-include/libgoffice-0.4/goffice/utils/go-undo.h
-include/libgoffice-0.4/goffice/utils/go-units.h
-include/libgoffice-0.4/goffice/utils/goffice-utils.h
-include/libgoffice-0.4/goffice/utils/regutf8.h
+include/libgoffice-0.6/goffice/app/error-info.h
+include/libgoffice-0.6/goffice/app/file.h
+include/libgoffice-0.6/goffice/app/go-cmd-context-impl.h
+include/libgoffice-0.6/goffice/app/go-cmd-context.h
+include/libgoffice-0.6/goffice/app/go-doc-control-impl.h
+include/libgoffice-0.6/goffice/app/go-doc-control.h
+include/libgoffice-0.6/goffice/app/go-doc-impl.h
+include/libgoffice-0.6/goffice/app/go-doc.h
+include/libgoffice-0.6/goffice/app/go-plugin-loader-module.h
+include/libgoffice-0.6/goffice/app/go-plugin-loader.h
+include/libgoffice-0.6/goffice/app/go-plugin-service-impl.h
+include/libgoffice-0.6/goffice/app/go-plugin-service.h
+include/libgoffice-0.6/goffice/app/go-plugin.h
+include/libgoffice-0.6/goffice/app/goffice-app.h
+include/libgoffice-0.6/goffice/app/io-context-priv.h
+include/libgoffice-0.6/goffice/app/io-context.h
+include/libgoffice-0.6/goffice/app/module-plugin-defs.h
+include/libgoffice-0.6/goffice/component/go-component-factory.h
+include/libgoffice-0.6/goffice/component/go-component.h
+include/libgoffice-0.6/goffice/component/goffice-component.h
+include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
+include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
+include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
+include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
+include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
+include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
+include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
+include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas.h
+include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/libfoocanvas.h
+include/libgoffice-0.6/goffice/data/go-data-impl.h
+include/libgoffice-0.6/goffice/data/go-data-simple.h
+include/libgoffice-0.6/goffice/data/go-data.h
+include/libgoffice-0.6/goffice/data/goffice-data.h
+include/libgoffice-0.6/goffice/drawing/god-anchor.h
+include/libgoffice-0.6/goffice/drawing/god-default-attributes.h
+include/libgoffice-0.6/goffice/drawing/god-drawing-group.h
+include/libgoffice-0.6/goffice/drawing/god-drawing-renderer-gdk.h
+include/libgoffice-0.6/goffice/drawing/god-drawing-view.h
+include/libgoffice-0.6/goffice/drawing/god-drawing.h
+include/libgoffice-0.6/goffice/drawing/god-image-store.h
+include/libgoffice-0.6/goffice/drawing/god-image.h
+include/libgoffice-0.6/goffice/drawing/god-paragraph-attributes.h
+include/libgoffice-0.6/goffice/drawing/god-property-table.h
+include/libgoffice-0.6/goffice/drawing/god-shape.h
+include/libgoffice-0.6/goffice/drawing/god-text-model.h
+include/libgoffice-0.6/goffice/goffice-features.h
+include/libgoffice-0.6/goffice/goffice.h
+include/libgoffice-0.6/goffice/graph/goffice-graph.h
+include/libgoffice-0.6/goffice/graph/gog-axis-line-impl.h
+include/libgoffice-0.6/goffice/graph/gog-axis-line.h
+include/libgoffice-0.6/goffice/graph/gog-axis.h
+include/libgoffice-0.6/goffice/graph/gog-chart-impl.h
+include/libgoffice-0.6/goffice/graph/gog-chart-map.h
+include/libgoffice-0.6/goffice/graph/gog-chart.h
+include/libgoffice-0.6/goffice/graph/gog-child-button.h
+include/libgoffice-0.6/goffice/graph/gog-control-foocanvas.h
+include/libgoffice-0.6/goffice/graph/gog-data-allocator.h
+include/libgoffice-0.6/goffice/graph/gog-data-set.h
+include/libgoffice-0.6/goffice/graph/gog-error-bar.h
+include/libgoffice-0.6/goffice/graph/gog-graph-impl.h
+include/libgoffice-0.6/goffice/graph/gog-graph.h
+include/libgoffice-0.6/goffice/graph/gog-grid-line.h
+include/libgoffice-0.6/goffice/graph/gog-grid.h
+include/libgoffice-0.6/goffice/graph/gog-guru.h
+include/libgoffice-0.6/goffice/graph/gog-label.h
+include/libgoffice-0.6/goffice/graph/gog-legend.h
+include/libgoffice-0.6/goffice/graph/gog-object-xml.h
+include/libgoffice-0.6/goffice/graph/gog-object.h
+include/libgoffice-0.6/goffice/graph/gog-outlined-object.h
+include/libgoffice-0.6/goffice/graph/gog-plot-engine.h
+include/libgoffice-0.6/goffice/graph/gog-plot-impl.h
+include/libgoffice-0.6/goffice/graph/gog-plot.h
+include/libgoffice-0.6/goffice/graph/gog-reg-curve.h
+include/libgoffice-0.6/goffice/graph/gog-renderer.h
+include/libgoffice-0.6/goffice/graph/gog-series-impl.h
+include/libgoffice-0.6/goffice/graph/gog-series-lines.h
+include/libgoffice-0.6/goffice/graph/gog-series.h
+include/libgoffice-0.6/goffice/graph/gog-smoothed-curve.h
+include/libgoffice-0.6/goffice/graph/gog-style.h
+include/libgoffice-0.6/goffice/graph/gog-styled-object.h
+include/libgoffice-0.6/goffice/graph/gog-theme.h
+include/libgoffice-0.6/goffice/graph/gog-trend-line.h
+include/libgoffice-0.6/goffice/graph/gog-view.h
+include/libgoffice-0.6/goffice/gtk/go-action-combo-color.h
+include/libgoffice-0.6/goffice/gtk/go-action-combo-pixmaps.h
+include/libgoffice-0.6/goffice/gtk/go-action-combo-stack.h
+include/libgoffice-0.6/goffice/gtk/go-action-combo-text.h
+include/libgoffice-0.6/goffice/gtk/go-charmap-sel.h
+include/libgoffice-0.6/goffice/gtk/go-color-group.h
+include/libgoffice-0.6/goffice/gtk/go-color-palette.h
+include/libgoffice-0.6/goffice/gtk/go-color-selector.h
+include/libgoffice-0.6/goffice/gtk/go-combo-box.h
+include/libgoffice-0.6/goffice/gtk/go-combo-color.h
+include/libgoffice-0.6/goffice/gtk/go-combo-pixmaps.h
+include/libgoffice-0.6/goffice/gtk/go-combo-text.h
+include/libgoffice-0.6/goffice/gtk/go-font-sel.h
+include/libgoffice-0.6/goffice/gtk/go-format-sel.h
+include/libgoffice-0.6/goffice/gtk/go-gradient-selector.h
+include/libgoffice-0.6/goffice/gtk/go-graph-widget.h
+include/libgoffice-0.6/goffice/gtk/go-line-selector.h
+include/libgoffice-0.6/goffice/gtk/go-locale-sel.h
+include/libgoffice-0.6/goffice/gtk/go-marker-selector.h
+include/libgoffice-0.6/goffice/gtk/go-optionmenu.h
+include/libgoffice-0.6/goffice/gtk/go-palette.h
+include/libgoffice-0.6/goffice/gtk/go-pattern-selector.h
+include/libgoffice-0.6/goffice/gtk/go-pixbuf.h
+include/libgoffice-0.6/goffice/gtk/go-rotation-sel.h
+include/libgoffice-0.6/goffice/gtk/go-selector.h
+include/libgoffice-0.6/goffice/gtk/goffice-gtk.h
+include/libgoffice-0.6/goffice/math/go-complex.h
+include/libgoffice-0.6/goffice/math/go-cspline.h
+include/libgoffice-0.6/goffice/math/go-fft.h
+include/libgoffice-0.6/goffice/math/go-math.h
+include/libgoffice-0.6/goffice/math/go-rangefunc.h
+include/libgoffice-0.6/goffice/math/go-regression.h
+include/libgoffice-0.6/goffice/ms-compat/go-ms-parser.h
+include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms-client-handler.h
+include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms.h
+include/libgoffice-0.6/goffice/ms-compat/god-image-ms.h
+include/libgoffice-0.6/goffice/utils/datetime.h
+include/libgoffice-0.6/goffice/utils/go-cairo.h
+include/libgoffice-0.6/goffice/utils/go-color.h
+include/libgoffice-0.6/goffice/utils/go-file.h
+include/libgoffice-0.6/goffice/utils/go-font.h
+include/libgoffice-0.6/goffice/utils/go-format.h
+include/libgoffice-0.6/goffice/utils/go-geometry.h
+include/libgoffice-0.6/goffice/utils/go-glib-extras.h
+include/libgoffice-0.6/goffice/utils/go-gradient.h
+include/libgoffice-0.6/goffice/utils/go-image.h
+include/libgoffice-0.6/goffice/utils/go-libxml-extras.h
+include/libgoffice-0.6/goffice/utils/go-line.h
+include/libgoffice-0.6/goffice/utils/go-locale.h
+include/libgoffice-0.6/goffice/utils/go-marker.h
+include/libgoffice-0.6/goffice/utils/go-pango-extras.h
+include/libgoffice-0.6/goffice/utils/go-path.h
+include/libgoffice-0.6/goffice/utils/go-pattern.h
+include/libgoffice-0.6/goffice/utils/go-undo.h
+include/libgoffice-0.6/goffice/utils/go-units.h
+include/libgoffice-0.6/goffice/utils/goffice-utils.h
+include/libgoffice-0.6/goffice/utils/regutf8.h
 lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a
 lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la
 lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so
@@ -190,11 +195,11 @@ lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a
 lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la
 lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so
 lib/goffice/%%VERSION%%/plugins/smoothing/types.xml
-lib/libgoffice-0.a
-lib/libgoffice-0.la
-lib/libgoffice-0.so
-lib/libgoffice-0.so.4
-libdata/pkgconfig/libgoffice-0.4.pc
+lib/libgoffice-0.6.a
+lib/libgoffice-0.6.la
+lib/libgoffice-0.6.so
+lib/libgoffice-0.6.so.6
+libdata/pkgconfig/libgoffice-0.6.pc
 %%DOCSDIR%%/GOData.html
 %%DOCSDIR%%/GODataMatrix.html
 %%DOCSDIR%%/GODataScalar.html
@@ -219,8 +224,11 @@ libdata/pkgconfig/libgoffice-0.4.pc
 %%DOCSDIR%%/GogRenderer.html
 %%DOCSDIR%%/GogSeries.html
 %%DOCSDIR%%/GogSeriesLines.html
+%%DOCSDIR%%/GogSmoothedCurve.html
 %%DOCSDIR%%/GogStyle.html
 %%DOCSDIR%%/GogStyledObject.html
+%%DOCSDIR%%/GogTheme.html
+%%DOCSDIR%%/GogTrendLine.html
 %%DOCSDIR%%/GogView.html
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
@@ -233,8 +241,9 @@ libdata/pkgconfig/libgoffice-0.4.pc
 %%DOCSDIR%%/ch09.html
 %%DOCSDIR%%/ch10.html
 %%DOCSDIR%%/ch11.html
-%%DOCSDIR%%/goffice-GOComboBox.html
-%%DOCSDIR%%/goffice-GOComboColor.html
+%%DOCSDIR%%/ch12.html
+%%DOCSDIR%%/ch13.html
+%%DOCSDIR%%/goffice-GOCairo.html
 %%DOCSDIR%%/goffice-GOComponent.html
 %%DOCSDIR%%/goffice-GODoc.html
 %%DOCSDIR%%/goffice-GODocControl.html
@@ -245,20 +254,41 @@ libdata/pkgconfig/libgoffice-0.4.pc
 %%DOCSDIR%%/goffice-GoCharmapSel.html
 %%DOCSDIR%%/goffice-GoCmdContext.html
 %%DOCSDIR%%/goffice-GoColor.html
+%%DOCSDIR%%/goffice-GoComboBox.html
+%%DOCSDIR%%/goffice-GoComboColor.html
 %%DOCSDIR%%/goffice-GoComboPixmaps.html
 %%DOCSDIR%%/goffice-GoComboText.html
+%%DOCSDIR%%/goffice-GoComplex.html
 %%DOCSDIR%%/goffice-GoComponentFactory.html
+%%DOCSDIR%%/goffice-GoFft.html
+%%DOCSDIR%%/goffice-GoFile.html
+%%DOCSDIR%%/goffice-GoFileOpener.html
+%%DOCSDIR%%/goffice-GoFileSaver.html
+%%DOCSDIR%%/goffice-GoFont.html
 %%DOCSDIR%%/goffice-GoFontSel.html
+%%DOCSDIR%%/goffice-GoFormat.html
 %%DOCSDIR%%/goffice-GoFormatSel.html
 %%DOCSDIR%%/goffice-GoGeometry.html
 %%DOCSDIR%%/goffice-GoGlibExtras.html
+%%DOCSDIR%%/goffice-GoGradient.html
 %%DOCSDIR%%/goffice-GoLibxmlExtras.html
+%%DOCSDIR%%/goffice-GoLine.html
 %%DOCSDIR%%/goffice-GoLocaleSel.html
+%%DOCSDIR%%/goffice-GoMarker.html
+%%DOCSDIR%%/goffice-GoMath.html
 %%DOCSDIR%%/goffice-GoObject.html
 %%DOCSDIR%%/goffice-GoOptionMenu.html
+%%DOCSDIR%%/goffice-GoPalette.html
+%%DOCSDIR%%/goffice-GoPath.html
+%%DOCSDIR%%/goffice-GoPattern.html
 %%DOCSDIR%%/goffice-GoPluginLoaderModule.html
+%%DOCSDIR%%/goffice-GoReg.html
+%%DOCSDIR%%/goffice-GoRegression.html
 %%DOCSDIR%%/goffice-GoRotationSel.html
 %%DOCSDIR%%/goffice-GoSearchReplace.html
+%%DOCSDIR%%/goffice-GoSelector.html
+%%DOCSDIR%%/goffice-GoUndo.html
+%%DOCSDIR%%/goffice-GoUrl.html
 %%DOCSDIR%%/goffice-GogAxisMap.html
 %%DOCSDIR%%/goffice-GogChartMap.html
 %%DOCSDIR%%/goffice-GogControlFooCanvas.html
@@ -266,18 +296,8 @@ libdata/pkgconfig/libgoffice-0.4.pc
 %%DOCSDIR%%/goffice-GogGuru.html
 %%DOCSDIR%%/goffice-GogPlotEngine.html
 %%DOCSDIR%%/goffice-GogTool.html
-%%DOCSDIR%%/goffice-Math.html
-%%DOCSDIR%%/goffice-Ranges.html
-%%DOCSDIR%%/goffice-RegUTF8.html
-%%DOCSDIR%%/goffice-Regressions.html
 %%DOCSDIR%%/goffice-Units.html
-%%DOCSDIR%%/goffice-go-format.html
-%%DOCSDIR%%/goffice-go-gradient.html
-%%DOCSDIR%%/goffice-go-line.html
-%%DOCSDIR%%/goffice-go-marker.html
-%%DOCSDIR%%/goffice-go-pattern.html
 %%DOCSDIR%%/goffice-go-plugin.html
-%%DOCSDIR%%/goffice-gog-theme.html
 %%DOCSDIR%%/goffice.devhelp
 %%DOCSDIR%%/goffice.devhelp2
 %%DOCSDIR%%/home.png
@@ -445,6 +465,7 @@ share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
 share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
 share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
 share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_surface_2_1.png
 share/pixmaps/goffice/%%VERSION%%/color.xpm
 share/pixmaps/goffice/%%VERSION%%/column.xpm
 share/pixmaps/goffice/%%VERSION%%/doughnut.xpm
@@ -477,18 +498,19 @@ share/pixmaps/goffice/%%VERSION%%/surface.xpm
 @dirrm lib/goffice/%%VERSION%%/plugins
 @dirrm lib/goffice/%%VERSION%%
 @dirrmtry lib/goffice
-@dirrm include/libgoffice-0.4/goffice/utils
-@dirrm include/libgoffice-0.4/goffice/ms-compat
-@dirrm include/libgoffice-0.4/goffice/gtk
-@dirrm include/libgoffice-0.4/goffice/graph
-@dirrm include/libgoffice-0.4/goffice/drawing
-@dirrm include/libgoffice-0.4/goffice/data
-@dirrm include/libgoffice-0.4/goffice/cut-n-paste/foocanvas
-@dirrm include/libgoffice-0.4/goffice/cut-n-paste
-@dirrm include/libgoffice-0.4/goffice/component
-@dirrm include/libgoffice-0.4/goffice/app
-@dirrm include/libgoffice-0.4/goffice
-@dirrm include/libgoffice-0.4
+@dirrm include/libgoffice-0.6/goffice/utils
+@dirrm include/libgoffice-0.6/goffice/ms-compat
+@dirrm include/libgoffice-0.6/goffice/math
+@dirrm include/libgoffice-0.6/goffice/gtk
+@dirrm include/libgoffice-0.6/goffice/graph
+@dirrm include/libgoffice-0.6/goffice/drawing
+@dirrm include/libgoffice-0.6/goffice/data
+@dirrm include/libgoffice-0.6/goffice/cut-n-paste/foocanvas
+@dirrm include/libgoffice-0.6/goffice/cut-n-paste
+@dirrm include/libgoffice-0.6/goffice/component
+@dirrm include/libgoffice-0.6/goffice/app
+@dirrm include/libgoffice-0.6/goffice
+@dirrm include/libgoffice-0.6
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES