aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2001-05-22 02:07:24 +0800
committerade <ade@FreeBSD.org>2001-05-22 02:07:24 +0800
commit9ac1e45efa31ecbbd8f7e8528751415674160579 (patch)
tree0b9d18849e6e5c4a8083d0fdae5a2394e60bb078
parentb16882d95b0444c39a29863857b8eeb8a020a87b (diff)
downloadfreebsd-ports-gnome-9ac1e45efa31ecbbd8f7e8528751415674160579.tar.gz
freebsd-ports-gnome-9ac1e45efa31ecbbd8f7e8528751415674160579.tar.zst
freebsd-ports-gnome-9ac1e45efa31ecbbd8f7e8528751415674160579.zip
Update to 0.65
-rw-r--r--math/gnumeric/Makefile10
-rw-r--r--math/gnumeric/distinfo2
-rw-r--r--math/gnumeric/files/patch-aa53
-rw-r--r--math/gnumeric/files/patch-po::Makefile.in.in7
-rw-r--r--math/gnumeric/files/patch-src::mathfunc.h9
-rw-r--r--math/gnumeric/pkg-plist700
-rw-r--r--math/gnumeric2/Makefile10
-rw-r--r--math/gnumeric2/distinfo2
-rw-r--r--math/gnumeric2/files/patch-aa53
-rw-r--r--math/gnumeric2/files/patch-po::Makefile.in.in7
-rw-r--r--math/gnumeric2/files/patch-src::mathfunc.h9
-rw-r--r--math/gnumeric2/pkg-plist700
12 files changed, 842 insertions, 720 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 3e86ba8ccdb8..416847412bcc 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnumeric
-PORTVERSION= 0.64
+PORTVERSION= 0.65
CATEGORIES?= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnumeric
@@ -15,9 +15,11 @@ MAINTAINER?= gnome@FreeBSD.org
LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \
gnomeole2.0:${PORTSDIR}/devel/libole2 \
- gal.6:${PORTSDIR}/x11-toolkits/gal \
- gb.0:${PORTSDIR}/lang/gnomebasic \
- gda-common.0:${PORTSDIR}/databases/libgda
+ gal.7:${PORTSDIR}/x11-toolkits/gal \
+ gb.0:${PORTSDIR}/lang/gnomebasic
+
+# Temporarily take this out until libgda 0.2.4 or higher is released
+# gda-common.0:${PORTSDIR}/databases/libgda
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 58f0661a5ddb..9711985a9032 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.64.tar.gz) = 49673e41e314dacc54ea5aa74c0792ea
+MD5 (gnumeric-0.65.tar.gz) = d31a2258b3f8ded219677a54f4fbe23f
diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa
index 99cdec2f9ba8..38602b0b16a8 100644
--- a/math/gnumeric/files/patch-aa
+++ b/math/gnumeric/files/patch-aa
@@ -1,6 +1,53 @@
---- configure.orig Tue Oct 10 10:27:58 2000
-+++ configure Wed Oct 11 12:15:15 2000
-@@ -6677,6 +6677,6 @@
+--- configure.orig Sun May 20 13:17:33 2001
++++ configure Mon May 21 11:57:29 2001
+@@ -5591,4 +5591,19 @@
+
+-
+-
++# Actually configure libtool. ac_aux_dir is where install-sh is found.
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
++${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
++|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++
++# Reload cache, that may have been modified by ltconfig
++if test -r "$cache_file"; then
++ echo "loading cache $cache_file"
++ . $cache_file
++else
++ echo "creating cache $cache_file"
++ > $cache_file
++fi
+
+@@ -5596,3 +5611,3 @@
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+@@ -5601,16 +5616,7 @@
+
+-# Prevent multiple expansion
++# Redirect the config.log output again, so that the ltconfig log is not
++# clobbered by the next message.
++exec 5>>./config.log
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ # Check whether --with-gnome-includes or --without-gnome-includes was given.
+@@ -10526,6 +10532,6 @@
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
diff --git a/math/gnumeric/files/patch-po::Makefile.in.in b/math/gnumeric/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..2ee6d57354b7
--- /dev/null
+++ b/math/gnumeric/files/patch-po::Makefile.in.in
@@ -0,0 +1,7 @@
+--- po/Makefile.in.in.orig Sun May 20 11:15:03 2001
++++ po/Makefile.in.in Mon May 21 12:28:25 2001
+@@ -22,3 +22,3 @@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
diff --git a/math/gnumeric/files/patch-src::mathfunc.h b/math/gnumeric/files/patch-src::mathfunc.h
new file mode 100644
index 000000000000..5ece38afaf53
--- /dev/null
+++ b/math/gnumeric/files/patch-src::mathfunc.h
@@ -0,0 +1,9 @@
+--- src/mathfunc.h.orig Thu Apr 26 20:47:46 2001
++++ src/mathfunc.h Mon May 21 12:08:51 2001
+@@ -7,2 +7,6 @@
+
++#ifdef __FreeBSD__
++#define FINITE finite
++#endif
++
+ #ifndef FINITE
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 1cd62fd3a186..8277449a0520 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -5,10 +5,10 @@ lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/dif/dif.so
lib/gnumeric/%%VERSION%%/plugins/dif/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/excel/excel.so
+lib/gnumeric/%%VERSION%%/plugins/excel/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/gb/gnum_gb.so
lib/gnumeric/%%VERSION%%/plugins/gb/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so
-lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/html/html.so
lib/gnumeric/%%VERSION%%/plugins/html/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.so
@@ -23,8 +23,8 @@ lib/gnumeric/%%VERSION%%/plugins/sylk/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/sylk/sylk.so
lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
-lib/gnumeric/%%VERSION%%/plugins/xml2/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/xml2/xml2.so
+lib/gnumeric/%%VERSION%%/plugins/xml_sax/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/xml_sax/xml_sax.so
share/gnome/apps/Applications/gnumeric.desktop
share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
@@ -235,347 +235,347 @@ share/gnome/help/gnumeric/C/number-formatting-overview.html
share/gnome/help/gnumeric/C/print-preview.html
share/gnome/help/gnumeric/C/print-setup.html
share/gnome/help/gnumeric/C/printing.html
-share/gnome/help/gnumeric/C/r10002.html
-share/gnome/help/gnumeric/C/r10028.html
-share/gnome/help/gnumeric/C/r10052.html
-share/gnome/help/gnumeric/C/r10080.html
-share/gnome/help/gnumeric/C/r10100.html
-share/gnome/help/gnumeric/C/r10123.html
-share/gnome/help/gnumeric/C/r10147.html
-share/gnome/help/gnumeric/C/r10175.html
-share/gnome/help/gnumeric/C/r10196.html
-share/gnome/help/gnumeric/C/r10216.html
-share/gnome/help/gnumeric/C/r10243.html
-share/gnome/help/gnumeric/C/r10283.html
-share/gnome/help/gnumeric/C/r10308.html
-share/gnome/help/gnumeric/C/r10337.html
-share/gnome/help/gnumeric/C/r10359.html
-share/gnome/help/gnumeric/C/r10382.html
-share/gnome/help/gnumeric/C/r10409.html
-share/gnome/help/gnumeric/C/r10435.html
-share/gnome/help/gnumeric/C/r10463.html
-share/gnome/help/gnumeric/C/r10483.html
-share/gnome/help/gnumeric/C/r10508.html
-share/gnome/help/gnumeric/C/r10531.html
-share/gnome/help/gnumeric/C/r10555.html
-share/gnome/help/gnumeric/C/r10581.html
-share/gnome/help/gnumeric/C/r10603.html
-share/gnome/help/gnumeric/C/r10627.html
-share/gnome/help/gnumeric/C/r10653.html
-share/gnome/help/gnumeric/C/r10675.html
-share/gnome/help/gnumeric/C/r10700.html
-share/gnome/help/gnumeric/C/r10723.html
-share/gnome/help/gnumeric/C/r10745.html
-share/gnome/help/gnumeric/C/r10774.html
-share/gnome/help/gnumeric/C/r10795.html
-share/gnome/help/gnumeric/C/r10818.html
-share/gnome/help/gnumeric/C/r10840.html
-share/gnome/help/gnumeric/C/r10867.html
-share/gnome/help/gnumeric/C/r10887.html
-share/gnome/help/gnumeric/C/r10913.html
-share/gnome/help/gnumeric/C/r10936.html
-share/gnome/help/gnumeric/C/r10961.html
-share/gnome/help/gnumeric/C/r10984.html
-share/gnome/help/gnumeric/C/r11005.html
-share/gnome/help/gnumeric/C/r11030.html
-share/gnome/help/gnumeric/C/r11054.html
-share/gnome/help/gnumeric/C/r11076.html
-share/gnome/help/gnumeric/C/r11096.html
-share/gnome/help/gnumeric/C/r11116.html
-share/gnome/help/gnumeric/C/r11141.html
-share/gnome/help/gnumeric/C/r2697.html
-share/gnome/help/gnumeric/C/r2721.html
-share/gnome/help/gnumeric/C/r2750.html
-share/gnome/help/gnumeric/C/r2771.html
-share/gnome/help/gnumeric/C/r2795.html
-share/gnome/help/gnumeric/C/r2825.html
-share/gnome/help/gnumeric/C/r2845.html
-share/gnome/help/gnumeric/C/r2867.html
-share/gnome/help/gnumeric/C/r2890.html
-share/gnome/help/gnumeric/C/r2918.html
-share/gnome/help/gnumeric/C/r2939.html
-share/gnome/help/gnumeric/C/r2969.html
-share/gnome/help/gnumeric/C/r2989.html
-share/gnome/help/gnumeric/C/r3013.html
-share/gnome/help/gnumeric/C/r3035.html
-share/gnome/help/gnumeric/C/r3074.html
-share/gnome/help/gnumeric/C/r3097.html
-share/gnome/help/gnumeric/C/r3118.html
-share/gnome/help/gnumeric/C/r3148.html
-share/gnome/help/gnumeric/C/r3188.html
-share/gnome/help/gnumeric/C/r3211.html
-share/gnome/help/gnumeric/C/r3235.html
-share/gnome/help/gnumeric/C/r3259.html
-share/gnome/help/gnumeric/C/r3289.html
-share/gnome/help/gnumeric/C/r3313.html
-share/gnome/help/gnumeric/C/r3336.html
-share/gnome/help/gnumeric/C/r3358.html
-share/gnome/help/gnumeric/C/r3381.html
-share/gnome/help/gnumeric/C/r3410.html
-share/gnome/help/gnumeric/C/r3434.html
-share/gnome/help/gnumeric/C/r3461.html
-share/gnome/help/gnumeric/C/r3485.html
-share/gnome/help/gnumeric/C/r3510.html
-share/gnome/help/gnumeric/C/r3532.html
-share/gnome/help/gnumeric/C/r3559.html
-share/gnome/help/gnumeric/C/r3583.html
-share/gnome/help/gnumeric/C/r3603.html
-share/gnome/help/gnumeric/C/r3625.html
-share/gnome/help/gnumeric/C/r3649.html
-share/gnome/help/gnumeric/C/r3674.html
-share/gnome/help/gnumeric/C/r3697.html
-share/gnome/help/gnumeric/C/r3725.html
-share/gnome/help/gnumeric/C/r3748.html
-share/gnome/help/gnumeric/C/r3768.html
-share/gnome/help/gnumeric/C/r3790.html
-share/gnome/help/gnumeric/C/r3817.html
-share/gnome/help/gnumeric/C/r3840.html
-share/gnome/help/gnumeric/C/r3860.html
-share/gnome/help/gnumeric/C/r3971.html
-share/gnome/help/gnumeric/C/r3996.html
-share/gnome/help/gnumeric/C/r4020.html
-share/gnome/help/gnumeric/C/r4043.html
-share/gnome/help/gnumeric/C/r4072.html
-share/gnome/help/gnumeric/C/r4095.html
-share/gnome/help/gnumeric/C/r4118.html
-share/gnome/help/gnumeric/C/r4145.html
-share/gnome/help/gnumeric/C/r4166.html
-share/gnome/help/gnumeric/C/r4190.html
-share/gnome/help/gnumeric/C/r4219.html
-share/gnome/help/gnumeric/C/r4240.html
-share/gnome/help/gnumeric/C/r4263.html
-share/gnome/help/gnumeric/C/r4285.html
-share/gnome/help/gnumeric/C/r4306.html
-share/gnome/help/gnumeric/C/r4329.html
-share/gnome/help/gnumeric/C/r4349.html
-share/gnome/help/gnumeric/C/r4374.html
-share/gnome/help/gnumeric/C/r4397.html
-share/gnome/help/gnumeric/C/r4421.html
-share/gnome/help/gnumeric/C/r4444.html
-share/gnome/help/gnumeric/C/r4464.html
-share/gnome/help/gnumeric/C/r4487.html
-share/gnome/help/gnumeric/C/r4515.html
-share/gnome/help/gnumeric/C/r4539.html
-share/gnome/help/gnumeric/C/r4559.html
-share/gnome/help/gnumeric/C/r4582.html
-share/gnome/help/gnumeric/C/r4608.html
-share/gnome/help/gnumeric/C/r4633.html
-share/gnome/help/gnumeric/C/r4662.html
-share/gnome/help/gnumeric/C/r4685.html
-share/gnome/help/gnumeric/C/r4712.html
-share/gnome/help/gnumeric/C/r4739.html
-share/gnome/help/gnumeric/C/r4761.html
-share/gnome/help/gnumeric/C/r4783.html
-share/gnome/help/gnumeric/C/r4807.html
-share/gnome/help/gnumeric/C/r4832.html
-share/gnome/help/gnumeric/C/r4855.html
-share/gnome/help/gnumeric/C/r4878.html
-share/gnome/help/gnumeric/C/r4900.html
-share/gnome/help/gnumeric/C/r4925.html
-share/gnome/help/gnumeric/C/r4949.html
-share/gnome/help/gnumeric/C/r4973.html
-share/gnome/help/gnumeric/C/r5014.html
-share/gnome/help/gnumeric/C/r5036.html
-share/gnome/help/gnumeric/C/r5057.html
-share/gnome/help/gnumeric/C/r5078.html
-share/gnome/help/gnumeric/C/r5102.html
-share/gnome/help/gnumeric/C/r5128.html
-share/gnome/help/gnumeric/C/r5148.html
-share/gnome/help/gnumeric/C/r5172.html
-share/gnome/help/gnumeric/C/r5194.html
-share/gnome/help/gnumeric/C/r5216.html
-share/gnome/help/gnumeric/C/r5239.html
-share/gnome/help/gnumeric/C/r5265.html
-share/gnome/help/gnumeric/C/r5292.html
-share/gnome/help/gnumeric/C/r5313.html
-share/gnome/help/gnumeric/C/r5335.html
-share/gnome/help/gnumeric/C/r5358.html
-share/gnome/help/gnumeric/C/r5382.html
-share/gnome/help/gnumeric/C/r5423.html
-share/gnome/help/gnumeric/C/r5443.html
-share/gnome/help/gnumeric/C/r5471.html
-share/gnome/help/gnumeric/C/r5495.html
-share/gnome/help/gnumeric/C/r5519.html
-share/gnome/help/gnumeric/C/r5546.html
-share/gnome/help/gnumeric/C/r5571.html
-share/gnome/help/gnumeric/C/r5591.html
-share/gnome/help/gnumeric/C/r5611.html
-share/gnome/help/gnumeric/C/r5635.html
-share/gnome/help/gnumeric/C/r5660.html
-share/gnome/help/gnumeric/C/r5684.html
-share/gnome/help/gnumeric/C/r5709.html
-share/gnome/help/gnumeric/C/r5733.html
-share/gnome/help/gnumeric/C/r5761.html
-share/gnome/help/gnumeric/C/r5784.html
-share/gnome/help/gnumeric/C/r5811.html
-share/gnome/help/gnumeric/C/r5835.html
-share/gnome/help/gnumeric/C/r5855.html
-share/gnome/help/gnumeric/C/r5878.html
-share/gnome/help/gnumeric/C/r5902.html
-share/gnome/help/gnumeric/C/r5942.html
-share/gnome/help/gnumeric/C/r5965.html
-share/gnome/help/gnumeric/C/r5988.html
-share/gnome/help/gnumeric/C/r6013.html
-share/gnome/help/gnumeric/C/r6038.html
-share/gnome/help/gnumeric/C/r6061.html
-share/gnome/help/gnumeric/C/r6084.html
-share/gnome/help/gnumeric/C/r6107.html
-share/gnome/help/gnumeric/C/r6135.html
-share/gnome/help/gnumeric/C/r6155.html
-share/gnome/help/gnumeric/C/r6178.html
-share/gnome/help/gnumeric/C/r6200.html
-share/gnome/help/gnumeric/C/r6240.html
-share/gnome/help/gnumeric/C/r6265.html
-share/gnome/help/gnumeric/C/r6287.html
-share/gnome/help/gnumeric/C/r6308.html
-share/gnome/help/gnumeric/C/r6333.html
-share/gnome/help/gnumeric/C/r6355.html
-share/gnome/help/gnumeric/C/r6384.html
-share/gnome/help/gnumeric/C/r6408.html
-share/gnome/help/gnumeric/C/r6433.html
-share/gnome/help/gnumeric/C/r6457.html
-share/gnome/help/gnumeric/C/r6484.html
-share/gnome/help/gnumeric/C/r6506.html
-share/gnome/help/gnumeric/C/r6529.html
-share/gnome/help/gnumeric/C/r6555.html
-share/gnome/help/gnumeric/C/r6579.html
-share/gnome/help/gnumeric/C/r6599.html
-share/gnome/help/gnumeric/C/r6626.html
-share/gnome/help/gnumeric/C/r6651.html
-share/gnome/help/gnumeric/C/r6675.html
-share/gnome/help/gnumeric/C/r6698.html
-share/gnome/help/gnumeric/C/r6723.html
-share/gnome/help/gnumeric/C/r6745.html
-share/gnome/help/gnumeric/C/r6768.html
-share/gnome/help/gnumeric/C/r6790.html
-share/gnome/help/gnumeric/C/r6832.html
-share/gnome/help/gnumeric/C/r6855.html
-share/gnome/help/gnumeric/C/r6878.html
-share/gnome/help/gnumeric/C/r6899.html
-share/gnome/help/gnumeric/C/r6931.html
-share/gnome/help/gnumeric/C/r6956.html
-share/gnome/help/gnumeric/C/r6981.html
-share/gnome/help/gnumeric/C/r7001.html
-share/gnome/help/gnumeric/C/r7024.html
-share/gnome/help/gnumeric/C/r7049.html
-share/gnome/help/gnumeric/C/r7073.html
-share/gnome/help/gnumeric/C/r7094.html
-share/gnome/help/gnumeric/C/r7117.html
-share/gnome/help/gnumeric/C/r7142.html
-share/gnome/help/gnumeric/C/r7165.html
-share/gnome/help/gnumeric/C/r7194.html
-share/gnome/help/gnumeric/C/r7218.html
-share/gnome/help/gnumeric/C/r7240.html
-share/gnome/help/gnumeric/C/r7267.html
-share/gnome/help/gnumeric/C/r7289.html
-share/gnome/help/gnumeric/C/r7316.html
-share/gnome/help/gnumeric/C/r7336.html
-share/gnome/help/gnumeric/C/r7362.html
-share/gnome/help/gnumeric/C/r7387.html
-share/gnome/help/gnumeric/C/r7412.html
-share/gnome/help/gnumeric/C/r7436.html
-share/gnome/help/gnumeric/C/r7463.html
-share/gnome/help/gnumeric/C/r7503.html
-share/gnome/help/gnumeric/C/r7529.html
-share/gnome/help/gnumeric/C/r7552.html
-share/gnome/help/gnumeric/C/r7574.html
-share/gnome/help/gnumeric/C/r7597.html
-share/gnome/help/gnumeric/C/r7619.html
-share/gnome/help/gnumeric/C/r7639.html
-share/gnome/help/gnumeric/C/r7664.html
-share/gnome/help/gnumeric/C/r7686.html
-share/gnome/help/gnumeric/C/r7712.html
-share/gnome/help/gnumeric/C/r7735.html
-share/gnome/help/gnumeric/C/r7760.html
-share/gnome/help/gnumeric/C/r7788.html
-share/gnome/help/gnumeric/C/r7818.html
-share/gnome/help/gnumeric/C/r7842.html
-share/gnome/help/gnumeric/C/r7868.html
-share/gnome/help/gnumeric/C/r7888.html
-share/gnome/help/gnumeric/C/r7924.html
-share/gnome/help/gnumeric/C/r7941.html
-share/gnome/help/gnumeric/C/r7963.html
-share/gnome/help/gnumeric/C/r7988.html
-share/gnome/help/gnumeric/C/r8013.html
-share/gnome/help/gnumeric/C/r8037.html
-share/gnome/help/gnumeric/C/r8060.html
-share/gnome/help/gnumeric/C/r8083.html
-share/gnome/help/gnumeric/C/r8106.html
-share/gnome/help/gnumeric/C/r8139.html
-share/gnome/help/gnumeric/C/r8161.html
-share/gnome/help/gnumeric/C/r8188.html
-share/gnome/help/gnumeric/C/r8208.html
-share/gnome/help/gnumeric/C/r8248.html
-share/gnome/help/gnumeric/C/r8271.html
-share/gnome/help/gnumeric/C/r8294.html
-share/gnome/help/gnumeric/C/r8317.html
-share/gnome/help/gnumeric/C/r8341.html
-share/gnome/help/gnumeric/C/r8365.html
-share/gnome/help/gnumeric/C/r8391.html
-share/gnome/help/gnumeric/C/r8413.html
-share/gnome/help/gnumeric/C/r8437.html
-share/gnome/help/gnumeric/C/r8465.html
-share/gnome/help/gnumeric/C/r8488.html
-share/gnome/help/gnumeric/C/r8508.html
-share/gnome/help/gnumeric/C/r8530.html
-share/gnome/help/gnumeric/C/r8557.html
-share/gnome/help/gnumeric/C/r8580.html
-share/gnome/help/gnumeric/C/r8602.html
-share/gnome/help/gnumeric/C/r8626.html
-share/gnome/help/gnumeric/C/r8659.html
-share/gnome/help/gnumeric/C/r8687.html
-share/gnome/help/gnumeric/C/r8711.html
-share/gnome/help/gnumeric/C/r8733.html
-share/gnome/help/gnumeric/C/r8761.html
-share/gnome/help/gnumeric/C/r8787.html
-share/gnome/help/gnumeric/C/r8810.html
-share/gnome/help/gnumeric/C/r8833.html
-share/gnome/help/gnumeric/C/r8861.html
-share/gnome/help/gnumeric/C/r8885.html
-share/gnome/help/gnumeric/C/r8910.html
-share/gnome/help/gnumeric/C/r8938.html
-share/gnome/help/gnumeric/C/r8965.html
-share/gnome/help/gnumeric/C/r8983.html
-share/gnome/help/gnumeric/C/r9007.html
-share/gnome/help/gnumeric/C/r9035.html
-share/gnome/help/gnumeric/C/r9063.html
-share/gnome/help/gnumeric/C/r9086.html
-share/gnome/help/gnumeric/C/r9108.html
-share/gnome/help/gnumeric/C/r9131.html
-share/gnome/help/gnumeric/C/r9151.html
-share/gnome/help/gnumeric/C/r9179.html
-share/gnome/help/gnumeric/C/r9200.html
-share/gnome/help/gnumeric/C/r9223.html
-share/gnome/help/gnumeric/C/r9247.html
-share/gnome/help/gnumeric/C/r9271.html
-share/gnome/help/gnumeric/C/r9299.html
-share/gnome/help/gnumeric/C/r9322.html
-share/gnome/help/gnumeric/C/r9351.html
-share/gnome/help/gnumeric/C/r9373.html
-share/gnome/help/gnumeric/C/r9397.html
-share/gnome/help/gnumeric/C/r9418.html
-share/gnome/help/gnumeric/C/r9442.html
-share/gnome/help/gnumeric/C/r9465.html
-share/gnome/help/gnumeric/C/r9490.html
-share/gnome/help/gnumeric/C/r9513.html
-share/gnome/help/gnumeric/C/r9533.html
-share/gnome/help/gnumeric/C/r9554.html
-share/gnome/help/gnumeric/C/r9579.html
-share/gnome/help/gnumeric/C/r9608.html
-share/gnome/help/gnumeric/C/r9633.html
-share/gnome/help/gnumeric/C/r9653.html
-share/gnome/help/gnumeric/C/r9673.html
-share/gnome/help/gnumeric/C/r9695.html
-share/gnome/help/gnumeric/C/r9717.html
-share/gnome/help/gnumeric/C/r9741.html
-share/gnome/help/gnumeric/C/r9767.html
-share/gnome/help/gnumeric/C/r9788.html
-share/gnome/help/gnumeric/C/r9829.html
-share/gnome/help/gnumeric/C/r9857.html
-share/gnome/help/gnumeric/C/r9877.html
-share/gnome/help/gnumeric/C/r9917.html
-share/gnome/help/gnumeric/C/r9938.html
-share/gnome/help/gnumeric/C/r9961.html
+share/gnome/help/gnumeric/C/r10001.html
+share/gnome/help/gnumeric/C/r10027.html
+share/gnome/help/gnumeric/C/r10051.html
+share/gnome/help/gnumeric/C/r10079.html
+share/gnome/help/gnumeric/C/r10099.html
+share/gnome/help/gnumeric/C/r10122.html
+share/gnome/help/gnumeric/C/r10146.html
+share/gnome/help/gnumeric/C/r10174.html
+share/gnome/help/gnumeric/C/r10195.html
+share/gnome/help/gnumeric/C/r10215.html
+share/gnome/help/gnumeric/C/r10242.html
+share/gnome/help/gnumeric/C/r10282.html
+share/gnome/help/gnumeric/C/r10307.html
+share/gnome/help/gnumeric/C/r10336.html
+share/gnome/help/gnumeric/C/r10358.html
+share/gnome/help/gnumeric/C/r10381.html
+share/gnome/help/gnumeric/C/r10408.html
+share/gnome/help/gnumeric/C/r10434.html
+share/gnome/help/gnumeric/C/r10462.html
+share/gnome/help/gnumeric/C/r10482.html
+share/gnome/help/gnumeric/C/r10507.html
+share/gnome/help/gnumeric/C/r10530.html
+share/gnome/help/gnumeric/C/r10554.html
+share/gnome/help/gnumeric/C/r10580.html
+share/gnome/help/gnumeric/C/r10602.html
+share/gnome/help/gnumeric/C/r10626.html
+share/gnome/help/gnumeric/C/r10652.html
+share/gnome/help/gnumeric/C/r10674.html
+share/gnome/help/gnumeric/C/r10699.html
+share/gnome/help/gnumeric/C/r10722.html
+share/gnome/help/gnumeric/C/r10744.html
+share/gnome/help/gnumeric/C/r10773.html
+share/gnome/help/gnumeric/C/r10794.html
+share/gnome/help/gnumeric/C/r10817.html
+share/gnome/help/gnumeric/C/r10839.html
+share/gnome/help/gnumeric/C/r10866.html
+share/gnome/help/gnumeric/C/r10886.html
+share/gnome/help/gnumeric/C/r10912.html
+share/gnome/help/gnumeric/C/r10935.html
+share/gnome/help/gnumeric/C/r10960.html
+share/gnome/help/gnumeric/C/r10983.html
+share/gnome/help/gnumeric/C/r11004.html
+share/gnome/help/gnumeric/C/r11029.html
+share/gnome/help/gnumeric/C/r11053.html
+share/gnome/help/gnumeric/C/r11075.html
+share/gnome/help/gnumeric/C/r11095.html
+share/gnome/help/gnumeric/C/r11115.html
+share/gnome/help/gnumeric/C/r11140.html
+share/gnome/help/gnumeric/C/r2696.html
+share/gnome/help/gnumeric/C/r2720.html
+share/gnome/help/gnumeric/C/r2749.html
+share/gnome/help/gnumeric/C/r2770.html
+share/gnome/help/gnumeric/C/r2794.html
+share/gnome/help/gnumeric/C/r2824.html
+share/gnome/help/gnumeric/C/r2844.html
+share/gnome/help/gnumeric/C/r2866.html
+share/gnome/help/gnumeric/C/r2889.html
+share/gnome/help/gnumeric/C/r2917.html
+share/gnome/help/gnumeric/C/r2938.html
+share/gnome/help/gnumeric/C/r2968.html
+share/gnome/help/gnumeric/C/r2988.html
+share/gnome/help/gnumeric/C/r3012.html
+share/gnome/help/gnumeric/C/r3034.html
+share/gnome/help/gnumeric/C/r3073.html
+share/gnome/help/gnumeric/C/r3096.html
+share/gnome/help/gnumeric/C/r3117.html
+share/gnome/help/gnumeric/C/r3147.html
+share/gnome/help/gnumeric/C/r3187.html
+share/gnome/help/gnumeric/C/r3210.html
+share/gnome/help/gnumeric/C/r3234.html
+share/gnome/help/gnumeric/C/r3258.html
+share/gnome/help/gnumeric/C/r3288.html
+share/gnome/help/gnumeric/C/r3312.html
+share/gnome/help/gnumeric/C/r3335.html
+share/gnome/help/gnumeric/C/r3357.html
+share/gnome/help/gnumeric/C/r3380.html
+share/gnome/help/gnumeric/C/r3409.html
+share/gnome/help/gnumeric/C/r3433.html
+share/gnome/help/gnumeric/C/r3460.html
+share/gnome/help/gnumeric/C/r3484.html
+share/gnome/help/gnumeric/C/r3509.html
+share/gnome/help/gnumeric/C/r3531.html
+share/gnome/help/gnumeric/C/r3558.html
+share/gnome/help/gnumeric/C/r3582.html
+share/gnome/help/gnumeric/C/r3602.html
+share/gnome/help/gnumeric/C/r3624.html
+share/gnome/help/gnumeric/C/r3648.html
+share/gnome/help/gnumeric/C/r3673.html
+share/gnome/help/gnumeric/C/r3696.html
+share/gnome/help/gnumeric/C/r3724.html
+share/gnome/help/gnumeric/C/r3747.html
+share/gnome/help/gnumeric/C/r3767.html
+share/gnome/help/gnumeric/C/r3789.html
+share/gnome/help/gnumeric/C/r3816.html
+share/gnome/help/gnumeric/C/r3839.html
+share/gnome/help/gnumeric/C/r3859.html
+share/gnome/help/gnumeric/C/r3970.html
+share/gnome/help/gnumeric/C/r3995.html
+share/gnome/help/gnumeric/C/r4019.html
+share/gnome/help/gnumeric/C/r4042.html
+share/gnome/help/gnumeric/C/r4071.html
+share/gnome/help/gnumeric/C/r4094.html
+share/gnome/help/gnumeric/C/r4117.html
+share/gnome/help/gnumeric/C/r4144.html
+share/gnome/help/gnumeric/C/r4165.html
+share/gnome/help/gnumeric/C/r4189.html
+share/gnome/help/gnumeric/C/r4218.html
+share/gnome/help/gnumeric/C/r4239.html
+share/gnome/help/gnumeric/C/r4262.html
+share/gnome/help/gnumeric/C/r4284.html
+share/gnome/help/gnumeric/C/r4305.html
+share/gnome/help/gnumeric/C/r4328.html
+share/gnome/help/gnumeric/C/r4348.html
+share/gnome/help/gnumeric/C/r4373.html
+share/gnome/help/gnumeric/C/r4396.html
+share/gnome/help/gnumeric/C/r4420.html
+share/gnome/help/gnumeric/C/r4443.html
+share/gnome/help/gnumeric/C/r4463.html
+share/gnome/help/gnumeric/C/r4486.html
+share/gnome/help/gnumeric/C/r4514.html
+share/gnome/help/gnumeric/C/r4538.html
+share/gnome/help/gnumeric/C/r4558.html
+share/gnome/help/gnumeric/C/r4581.html
+share/gnome/help/gnumeric/C/r4607.html
+share/gnome/help/gnumeric/C/r4632.html
+share/gnome/help/gnumeric/C/r4661.html
+share/gnome/help/gnumeric/C/r4684.html
+share/gnome/help/gnumeric/C/r4711.html
+share/gnome/help/gnumeric/C/r4738.html
+share/gnome/help/gnumeric/C/r4760.html
+share/gnome/help/gnumeric/C/r4782.html
+share/gnome/help/gnumeric/C/r4806.html
+share/gnome/help/gnumeric/C/r4831.html
+share/gnome/help/gnumeric/C/r4854.html
+share/gnome/help/gnumeric/C/r4877.html
+share/gnome/help/gnumeric/C/r4899.html
+share/gnome/help/gnumeric/C/r4924.html
+share/gnome/help/gnumeric/C/r4948.html
+share/gnome/help/gnumeric/C/r4972.html
+share/gnome/help/gnumeric/C/r5013.html
+share/gnome/help/gnumeric/C/r5035.html
+share/gnome/help/gnumeric/C/r5056.html
+share/gnome/help/gnumeric/C/r5077.html
+share/gnome/help/gnumeric/C/r5101.html
+share/gnome/help/gnumeric/C/r5127.html
+share/gnome/help/gnumeric/C/r5147.html
+share/gnome/help/gnumeric/C/r5171.html
+share/gnome/help/gnumeric/C/r5193.html
+share/gnome/help/gnumeric/C/r5215.html
+share/gnome/help/gnumeric/C/r5238.html
+share/gnome/help/gnumeric/C/r5264.html
+share/gnome/help/gnumeric/C/r5291.html
+share/gnome/help/gnumeric/C/r5312.html
+share/gnome/help/gnumeric/C/r5334.html
+share/gnome/help/gnumeric/C/r5357.html
+share/gnome/help/gnumeric/C/r5381.html
+share/gnome/help/gnumeric/C/r5422.html
+share/gnome/help/gnumeric/C/r5442.html
+share/gnome/help/gnumeric/C/r5470.html
+share/gnome/help/gnumeric/C/r5494.html
+share/gnome/help/gnumeric/C/r5518.html
+share/gnome/help/gnumeric/C/r5545.html
+share/gnome/help/gnumeric/C/r5570.html
+share/gnome/help/gnumeric/C/r5590.html
+share/gnome/help/gnumeric/C/r5610.html
+share/gnome/help/gnumeric/C/r5634.html
+share/gnome/help/gnumeric/C/r5659.html
+share/gnome/help/gnumeric/C/r5683.html
+share/gnome/help/gnumeric/C/r5708.html
+share/gnome/help/gnumeric/C/r5732.html
+share/gnome/help/gnumeric/C/r5760.html
+share/gnome/help/gnumeric/C/r5783.html
+share/gnome/help/gnumeric/C/r5810.html
+share/gnome/help/gnumeric/C/r5834.html
+share/gnome/help/gnumeric/C/r5854.html
+share/gnome/help/gnumeric/C/r5877.html
+share/gnome/help/gnumeric/C/r5901.html
+share/gnome/help/gnumeric/C/r5941.html
+share/gnome/help/gnumeric/C/r5964.html
+share/gnome/help/gnumeric/C/r5987.html
+share/gnome/help/gnumeric/C/r6012.html
+share/gnome/help/gnumeric/C/r6037.html
+share/gnome/help/gnumeric/C/r6060.html
+share/gnome/help/gnumeric/C/r6083.html
+share/gnome/help/gnumeric/C/r6106.html
+share/gnome/help/gnumeric/C/r6134.html
+share/gnome/help/gnumeric/C/r6154.html
+share/gnome/help/gnumeric/C/r6177.html
+share/gnome/help/gnumeric/C/r6199.html
+share/gnome/help/gnumeric/C/r6239.html
+share/gnome/help/gnumeric/C/r6264.html
+share/gnome/help/gnumeric/C/r6286.html
+share/gnome/help/gnumeric/C/r6307.html
+share/gnome/help/gnumeric/C/r6332.html
+share/gnome/help/gnumeric/C/r6354.html
+share/gnome/help/gnumeric/C/r6383.html
+share/gnome/help/gnumeric/C/r6407.html
+share/gnome/help/gnumeric/C/r6432.html
+share/gnome/help/gnumeric/C/r6456.html
+share/gnome/help/gnumeric/C/r6483.html
+share/gnome/help/gnumeric/C/r6505.html
+share/gnome/help/gnumeric/C/r6528.html
+share/gnome/help/gnumeric/C/r6554.html
+share/gnome/help/gnumeric/C/r6578.html
+share/gnome/help/gnumeric/C/r6598.html
+share/gnome/help/gnumeric/C/r6625.html
+share/gnome/help/gnumeric/C/r6650.html
+share/gnome/help/gnumeric/C/r6674.html
+share/gnome/help/gnumeric/C/r6697.html
+share/gnome/help/gnumeric/C/r6722.html
+share/gnome/help/gnumeric/C/r6744.html
+share/gnome/help/gnumeric/C/r6767.html
+share/gnome/help/gnumeric/C/r6789.html
+share/gnome/help/gnumeric/C/r6831.html
+share/gnome/help/gnumeric/C/r6854.html
+share/gnome/help/gnumeric/C/r6877.html
+share/gnome/help/gnumeric/C/r6898.html
+share/gnome/help/gnumeric/C/r6930.html
+share/gnome/help/gnumeric/C/r6955.html
+share/gnome/help/gnumeric/C/r6980.html
+share/gnome/help/gnumeric/C/r7000.html
+share/gnome/help/gnumeric/C/r7023.html
+share/gnome/help/gnumeric/C/r7048.html
+share/gnome/help/gnumeric/C/r7072.html
+share/gnome/help/gnumeric/C/r7093.html
+share/gnome/help/gnumeric/C/r7116.html
+share/gnome/help/gnumeric/C/r7141.html
+share/gnome/help/gnumeric/C/r7164.html
+share/gnome/help/gnumeric/C/r7193.html
+share/gnome/help/gnumeric/C/r7217.html
+share/gnome/help/gnumeric/C/r7239.html
+share/gnome/help/gnumeric/C/r7266.html
+share/gnome/help/gnumeric/C/r7288.html
+share/gnome/help/gnumeric/C/r7315.html
+share/gnome/help/gnumeric/C/r7335.html
+share/gnome/help/gnumeric/C/r7361.html
+share/gnome/help/gnumeric/C/r7386.html
+share/gnome/help/gnumeric/C/r7411.html
+share/gnome/help/gnumeric/C/r7435.html
+share/gnome/help/gnumeric/C/r7462.html
+share/gnome/help/gnumeric/C/r7502.html
+share/gnome/help/gnumeric/C/r7528.html
+share/gnome/help/gnumeric/C/r7551.html
+share/gnome/help/gnumeric/C/r7573.html
+share/gnome/help/gnumeric/C/r7596.html
+share/gnome/help/gnumeric/C/r7618.html
+share/gnome/help/gnumeric/C/r7638.html
+share/gnome/help/gnumeric/C/r7663.html
+share/gnome/help/gnumeric/C/r7685.html
+share/gnome/help/gnumeric/C/r7711.html
+share/gnome/help/gnumeric/C/r7734.html
+share/gnome/help/gnumeric/C/r7759.html
+share/gnome/help/gnumeric/C/r7787.html
+share/gnome/help/gnumeric/C/r7817.html
+share/gnome/help/gnumeric/C/r7841.html
+share/gnome/help/gnumeric/C/r7867.html
+share/gnome/help/gnumeric/C/r7887.html
+share/gnome/help/gnumeric/C/r7923.html
+share/gnome/help/gnumeric/C/r7940.html
+share/gnome/help/gnumeric/C/r7962.html
+share/gnome/help/gnumeric/C/r7987.html
+share/gnome/help/gnumeric/C/r8012.html
+share/gnome/help/gnumeric/C/r8036.html
+share/gnome/help/gnumeric/C/r8059.html
+share/gnome/help/gnumeric/C/r8082.html
+share/gnome/help/gnumeric/C/r8105.html
+share/gnome/help/gnumeric/C/r8138.html
+share/gnome/help/gnumeric/C/r8160.html
+share/gnome/help/gnumeric/C/r8187.html
+share/gnome/help/gnumeric/C/r8207.html
+share/gnome/help/gnumeric/C/r8247.html
+share/gnome/help/gnumeric/C/r8270.html
+share/gnome/help/gnumeric/C/r8293.html
+share/gnome/help/gnumeric/C/r8316.html
+share/gnome/help/gnumeric/C/r8340.html
+share/gnome/help/gnumeric/C/r8364.html
+share/gnome/help/gnumeric/C/r8390.html
+share/gnome/help/gnumeric/C/r8412.html
+share/gnome/help/gnumeric/C/r8436.html
+share/gnome/help/gnumeric/C/r8464.html
+share/gnome/help/gnumeric/C/r8487.html
+share/gnome/help/gnumeric/C/r8507.html
+share/gnome/help/gnumeric/C/r8529.html
+share/gnome/help/gnumeric/C/r8556.html
+share/gnome/help/gnumeric/C/r8579.html
+share/gnome/help/gnumeric/C/r8601.html
+share/gnome/help/gnumeric/C/r8625.html
+share/gnome/help/gnumeric/C/r8658.html
+share/gnome/help/gnumeric/C/r8686.html
+share/gnome/help/gnumeric/C/r8710.html
+share/gnome/help/gnumeric/C/r8732.html
+share/gnome/help/gnumeric/C/r8760.html
+share/gnome/help/gnumeric/C/r8786.html
+share/gnome/help/gnumeric/C/r8809.html
+share/gnome/help/gnumeric/C/r8832.html
+share/gnome/help/gnumeric/C/r8860.html
+share/gnome/help/gnumeric/C/r8884.html
+share/gnome/help/gnumeric/C/r8909.html
+share/gnome/help/gnumeric/C/r8937.html
+share/gnome/help/gnumeric/C/r8964.html
+share/gnome/help/gnumeric/C/r8982.html
+share/gnome/help/gnumeric/C/r9006.html
+share/gnome/help/gnumeric/C/r9034.html
+share/gnome/help/gnumeric/C/r9062.html
+share/gnome/help/gnumeric/C/r9085.html
+share/gnome/help/gnumeric/C/r9107.html
+share/gnome/help/gnumeric/C/r9130.html
+share/gnome/help/gnumeric/C/r9150.html
+share/gnome/help/gnumeric/C/r9178.html
+share/gnome/help/gnumeric/C/r9199.html
+share/gnome/help/gnumeric/C/r9222.html
+share/gnome/help/gnumeric/C/r9246.html
+share/gnome/help/gnumeric/C/r9270.html
+share/gnome/help/gnumeric/C/r9298.html
+share/gnome/help/gnumeric/C/r9321.html
+share/gnome/help/gnumeric/C/r9350.html
+share/gnome/help/gnumeric/C/r9372.html
+share/gnome/help/gnumeric/C/r9396.html
+share/gnome/help/gnumeric/C/r9417.html
+share/gnome/help/gnumeric/C/r9441.html
+share/gnome/help/gnumeric/C/r9464.html
+share/gnome/help/gnumeric/C/r9489.html
+share/gnome/help/gnumeric/C/r9512.html
+share/gnome/help/gnumeric/C/r9532.html
+share/gnome/help/gnumeric/C/r9553.html
+share/gnome/help/gnumeric/C/r9578.html
+share/gnome/help/gnumeric/C/r9607.html
+share/gnome/help/gnumeric/C/r9632.html
+share/gnome/help/gnumeric/C/r9652.html
+share/gnome/help/gnumeric/C/r9672.html
+share/gnome/help/gnumeric/C/r9694.html
+share/gnome/help/gnumeric/C/r9716.html
+share/gnome/help/gnumeric/C/r9740.html
+share/gnome/help/gnumeric/C/r9766.html
+share/gnome/help/gnumeric/C/r9787.html
+share/gnome/help/gnumeric/C/r9828.html
+share/gnome/help/gnumeric/C/r9856.html
+share/gnome/help/gnumeric/C/r9876.html
+share/gnome/help/gnumeric/C/r9916.html
+share/gnome/help/gnumeric/C/r9937.html
+share/gnome/help/gnumeric/C/r9960.html
share/gnome/help/gnumeric/C/rest.html
share/gnome/help/gnumeric/C/selecting-cells-entering-formulas.html
share/gnome/help/gnumeric/C/solver.html
@@ -642,7 +642,7 @@ share/gnome/pixmaps/gnumeric/right-down.png
share/gnome/pixmaps/gnumeric/right_border
share/gnome/pixmaps/gnumeric/stf-druid.png
share/gnome/pixmaps/gnumeric/top_border
-share/gnome/ui/gnumeric.xml
+share/gnome/ui/GNOME_Gnumeric.xml
share/locale/ca/LC_MESSAGES/gnumeric.mo
share/locale/cs/LC_MESSAGES/gnumeric.mo
share/locale/da/LC_MESSAGES/gnumeric.mo
@@ -667,8 +667,6 @@ share/locale/gl/LC_MESSAGES/gnumeric.mo
share/locale/hr/LC_MESSAGES/gnumeric.mo
share/locale/hu/LC_MESSAGES/gnumeric.mo
share/locale/it/LC_MESSAGES/gnumeric.mo
-share/locale/ja/LC_MESSAGES/gnumeric.mo
-share/locale/ko/LC_MESSAGES/gnumeric.mo
share/locale/nl/LC_MESSAGES/gnumeric.mo
share/locale/no/LC_MESSAGES/gnumeric.mo
share/locale/pl/LC_MESSAGES/gnumeric.mo
@@ -679,8 +677,6 @@ share/locale/sk/LC_MESSAGES/gnumeric.mo
share/locale/sv/LC_MESSAGES/gnumeric.mo
share/locale/tr/LC_MESSAGES/gnumeric.mo
share/locale/uk/LC_MESSAGES/gnumeric.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnumeric.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
@dirrm share/gnome/help/gnumeric/C/images
@dirrm share/gnome/help/gnumeric/C
@dirrm share/gnome/help/gnumeric
@@ -698,7 +694,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
@dirrm share/gnome/gnumeric
@unexec rmdir %D/share/gnome/oaf 2>/dev/null || true
@dirrm share/gnome/pixmaps/gnumeric
-@dirrm lib/gnumeric/%%VERSION%%/plugins/xml2
+@dirrm lib/gnumeric/%%VERSION%%/plugins/xml_sax
@dirrm lib/gnumeric/%%VERSION%%/plugins/xbase
@dirrm lib/gnumeric/%%VERSION%%/plugins/sylk
@dirrm lib/gnumeric/%%VERSION%%/plugins/sc
@@ -707,8 +703,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
@dirrm lib/gnumeric/%%VERSION%%/plugins/numtheory
@dirrm lib/gnumeric/%%VERSION%%/plugins/lotus
@dirrm lib/gnumeric/%%VERSION%%/plugins/html
-@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif
@dirrm lib/gnumeric/%%VERSION%%/plugins/gb
+@dirrm lib/gnumeric/%%VERSION%%/plugins/excel
@dirrm lib/gnumeric/%%VERSION%%/plugins/dif
@dirrm lib/gnumeric/%%VERSION%%/plugins/applix
@dirrm lib/gnumeric/%%VERSION%%/plugins
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 3e86ba8ccdb8..416847412bcc 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnumeric
-PORTVERSION= 0.64
+PORTVERSION= 0.65
CATEGORIES?= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnumeric
@@ -15,9 +15,11 @@ MAINTAINER?= gnome@FreeBSD.org
LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \
gnomeole2.0:${PORTSDIR}/devel/libole2 \
- gal.6:${PORTSDIR}/x11-toolkits/gal \
- gb.0:${PORTSDIR}/lang/gnomebasic \
- gda-common.0:${PORTSDIR}/databases/libgda
+ gal.7:${PORTSDIR}/x11-toolkits/gal \
+ gb.0:${PORTSDIR}/lang/gnomebasic
+
+# Temporarily take this out until libgda 0.2.4 or higher is released
+# gda-common.0:${PORTSDIR}/databases/libgda
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 58f0661a5ddb..9711985a9032 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.64.tar.gz) = 49673e41e314dacc54ea5aa74c0792ea
+MD5 (gnumeric-0.65.tar.gz) = d31a2258b3f8ded219677a54f4fbe23f
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index 99cdec2f9ba8..38602b0b16a8 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,6 +1,53 @@
---- configure.orig Tue Oct 10 10:27:58 2000
-+++ configure Wed Oct 11 12:15:15 2000
-@@ -6677,6 +6677,6 @@
+--- configure.orig Sun May 20 13:17:33 2001
++++ configure Mon May 21 11:57:29 2001
+@@ -5591,4 +5591,19 @@
+
+-
+-
++# Actually configure libtool. ac_aux_dir is where install-sh is found.
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
++${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
++|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++
++# Reload cache, that may have been modified by ltconfig
++if test -r "$cache_file"; then
++ echo "loading cache $cache_file"
++ . $cache_file
++else
++ echo "creating cache $cache_file"
++ > $cache_file
++fi
+
+@@ -5596,3 +5611,3 @@
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+@@ -5601,16 +5616,7 @@
+
+-# Prevent multiple expansion
++# Redirect the config.log output again, so that the ltconfig log is not
++# clobbered by the next message.
++exec 5>>./config.log
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ # Check whether --with-gnome-includes or --without-gnome-includes was given.
+@@ -10526,6 +10532,6 @@
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
diff --git a/math/gnumeric2/files/patch-po::Makefile.in.in b/math/gnumeric2/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..2ee6d57354b7
--- /dev/null
+++ b/math/gnumeric2/files/patch-po::Makefile.in.in
@@ -0,0 +1,7 @@
+--- po/Makefile.in.in.orig Sun May 20 11:15:03 2001
++++ po/Makefile.in.in Mon May 21 12:28:25 2001
+@@ -22,3 +22,3 @@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
diff --git a/math/gnumeric2/files/patch-src::mathfunc.h b/math/gnumeric2/files/patch-src::mathfunc.h
new file mode 100644
index 000000000000..5ece38afaf53
--- /dev/null
+++ b/math/gnumeric2/files/patch-src::mathfunc.h
@@ -0,0 +1,9 @@
+--- src/mathfunc.h.orig Thu Apr 26 20:47:46 2001
++++ src/mathfunc.h Mon May 21 12:08:51 2001
+@@ -7,2 +7,6 @@
+
++#ifdef __FreeBSD__
++#define FINITE finite
++#endif
++
+ #ifndef FINITE
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 1cd62fd3a186..8277449a0520 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -5,10 +5,10 @@ lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/dif/dif.so
lib/gnumeric/%%VERSION%%/plugins/dif/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/excel/excel.so
+lib/gnumeric/%%VERSION%%/plugins/excel/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/gb/gnum_gb.so
lib/gnumeric/%%VERSION%%/plugins/gb/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so
-lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/html/html.so
lib/gnumeric/%%VERSION%%/plugins/html/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.so
@@ -23,8 +23,8 @@ lib/gnumeric/%%VERSION%%/plugins/sylk/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/sylk/sylk.so
lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
-lib/gnumeric/%%VERSION%%/plugins/xml2/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/xml2/xml2.so
+lib/gnumeric/%%VERSION%%/plugins/xml_sax/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/xml_sax/xml_sax.so
share/gnome/apps/Applications/gnumeric.desktop
share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
@@ -235,347 +235,347 @@ share/gnome/help/gnumeric/C/number-formatting-overview.html
share/gnome/help/gnumeric/C/print-preview.html
share/gnome/help/gnumeric/C/print-setup.html
share/gnome/help/gnumeric/C/printing.html
-share/gnome/help/gnumeric/C/r10002.html
-share/gnome/help/gnumeric/C/r10028.html
-share/gnome/help/gnumeric/C/r10052.html
-share/gnome/help/gnumeric/C/r10080.html
-share/gnome/help/gnumeric/C/r10100.html
-share/gnome/help/gnumeric/C/r10123.html
-share/gnome/help/gnumeric/C/r10147.html
-share/gnome/help/gnumeric/C/r10175.html
-share/gnome/help/gnumeric/C/r10196.html
-share/gnome/help/gnumeric/C/r10216.html
-share/gnome/help/gnumeric/C/r10243.html
-share/gnome/help/gnumeric/C/r10283.html
-share/gnome/help/gnumeric/C/r10308.html
-share/gnome/help/gnumeric/C/r10337.html
-share/gnome/help/gnumeric/C/r10359.html
-share/gnome/help/gnumeric/C/r10382.html
-share/gnome/help/gnumeric/C/r10409.html
-share/gnome/help/gnumeric/C/r10435.html
-share/gnome/help/gnumeric/C/r10463.html
-share/gnome/help/gnumeric/C/r10483.html
-share/gnome/help/gnumeric/C/r10508.html
-share/gnome/help/gnumeric/C/r10531.html
-share/gnome/help/gnumeric/C/r10555.html
-share/gnome/help/gnumeric/C/r10581.html
-share/gnome/help/gnumeric/C/r10603.html
-share/gnome/help/gnumeric/C/r10627.html
-share/gnome/help/gnumeric/C/r10653.html
-share/gnome/help/gnumeric/C/r10675.html
-share/gnome/help/gnumeric/C/r10700.html
-share/gnome/help/gnumeric/C/r10723.html
-share/gnome/help/gnumeric/C/r10745.html
-share/gnome/help/gnumeric/C/r10774.html
-share/gnome/help/gnumeric/C/r10795.html
-share/gnome/help/gnumeric/C/r10818.html
-share/gnome/help/gnumeric/C/r10840.html
-share/gnome/help/gnumeric/C/r10867.html
-share/gnome/help/gnumeric/C/r10887.html
-share/gnome/help/gnumeric/C/r10913.html
-share/gnome/help/gnumeric/C/r10936.html
-share/gnome/help/gnumeric/C/r10961.html
-share/gnome/help/gnumeric/C/r10984.html
-share/gnome/help/gnumeric/C/r11005.html
-share/gnome/help/gnumeric/C/r11030.html
-share/gnome/help/gnumeric/C/r11054.html
-share/gnome/help/gnumeric/C/r11076.html
-share/gnome/help/gnumeric/C/r11096.html
-share/gnome/help/gnumeric/C/r11116.html
-share/gnome/help/gnumeric/C/r11141.html
-share/gnome/help/gnumeric/C/r2697.html
-share/gnome/help/gnumeric/C/r2721.html
-share/gnome/help/gnumeric/C/r2750.html
-share/gnome/help/gnumeric/C/r2771.html
-share/gnome/help/gnumeric/C/r2795.html
-share/gnome/help/gnumeric/C/r2825.html
-share/gnome/help/gnumeric/C/r2845.html
-share/gnome/help/gnumeric/C/r2867.html
-share/gnome/help/gnumeric/C/r2890.html
-share/gnome/help/gnumeric/C/r2918.html
-share/gnome/help/gnumeric/C/r2939.html
-share/gnome/help/gnumeric/C/r2969.html
-share/gnome/help/gnumeric/C/r2989.html
-share/gnome/help/gnumeric/C/r3013.html
-share/gnome/help/gnumeric/C/r3035.html
-share/gnome/help/gnumeric/C/r3074.html
-share/gnome/help/gnumeric/C/r3097.html
-share/gnome/help/gnumeric/C/r3118.html
-share/gnome/help/gnumeric/C/r3148.html
-share/gnome/help/gnumeric/C/r3188.html
-share/gnome/help/gnumeric/C/r3211.html
-share/gnome/help/gnumeric/C/r3235.html
-share/gnome/help/gnumeric/C/r3259.html
-share/gnome/help/gnumeric/C/r3289.html
-share/gnome/help/gnumeric/C/r3313.html
-share/gnome/help/gnumeric/C/r3336.html
-share/gnome/help/gnumeric/C/r3358.html
-share/gnome/help/gnumeric/C/r3381.html
-share/gnome/help/gnumeric/C/r3410.html
-share/gnome/help/gnumeric/C/r3434.html
-share/gnome/help/gnumeric/C/r3461.html
-share/gnome/help/gnumeric/C/r3485.html
-share/gnome/help/gnumeric/C/r3510.html
-share/gnome/help/gnumeric/C/r3532.html
-share/gnome/help/gnumeric/C/r3559.html
-share/gnome/help/gnumeric/C/r3583.html
-share/gnome/help/gnumeric/C/r3603.html
-share/gnome/help/gnumeric/C/r3625.html
-share/gnome/help/gnumeric/C/r3649.html
-share/gnome/help/gnumeric/C/r3674.html
-share/gnome/help/gnumeric/C/r3697.html
-share/gnome/help/gnumeric/C/r3725.html
-share/gnome/help/gnumeric/C/r3748.html
-share/gnome/help/gnumeric/C/r3768.html
-share/gnome/help/gnumeric/C/r3790.html
-share/gnome/help/gnumeric/C/r3817.html
-share/gnome/help/gnumeric/C/r3840.html
-share/gnome/help/gnumeric/C/r3860.html
-share/gnome/help/gnumeric/C/r3971.html
-share/gnome/help/gnumeric/C/r3996.html
-share/gnome/help/gnumeric/C/r4020.html
-share/gnome/help/gnumeric/C/r4043.html
-share/gnome/help/gnumeric/C/r4072.html
-share/gnome/help/gnumeric/C/r4095.html
-share/gnome/help/gnumeric/C/r4118.html
-share/gnome/help/gnumeric/C/r4145.html
-share/gnome/help/gnumeric/C/r4166.html
-share/gnome/help/gnumeric/C/r4190.html
-share/gnome/help/gnumeric/C/r4219.html
-share/gnome/help/gnumeric/C/r4240.html
-share/gnome/help/gnumeric/C/r4263.html
-share/gnome/help/gnumeric/C/r4285.html
-share/gnome/help/gnumeric/C/r4306.html
-share/gnome/help/gnumeric/C/r4329.html
-share/gnome/help/gnumeric/C/r4349.html
-share/gnome/help/gnumeric/C/r4374.html
-share/gnome/help/gnumeric/C/r4397.html
-share/gnome/help/gnumeric/C/r4421.html
-share/gnome/help/gnumeric/C/r4444.html
-share/gnome/help/gnumeric/C/r4464.html
-share/gnome/help/gnumeric/C/r4487.html
-share/gnome/help/gnumeric/C/r4515.html
-share/gnome/help/gnumeric/C/r4539.html
-share/gnome/help/gnumeric/C/r4559.html
-share/gnome/help/gnumeric/C/r4582.html
-share/gnome/help/gnumeric/C/r4608.html
-share/gnome/help/gnumeric/C/r4633.html
-share/gnome/help/gnumeric/C/r4662.html
-share/gnome/help/gnumeric/C/r4685.html
-share/gnome/help/gnumeric/C/r4712.html
-share/gnome/help/gnumeric/C/r4739.html
-share/gnome/help/gnumeric/C/r4761.html
-share/gnome/help/gnumeric/C/r4783.html
-share/gnome/help/gnumeric/C/r4807.html
-share/gnome/help/gnumeric/C/r4832.html
-share/gnome/help/gnumeric/C/r4855.html
-share/gnome/help/gnumeric/C/r4878.html
-share/gnome/help/gnumeric/C/r4900.html
-share/gnome/help/gnumeric/C/r4925.html
-share/gnome/help/gnumeric/C/r4949.html
-share/gnome/help/gnumeric/C/r4973.html
-share/gnome/help/gnumeric/C/r5014.html
-share/gnome/help/gnumeric/C/r5036.html
-share/gnome/help/gnumeric/C/r5057.html
-share/gnome/help/gnumeric/C/r5078.html
-share/gnome/help/gnumeric/C/r5102.html
-share/gnome/help/gnumeric/C/r5128.html
-share/gnome/help/gnumeric/C/r5148.html
-share/gnome/help/gnumeric/C/r5172.html
-share/gnome/help/gnumeric/C/r5194.html
-share/gnome/help/gnumeric/C/r5216.html
-share/gnome/help/gnumeric/C/r5239.html
-share/gnome/help/gnumeric/C/r5265.html
-share/gnome/help/gnumeric/C/r5292.html
-share/gnome/help/gnumeric/C/r5313.html
-share/gnome/help/gnumeric/C/r5335.html
-share/gnome/help/gnumeric/C/r5358.html
-share/gnome/help/gnumeric/C/r5382.html
-share/gnome/help/gnumeric/C/r5423.html
-share/gnome/help/gnumeric/C/r5443.html
-share/gnome/help/gnumeric/C/r5471.html
-share/gnome/help/gnumeric/C/r5495.html
-share/gnome/help/gnumeric/C/r5519.html
-share/gnome/help/gnumeric/C/r5546.html
-share/gnome/help/gnumeric/C/r5571.html
-share/gnome/help/gnumeric/C/r5591.html
-share/gnome/help/gnumeric/C/r5611.html
-share/gnome/help/gnumeric/C/r5635.html
-share/gnome/help/gnumeric/C/r5660.html
-share/gnome/help/gnumeric/C/r5684.html
-share/gnome/help/gnumeric/C/r5709.html
-share/gnome/help/gnumeric/C/r5733.html
-share/gnome/help/gnumeric/C/r5761.html
-share/gnome/help/gnumeric/C/r5784.html
-share/gnome/help/gnumeric/C/r5811.html
-share/gnome/help/gnumeric/C/r5835.html
-share/gnome/help/gnumeric/C/r5855.html
-share/gnome/help/gnumeric/C/r5878.html
-share/gnome/help/gnumeric/C/r5902.html
-share/gnome/help/gnumeric/C/r5942.html
-share/gnome/help/gnumeric/C/r5965.html
-share/gnome/help/gnumeric/C/r5988.html
-share/gnome/help/gnumeric/C/r6013.html
-share/gnome/help/gnumeric/C/r6038.html
-share/gnome/help/gnumeric/C/r6061.html
-share/gnome/help/gnumeric/C/r6084.html
-share/gnome/help/gnumeric/C/r6107.html
-share/gnome/help/gnumeric/C/r6135.html
-share/gnome/help/gnumeric/C/r6155.html
-share/gnome/help/gnumeric/C/r6178.html
-share/gnome/help/gnumeric/C/r6200.html
-share/gnome/help/gnumeric/C/r6240.html
-share/gnome/help/gnumeric/C/r6265.html
-share/gnome/help/gnumeric/C/r6287.html
-share/gnome/help/gnumeric/C/r6308.html
-share/gnome/help/gnumeric/C/r6333.html
-share/gnome/help/gnumeric/C/r6355.html
-share/gnome/help/gnumeric/C/r6384.html
-share/gnome/help/gnumeric/C/r6408.html
-share/gnome/help/gnumeric/C/r6433.html
-share/gnome/help/gnumeric/C/r6457.html
-share/gnome/help/gnumeric/C/r6484.html
-share/gnome/help/gnumeric/C/r6506.html
-share/gnome/help/gnumeric/C/r6529.html
-share/gnome/help/gnumeric/C/r6555.html
-share/gnome/help/gnumeric/C/r6579.html
-share/gnome/help/gnumeric/C/r6599.html
-share/gnome/help/gnumeric/C/r6626.html
-share/gnome/help/gnumeric/C/r6651.html
-share/gnome/help/gnumeric/C/r6675.html
-share/gnome/help/gnumeric/C/r6698.html
-share/gnome/help/gnumeric/C/r6723.html
-share/gnome/help/gnumeric/C/r6745.html
-share/gnome/help/gnumeric/C/r6768.html
-share/gnome/help/gnumeric/C/r6790.html
-share/gnome/help/gnumeric/C/r6832.html
-share/gnome/help/gnumeric/C/r6855.html
-share/gnome/help/gnumeric/C/r6878.html
-share/gnome/help/gnumeric/C/r6899.html
-share/gnome/help/gnumeric/C/r6931.html
-share/gnome/help/gnumeric/C/r6956.html
-share/gnome/help/gnumeric/C/r6981.html
-share/gnome/help/gnumeric/C/r7001.html
-share/gnome/help/gnumeric/C/r7024.html
-share/gnome/help/gnumeric/C/r7049.html
-share/gnome/help/gnumeric/C/r7073.html
-share/gnome/help/gnumeric/C/r7094.html
-share/gnome/help/gnumeric/C/r7117.html
-share/gnome/help/gnumeric/C/r7142.html
-share/gnome/help/gnumeric/C/r7165.html
-share/gnome/help/gnumeric/C/r7194.html
-share/gnome/help/gnumeric/C/r7218.html
-share/gnome/help/gnumeric/C/r7240.html
-share/gnome/help/gnumeric/C/r7267.html
-share/gnome/help/gnumeric/C/r7289.html
-share/gnome/help/gnumeric/C/r7316.html
-share/gnome/help/gnumeric/C/r7336.html
-share/gnome/help/gnumeric/C/r7362.html
-share/gnome/help/gnumeric/C/r7387.html
-share/gnome/help/gnumeric/C/r7412.html
-share/gnome/help/gnumeric/C/r7436.html
-share/gnome/help/gnumeric/C/r7463.html
-share/gnome/help/gnumeric/C/r7503.html
-share/gnome/help/gnumeric/C/r7529.html
-share/gnome/help/gnumeric/C/r7552.html
-share/gnome/help/gnumeric/C/r7574.html
-share/gnome/help/gnumeric/C/r7597.html
-share/gnome/help/gnumeric/C/r7619.html
-share/gnome/help/gnumeric/C/r7639.html
-share/gnome/help/gnumeric/C/r7664.html
-share/gnome/help/gnumeric/C/r7686.html
-share/gnome/help/gnumeric/C/r7712.html
-share/gnome/help/gnumeric/C/r7735.html
-share/gnome/help/gnumeric/C/r7760.html
-share/gnome/help/gnumeric/C/r7788.html
-share/gnome/help/gnumeric/C/r7818.html
-share/gnome/help/gnumeric/C/r7842.html
-share/gnome/help/gnumeric/C/r7868.html
-share/gnome/help/gnumeric/C/r7888.html
-share/gnome/help/gnumeric/C/r7924.html
-share/gnome/help/gnumeric/C/r7941.html
-share/gnome/help/gnumeric/C/r7963.html
-share/gnome/help/gnumeric/C/r7988.html
-share/gnome/help/gnumeric/C/r8013.html
-share/gnome/help/gnumeric/C/r8037.html
-share/gnome/help/gnumeric/C/r8060.html
-share/gnome/help/gnumeric/C/r8083.html
-share/gnome/help/gnumeric/C/r8106.html
-share/gnome/help/gnumeric/C/r8139.html
-share/gnome/help/gnumeric/C/r8161.html
-share/gnome/help/gnumeric/C/r8188.html
-share/gnome/help/gnumeric/C/r8208.html
-share/gnome/help/gnumeric/C/r8248.html
-share/gnome/help/gnumeric/C/r8271.html
-share/gnome/help/gnumeric/C/r8294.html
-share/gnome/help/gnumeric/C/r8317.html
-share/gnome/help/gnumeric/C/r8341.html
-share/gnome/help/gnumeric/C/r8365.html
-share/gnome/help/gnumeric/C/r8391.html
-share/gnome/help/gnumeric/C/r8413.html
-share/gnome/help/gnumeric/C/r8437.html
-share/gnome/help/gnumeric/C/r8465.html
-share/gnome/help/gnumeric/C/r8488.html
-share/gnome/help/gnumeric/C/r8508.html
-share/gnome/help/gnumeric/C/r8530.html
-share/gnome/help/gnumeric/C/r8557.html
-share/gnome/help/gnumeric/C/r8580.html
-share/gnome/help/gnumeric/C/r8602.html
-share/gnome/help/gnumeric/C/r8626.html
-share/gnome/help/gnumeric/C/r8659.html
-share/gnome/help/gnumeric/C/r8687.html
-share/gnome/help/gnumeric/C/r8711.html
-share/gnome/help/gnumeric/C/r8733.html
-share/gnome/help/gnumeric/C/r8761.html
-share/gnome/help/gnumeric/C/r8787.html
-share/gnome/help/gnumeric/C/r8810.html
-share/gnome/help/gnumeric/C/r8833.html
-share/gnome/help/gnumeric/C/r8861.html
-share/gnome/help/gnumeric/C/r8885.html
-share/gnome/help/gnumeric/C/r8910.html
-share/gnome/help/gnumeric/C/r8938.html
-share/gnome/help/gnumeric/C/r8965.html
-share/gnome/help/gnumeric/C/r8983.html
-share/gnome/help/gnumeric/C/r9007.html
-share/gnome/help/gnumeric/C/r9035.html
-share/gnome/help/gnumeric/C/r9063.html
-share/gnome/help/gnumeric/C/r9086.html
-share/gnome/help/gnumeric/C/r9108.html
-share/gnome/help/gnumeric/C/r9131.html
-share/gnome/help/gnumeric/C/r9151.html
-share/gnome/help/gnumeric/C/r9179.html
-share/gnome/help/gnumeric/C/r9200.html
-share/gnome/help/gnumeric/C/r9223.html
-share/gnome/help/gnumeric/C/r9247.html
-share/gnome/help/gnumeric/C/r9271.html
-share/gnome/help/gnumeric/C/r9299.html
-share/gnome/help/gnumeric/C/r9322.html
-share/gnome/help/gnumeric/C/r9351.html
-share/gnome/help/gnumeric/C/r9373.html
-share/gnome/help/gnumeric/C/r9397.html
-share/gnome/help/gnumeric/C/r9418.html
-share/gnome/help/gnumeric/C/r9442.html
-share/gnome/help/gnumeric/C/r9465.html
-share/gnome/help/gnumeric/C/r9490.html
-share/gnome/help/gnumeric/C/r9513.html
-share/gnome/help/gnumeric/C/r9533.html
-share/gnome/help/gnumeric/C/r9554.html
-share/gnome/help/gnumeric/C/r9579.html
-share/gnome/help/gnumeric/C/r9608.html
-share/gnome/help/gnumeric/C/r9633.html
-share/gnome/help/gnumeric/C/r9653.html
-share/gnome/help/gnumeric/C/r9673.html
-share/gnome/help/gnumeric/C/r9695.html
-share/gnome/help/gnumeric/C/r9717.html
-share/gnome/help/gnumeric/C/r9741.html
-share/gnome/help/gnumeric/C/r9767.html
-share/gnome/help/gnumeric/C/r9788.html
-share/gnome/help/gnumeric/C/r9829.html
-share/gnome/help/gnumeric/C/r9857.html
-share/gnome/help/gnumeric/C/r9877.html
-share/gnome/help/gnumeric/C/r9917.html
-share/gnome/help/gnumeric/C/r9938.html
-share/gnome/help/gnumeric/C/r9961.html
+share/gnome/help/gnumeric/C/r10001.html
+share/gnome/help/gnumeric/C/r10027.html
+share/gnome/help/gnumeric/C/r10051.html
+share/gnome/help/gnumeric/C/r10079.html
+share/gnome/help/gnumeric/C/r10099.html
+share/gnome/help/gnumeric/C/r10122.html
+share/gnome/help/gnumeric/C/r10146.html
+share/gnome/help/gnumeric/C/r10174.html
+share/gnome/help/gnumeric/C/r10195.html
+share/gnome/help/gnumeric/C/r10215.html
+share/gnome/help/gnumeric/C/r10242.html
+share/gnome/help/gnumeric/C/r10282.html
+share/gnome/help/gnumeric/C/r10307.html
+share/gnome/help/gnumeric/C/r10336.html
+share/gnome/help/gnumeric/C/r10358.html
+share/gnome/help/gnumeric/C/r10381.html
+share/gnome/help/gnumeric/C/r10408.html
+share/gnome/help/gnumeric/C/r10434.html
+share/gnome/help/gnumeric/C/r10462.html
+share/gnome/help/gnumeric/C/r10482.html
+share/gnome/help/gnumeric/C/r10507.html
+share/gnome/help/gnumeric/C/r10530.html
+share/gnome/help/gnumeric/C/r10554.html
+share/gnome/help/gnumeric/C/r10580.html
+share/gnome/help/gnumeric/C/r10602.html
+share/gnome/help/gnumeric/C/r10626.html
+share/gnome/help/gnumeric/C/r10652.html
+share/gnome/help/gnumeric/C/r10674.html
+share/gnome/help/gnumeric/C/r10699.html
+share/gnome/help/gnumeric/C/r10722.html
+share/gnome/help/gnumeric/C/r10744.html
+share/gnome/help/gnumeric/C/r10773.html
+share/gnome/help/gnumeric/C/r10794.html
+share/gnome/help/gnumeric/C/r10817.html
+share/gnome/help/gnumeric/C/r10839.html
+share/gnome/help/gnumeric/C/r10866.html
+share/gnome/help/gnumeric/C/r10886.html
+share/gnome/help/gnumeric/C/r10912.html
+share/gnome/help/gnumeric/C/r10935.html
+share/gnome/help/gnumeric/C/r10960.html
+share/gnome/help/gnumeric/C/r10983.html
+share/gnome/help/gnumeric/C/r11004.html
+share/gnome/help/gnumeric/C/r11029.html
+share/gnome/help/gnumeric/C/r11053.html
+share/gnome/help/gnumeric/C/r11075.html
+share/gnome/help/gnumeric/C/r11095.html
+share/gnome/help/gnumeric/C/r11115.html
+share/gnome/help/gnumeric/C/r11140.html
+share/gnome/help/gnumeric/C/r2696.html
+share/gnome/help/gnumeric/C/r2720.html
+share/gnome/help/gnumeric/C/r2749.html
+share/gnome/help/gnumeric/C/r2770.html
+share/gnome/help/gnumeric/C/r2794.html
+share/gnome/help/gnumeric/C/r2824.html
+share/gnome/help/gnumeric/C/r2844.html
+share/gnome/help/gnumeric/C/r2866.html
+share/gnome/help/gnumeric/C/r2889.html
+share/gnome/help/gnumeric/C/r2917.html
+share/gnome/help/gnumeric/C/r2938.html
+share/gnome/help/gnumeric/C/r2968.html
+share/gnome/help/gnumeric/C/r2988.html
+share/gnome/help/gnumeric/C/r3012.html
+share/gnome/help/gnumeric/C/r3034.html
+share/gnome/help/gnumeric/C/r3073.html
+share/gnome/help/gnumeric/C/r3096.html
+share/gnome/help/gnumeric/C/r3117.html
+share/gnome/help/gnumeric/C/r3147.html
+share/gnome/help/gnumeric/C/r3187.html
+share/gnome/help/gnumeric/C/r3210.html
+share/gnome/help/gnumeric/C/r3234.html
+share/gnome/help/gnumeric/C/r3258.html
+share/gnome/help/gnumeric/C/r3288.html
+share/gnome/help/gnumeric/C/r3312.html
+share/gnome/help/gnumeric/C/r3335.html
+share/gnome/help/gnumeric/C/r3357.html
+share/gnome/help/gnumeric/C/r3380.html
+share/gnome/help/gnumeric/C/r3409.html
+share/gnome/help/gnumeric/C/r3433.html
+share/gnome/help/gnumeric/C/r3460.html
+share/gnome/help/gnumeric/C/r3484.html
+share/gnome/help/gnumeric/C/r3509.html
+share/gnome/help/gnumeric/C/r3531.html
+share/gnome/help/gnumeric/C/r3558.html
+share/gnome/help/gnumeric/C/r3582.html
+share/gnome/help/gnumeric/C/r3602.html
+share/gnome/help/gnumeric/C/r3624.html
+share/gnome/help/gnumeric/C/r3648.html
+share/gnome/help/gnumeric/C/r3673.html
+share/gnome/help/gnumeric/C/r3696.html
+share/gnome/help/gnumeric/C/r3724.html
+share/gnome/help/gnumeric/C/r3747.html
+share/gnome/help/gnumeric/C/r3767.html
+share/gnome/help/gnumeric/C/r3789.html
+share/gnome/help/gnumeric/C/r3816.html
+share/gnome/help/gnumeric/C/r3839.html
+share/gnome/help/gnumeric/C/r3859.html
+share/gnome/help/gnumeric/C/r3970.html
+share/gnome/help/gnumeric/C/r3995.html
+share/gnome/help/gnumeric/C/r4019.html
+share/gnome/help/gnumeric/C/r4042.html
+share/gnome/help/gnumeric/C/r4071.html
+share/gnome/help/gnumeric/C/r4094.html
+share/gnome/help/gnumeric/C/r4117.html
+share/gnome/help/gnumeric/C/r4144.html
+share/gnome/help/gnumeric/C/r4165.html
+share/gnome/help/gnumeric/C/r4189.html
+share/gnome/help/gnumeric/C/r4218.html
+share/gnome/help/gnumeric/C/r4239.html
+share/gnome/help/gnumeric/C/r4262.html
+share/gnome/help/gnumeric/C/r4284.html
+share/gnome/help/gnumeric/C/r4305.html
+share/gnome/help/gnumeric/C/r4328.html
+share/gnome/help/gnumeric/C/r4348.html
+share/gnome/help/gnumeric/C/r4373.html
+share/gnome/help/gnumeric/C/r4396.html
+share/gnome/help/gnumeric/C/r4420.html
+share/gnome/help/gnumeric/C/r4443.html
+share/gnome/help/gnumeric/C/r4463.html
+share/gnome/help/gnumeric/C/r4486.html
+share/gnome/help/gnumeric/C/r4514.html
+share/gnome/help/gnumeric/C/r4538.html
+share/gnome/help/gnumeric/C/r4558.html
+share/gnome/help/gnumeric/C/r4581.html
+share/gnome/help/gnumeric/C/r4607.html
+share/gnome/help/gnumeric/C/r4632.html
+share/gnome/help/gnumeric/C/r4661.html
+share/gnome/help/gnumeric/C/r4684.html
+share/gnome/help/gnumeric/C/r4711.html
+share/gnome/help/gnumeric/C/r4738.html
+share/gnome/help/gnumeric/C/r4760.html
+share/gnome/help/gnumeric/C/r4782.html
+share/gnome/help/gnumeric/C/r4806.html
+share/gnome/help/gnumeric/C/r4831.html
+share/gnome/help/gnumeric/C/r4854.html
+share/gnome/help/gnumeric/C/r4877.html
+share/gnome/help/gnumeric/C/r4899.html
+share/gnome/help/gnumeric/C/r4924.html
+share/gnome/help/gnumeric/C/r4948.html
+share/gnome/help/gnumeric/C/r4972.html
+share/gnome/help/gnumeric/C/r5013.html
+share/gnome/help/gnumeric/C/r5035.html
+share/gnome/help/gnumeric/C/r5056.html
+share/gnome/help/gnumeric/C/r5077.html
+share/gnome/help/gnumeric/C/r5101.html
+share/gnome/help/gnumeric/C/r5127.html
+share/gnome/help/gnumeric/C/r5147.html
+share/gnome/help/gnumeric/C/r5171.html
+share/gnome/help/gnumeric/C/r5193.html
+share/gnome/help/gnumeric/C/r5215.html
+share/gnome/help/gnumeric/C/r5238.html
+share/gnome/help/gnumeric/C/r5264.html
+share/gnome/help/gnumeric/C/r5291.html
+share/gnome/help/gnumeric/C/r5312.html
+share/gnome/help/gnumeric/C/r5334.html
+share/gnome/help/gnumeric/C/r5357.html
+share/gnome/help/gnumeric/C/r5381.html
+share/gnome/help/gnumeric/C/r5422.html
+share/gnome/help/gnumeric/C/r5442.html
+share/gnome/help/gnumeric/C/r5470.html
+share/gnome/help/gnumeric/C/r5494.html
+share/gnome/help/gnumeric/C/r5518.html
+share/gnome/help/gnumeric/C/r5545.html
+share/gnome/help/gnumeric/C/r5570.html
+share/gnome/help/gnumeric/C/r5590.html
+share/gnome/help/gnumeric/C/r5610.html
+share/gnome/help/gnumeric/C/r5634.html
+share/gnome/help/gnumeric/C/r5659.html
+share/gnome/help/gnumeric/C/r5683.html
+share/gnome/help/gnumeric/C/r5708.html
+share/gnome/help/gnumeric/C/r5732.html
+share/gnome/help/gnumeric/C/r5760.html
+share/gnome/help/gnumeric/C/r5783.html
+share/gnome/help/gnumeric/C/r5810.html
+share/gnome/help/gnumeric/C/r5834.html
+share/gnome/help/gnumeric/C/r5854.html
+share/gnome/help/gnumeric/C/r5877.html
+share/gnome/help/gnumeric/C/r5901.html
+share/gnome/help/gnumeric/C/r5941.html
+share/gnome/help/gnumeric/C/r5964.html
+share/gnome/help/gnumeric/C/r5987.html
+share/gnome/help/gnumeric/C/r6012.html
+share/gnome/help/gnumeric/C/r6037.html
+share/gnome/help/gnumeric/C/r6060.html
+share/gnome/help/gnumeric/C/r6083.html
+share/gnome/help/gnumeric/C/r6106.html
+share/gnome/help/gnumeric/C/r6134.html
+share/gnome/help/gnumeric/C/r6154.html
+share/gnome/help/gnumeric/C/r6177.html
+share/gnome/help/gnumeric/C/r6199.html
+share/gnome/help/gnumeric/C/r6239.html
+share/gnome/help/gnumeric/C/r6264.html
+share/gnome/help/gnumeric/C/r6286.html
+share/gnome/help/gnumeric/C/r6307.html
+share/gnome/help/gnumeric/C/r6332.html
+share/gnome/help/gnumeric/C/r6354.html
+share/gnome/help/gnumeric/C/r6383.html
+share/gnome/help/gnumeric/C/r6407.html
+share/gnome/help/gnumeric/C/r6432.html
+share/gnome/help/gnumeric/C/r6456.html
+share/gnome/help/gnumeric/C/r6483.html
+share/gnome/help/gnumeric/C/r6505.html
+share/gnome/help/gnumeric/C/r6528.html
+share/gnome/help/gnumeric/C/r6554.html
+share/gnome/help/gnumeric/C/r6578.html
+share/gnome/help/gnumeric/C/r6598.html
+share/gnome/help/gnumeric/C/r6625.html
+share/gnome/help/gnumeric/C/r6650.html
+share/gnome/help/gnumeric/C/r6674.html
+share/gnome/help/gnumeric/C/r6697.html
+share/gnome/help/gnumeric/C/r6722.html
+share/gnome/help/gnumeric/C/r6744.html
+share/gnome/help/gnumeric/C/r6767.html
+share/gnome/help/gnumeric/C/r6789.html
+share/gnome/help/gnumeric/C/r6831.html
+share/gnome/help/gnumeric/C/r6854.html
+share/gnome/help/gnumeric/C/r6877.html
+share/gnome/help/gnumeric/C/r6898.html
+share/gnome/help/gnumeric/C/r6930.html
+share/gnome/help/gnumeric/C/r6955.html
+share/gnome/help/gnumeric/C/r6980.html
+share/gnome/help/gnumeric/C/r7000.html
+share/gnome/help/gnumeric/C/r7023.html
+share/gnome/help/gnumeric/C/r7048.html
+share/gnome/help/gnumeric/C/r7072.html
+share/gnome/help/gnumeric/C/r7093.html
+share/gnome/help/gnumeric/C/r7116.html
+share/gnome/help/gnumeric/C/r7141.html
+share/gnome/help/gnumeric/C/r7164.html
+share/gnome/help/gnumeric/C/r7193.html
+share/gnome/help/gnumeric/C/r7217.html
+share/gnome/help/gnumeric/C/r7239.html
+share/gnome/help/gnumeric/C/r7266.html
+share/gnome/help/gnumeric/C/r7288.html
+share/gnome/help/gnumeric/C/r7315.html
+share/gnome/help/gnumeric/C/r7335.html
+share/gnome/help/gnumeric/C/r7361.html
+share/gnome/help/gnumeric/C/r7386.html
+share/gnome/help/gnumeric/C/r7411.html
+share/gnome/help/gnumeric/C/r7435.html
+share/gnome/help/gnumeric/C/r7462.html
+share/gnome/help/gnumeric/C/r7502.html
+share/gnome/help/gnumeric/C/r7528.html
+share/gnome/help/gnumeric/C/r7551.html
+share/gnome/help/gnumeric/C/r7573.html
+share/gnome/help/gnumeric/C/r7596.html
+share/gnome/help/gnumeric/C/r7618.html
+share/gnome/help/gnumeric/C/r7638.html
+share/gnome/help/gnumeric/C/r7663.html
+share/gnome/help/gnumeric/C/r7685.html
+share/gnome/help/gnumeric/C/r7711.html
+share/gnome/help/gnumeric/C/r7734.html
+share/gnome/help/gnumeric/C/r7759.html
+share/gnome/help/gnumeric/C/r7787.html
+share/gnome/help/gnumeric/C/r7817.html
+share/gnome/help/gnumeric/C/r7841.html
+share/gnome/help/gnumeric/C/r7867.html
+share/gnome/help/gnumeric/C/r7887.html
+share/gnome/help/gnumeric/C/r7923.html
+share/gnome/help/gnumeric/C/r7940.html
+share/gnome/help/gnumeric/C/r7962.html
+share/gnome/help/gnumeric/C/r7987.html
+share/gnome/help/gnumeric/C/r8012.html
+share/gnome/help/gnumeric/C/r8036.html
+share/gnome/help/gnumeric/C/r8059.html
+share/gnome/help/gnumeric/C/r8082.html
+share/gnome/help/gnumeric/C/r8105.html
+share/gnome/help/gnumeric/C/r8138.html
+share/gnome/help/gnumeric/C/r8160.html
+share/gnome/help/gnumeric/C/r8187.html
+share/gnome/help/gnumeric/C/r8207.html
+share/gnome/help/gnumeric/C/r8247.html
+share/gnome/help/gnumeric/C/r8270.html
+share/gnome/help/gnumeric/C/r8293.html
+share/gnome/help/gnumeric/C/r8316.html
+share/gnome/help/gnumeric/C/r8340.html
+share/gnome/help/gnumeric/C/r8364.html
+share/gnome/help/gnumeric/C/r8390.html
+share/gnome/help/gnumeric/C/r8412.html
+share/gnome/help/gnumeric/C/r8436.html
+share/gnome/help/gnumeric/C/r8464.html
+share/gnome/help/gnumeric/C/r8487.html
+share/gnome/help/gnumeric/C/r8507.html
+share/gnome/help/gnumeric/C/r8529.html
+share/gnome/help/gnumeric/C/r8556.html
+share/gnome/help/gnumeric/C/r8579.html
+share/gnome/help/gnumeric/C/r8601.html
+share/gnome/help/gnumeric/C/r8625.html
+share/gnome/help/gnumeric/C/r8658.html
+share/gnome/help/gnumeric/C/r8686.html
+share/gnome/help/gnumeric/C/r8710.html
+share/gnome/help/gnumeric/C/r8732.html
+share/gnome/help/gnumeric/C/r8760.html
+share/gnome/help/gnumeric/C/r8786.html
+share/gnome/help/gnumeric/C/r8809.html
+share/gnome/help/gnumeric/C/r8832.html
+share/gnome/help/gnumeric/C/r8860.html
+share/gnome/help/gnumeric/C/r8884.html
+share/gnome/help/gnumeric/C/r8909.html
+share/gnome/help/gnumeric/C/r8937.html
+share/gnome/help/gnumeric/C/r8964.html
+share/gnome/help/gnumeric/C/r8982.html
+share/gnome/help/gnumeric/C/r9006.html
+share/gnome/help/gnumeric/C/r9034.html
+share/gnome/help/gnumeric/C/r9062.html
+share/gnome/help/gnumeric/C/r9085.html
+share/gnome/help/gnumeric/C/r9107.html
+share/gnome/help/gnumeric/C/r9130.html
+share/gnome/help/gnumeric/C/r9150.html
+share/gnome/help/gnumeric/C/r9178.html
+share/gnome/help/gnumeric/C/r9199.html
+share/gnome/help/gnumeric/C/r9222.html
+share/gnome/help/gnumeric/C/r9246.html
+share/gnome/help/gnumeric/C/r9270.html
+share/gnome/help/gnumeric/C/r9298.html
+share/gnome/help/gnumeric/C/r9321.html
+share/gnome/help/gnumeric/C/r9350.html
+share/gnome/help/gnumeric/C/r9372.html
+share/gnome/help/gnumeric/C/r9396.html
+share/gnome/help/gnumeric/C/r9417.html
+share/gnome/help/gnumeric/C/r9441.html
+share/gnome/help/gnumeric/C/r9464.html
+share/gnome/help/gnumeric/C/r9489.html
+share/gnome/help/gnumeric/C/r9512.html
+share/gnome/help/gnumeric/C/r9532.html
+share/gnome/help/gnumeric/C/r9553.html
+share/gnome/help/gnumeric/C/r9578.html
+share/gnome/help/gnumeric/C/r9607.html
+share/gnome/help/gnumeric/C/r9632.html
+share/gnome/help/gnumeric/C/r9652.html
+share/gnome/help/gnumeric/C/r9672.html
+share/gnome/help/gnumeric/C/r9694.html
+share/gnome/help/gnumeric/C/r9716.html
+share/gnome/help/gnumeric/C/r9740.html
+share/gnome/help/gnumeric/C/r9766.html
+share/gnome/help/gnumeric/C/r9787.html
+share/gnome/help/gnumeric/C/r9828.html
+share/gnome/help/gnumeric/C/r9856.html
+share/gnome/help/gnumeric/C/r9876.html
+share/gnome/help/gnumeric/C/r9916.html
+share/gnome/help/gnumeric/C/r9937.html
+share/gnome/help/gnumeric/C/r9960.html
share/gnome/help/gnumeric/C/rest.html
share/gnome/help/gnumeric/C/selecting-cells-entering-formulas.html
share/gnome/help/gnumeric/C/solver.html
@@ -642,7 +642,7 @@ share/gnome/pixmaps/gnumeric/right-down.png
share/gnome/pixmaps/gnumeric/right_border
share/gnome/pixmaps/gnumeric/stf-druid.png
share/gnome/pixmaps/gnumeric/top_border
-share/gnome/ui/gnumeric.xml
+share/gnome/ui/GNOME_Gnumeric.xml
share/locale/ca/LC_MESSAGES/gnumeric.mo
share/locale/cs/LC_MESSAGES/gnumeric.mo
share/locale/da/LC_MESSAGES/gnumeric.mo
@@ -667,8 +667,6 @@ share/locale/gl/LC_MESSAGES/gnumeric.mo
share/locale/hr/LC_MESSAGES/gnumeric.mo
share/locale/hu/LC_MESSAGES/gnumeric.mo
share/locale/it/LC_MESSAGES/gnumeric.mo
-share/locale/ja/LC_MESSAGES/gnumeric.mo
-share/locale/ko/LC_MESSAGES/gnumeric.mo
share/locale/nl/LC_MESSAGES/gnumeric.mo
share/locale/no/LC_MESSAGES/gnumeric.mo
share/locale/pl/LC_MESSAGES/gnumeric.mo
@@ -679,8 +677,6 @@ share/locale/sk/LC_MESSAGES/gnumeric.mo
share/locale/sv/LC_MESSAGES/gnumeric.mo
share/locale/tr/LC_MESSAGES/gnumeric.mo
share/locale/uk/LC_MESSAGES/gnumeric.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnumeric.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
@dirrm share/gnome/help/gnumeric/C/images
@dirrm share/gnome/help/gnumeric/C
@dirrm share/gnome/help/gnumeric
@@ -698,7 +694,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
@dirrm share/gnome/gnumeric
@unexec rmdir %D/share/gnome/oaf 2>/dev/null || true
@dirrm share/gnome/pixmaps/gnumeric
-@dirrm lib/gnumeric/%%VERSION%%/plugins/xml2
+@dirrm lib/gnumeric/%%VERSION%%/plugins/xml_sax
@dirrm lib/gnumeric/%%VERSION%%/plugins/xbase
@dirrm lib/gnumeric/%%VERSION%%/plugins/sylk
@dirrm lib/gnumeric/%%VERSION%%/plugins/sc
@@ -707,8 +703,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
@dirrm lib/gnumeric/%%VERSION%%/plugins/numtheory
@dirrm lib/gnumeric/%%VERSION%%/plugins/lotus
@dirrm lib/gnumeric/%%VERSION%%/plugins/html
-@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif
@dirrm lib/gnumeric/%%VERSION%%/plugins/gb
+@dirrm lib/gnumeric/%%VERSION%%/plugins/excel
@dirrm lib/gnumeric/%%VERSION%%/plugins/dif
@dirrm lib/gnumeric/%%VERSION%%/plugins/applix
@dirrm lib/gnumeric/%%VERSION%%/plugins