Register oasis.ooo-build-1-3

* Version 1.3.17

* desktop/Makefile.am, desktop/openoffice.keys, desktop/openoffice.mime,
desktop/openoffice.xml, bin/package-ooo: register oasis.opendocument
MIME types in GNOME (only for Novell and SUSE)

* desktop/drawing.desktop.in, desktop/presentation.desktop.in,
desktop/spreadsheet.desktop.in, desktop/textdoc.desktop.in: add
oasis.opendocument MIME types; OOo-1.1.5 is able to import such
files

10 files changed, 59 insertions, 17 deletions

diff --git a/NEWS b/NEWS
index 0624c20ae..23822aa49 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+ooo-build-1.3.17
+
+    + bug fixes
+	+ missing oasis.opendocument MIME types (Petr)
+    + build bits
+	+ download of OOo-1.1.5 sources (Petr)
+	+ build with libxslt >= 1.1.15 (Andreas)
+	+ updated Gentoo bits (Andreas)
+
 ooo-build-1.3.16
 
     + bug fixes
diff --git a/bin/package-ooo b/bin/package-ooo
index dd83ba78a..f41858f23 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -145,6 +145,18 @@ elif test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zSUSE" ; then
 
 	mkdir -p $OODESTDIR/opt/gnome/share/pixmaps
 	cp $TOOLSDIR/desktop/ximian-openoffice-*.png $OODESTDIR/opt/gnome/share/pixmaps
+
+	# GNOME mime-info for the new formats
+	mkdir -p $OODESTDIR/opt/gnome/share/mime-info
+	cp $TOOLSDIR/desktop/openoffice.mime $OODESTDIR/opt/gnome/share/mime-info
+	cp $TOOLSDIR/desktop/openoffice.keys $OODESTDIR/opt/gnome/share/mime-info
+	# and shared mime info
+	mkdir -p $OODESTDIR/usr/share/mime/packages
+	cp $TOOLSDIR/desktop/openoffice.xml $OODESTDIR/usr/share/mime/packages
+	if test -z "$OODESTDIR" && 
+	   which update-mime-database >/dev/null 2>&1 ; then
+	    update-mime-database /usr/share/mime || :
+	fi
 else
 	mkdir -p $PREFIX/share/gnome/ximian/applications
 	cp $TOOLSDIR/desktop/*$BINSUFFIX.desktop $PREFIX/share/gnome/ximian/applications
diff --git a/configure.in b/configure.in
index 5dcb9d02f..d09aa93a3 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_PREFIX_DEFAULT(/usr)
 
 OOO_BUILDMAJOR_VERSION=1
 OOO_BUILDMINOR_VERSION=3
-OOO_BUILDMICRO_VERSION=16
+OOO_BUILDMICRO_VERSION=17
 dnl this includes pre-pended period.
 OOO_BUILDSTRIKE_VERSION=
 OOO_BUILDVERSION="$OOO_BUILDMAJOR_VERSION.$OOO_BUILDMINOR_VERSION.$OOO_BUILDMICRO_VERSION$OOO_BUILDSTRIKE_VERSION"
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index eac692c4e..25791a13f 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -5,5 +5,4 @@ all: $(desktop_in_files:.desktop.in=.desktop)
 %.desktop: %.desktop.in $(top_builddir)/intltool-merge $(wildcard $(top_srcdir)/po/*.po)
 	$(top_builddir)/intltool-merge $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-EXTRA_DIST=$(desktop_in_files) ${wildcard *.png}
-
+EXTRA_DIST=$(desktop_in_files) ${wildcard *.png} ${wildcard openoffice.*}
diff --git a/desktop/drawing.desktop.in b/desktop/drawing.desktop.in
index 3056a01fe..f248db4eb 100644
--- a/desktop/drawing.desktop.in
+++ b/desktop/drawing.desktop.in
@@ -9,6 +9,6 @@ Terminal=false
 Type=Application
 Categories=GNOME;Application;Office;X-Ximian-Main;
 StartupNotify=true
-MimeType=application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw
+MimeType=application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template
 X-GNOME-Bugzilla-Bugzilla=Ximian
 X-GNOME-Bugzilla-Product=OpenOffice.org Ximian Edition
diff --git a/desktop/openoffice.keys b/desktop/openoffice.keys
index 0a7b8bc8b..f44ae9603 100644
--- a/desktop/openoffice.keys
+++ b/desktop/openoffice.keys
@@ -1,13 +1,3 @@
-application/vnd.oasis.opendocument.database
-	description=OpenDocument Database
-	default_action_type=application
-	short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
-	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
-	short_list_application_ids_for_advanced_user_level=openoffice,staroffice,starsuite
-	category=Documents
-	use_category_default=no
-	icon_filename=oasis-database
-
 application/vnd.oasis.opendocument.graphics
 	description=OpenDocument Drawing
 	default_action_type=application
diff --git a/desktop/openoffice.mime b/desktop/openoffice.mime
new file mode 100644
index 000000000..5ff5de9e6
--- /dev/null
+++ b/desktop/openoffice.mime
@@ -0,0 +1,32 @@
+application/vnd.oasis.opendocument.graphics
+	ext: odg
+
+application/vnd.oasis.opendocument.graphics-template
+	ext: otg
+
+application/vnd.oasis.opendocument.formula
+	ext: odf
+
+application/vnd.oasis.opendocument.text-master
+	ext: odm
+
+application/vnd.oasis.opendocument.presentation
+	ext: odp
+
+application/vnd.oasis.opendocument.presentation-template
+	ext: otp
+
+application/vnd.oasis.opendocument.spreadsheet
+	ext: ods
+
+application/vnd.oasis.opendocument.spreadsheet-template
+	ext: ots
+
+application/vnd.oasis.opendocument.text
+	ext: odt
+
+application/vnd.oasis.opendocument.text-template
+	ext: ott
+
+application/vnd.oasis.opendocument.text-web
+	ext: oth
diff --git a/desktop/presentation.desktop.in b/desktop/presentation.desktop.in
index 4ea2c595f..1b685e45e 100644
--- a/desktop/presentation.desktop.in
+++ b/desktop/presentation.desktop.in
@@ -9,6 +9,6 @@ Terminal=false
 Type=Application
 Categories=GNOME;Application;Office;X-Ximian-Main;
 StartupNotify=true
-MimeType=application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint;application/vnd.stardivision.impress;
+MimeType=application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint;application/vnd.stardivision.impress;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template
 X-GNOME-Bugzilla-Bugzilla=Ximian
 X-GNOME-Bugzilla-Product=OpenOffice.org Ximian Edition
diff --git a/desktop/spreadsheet.desktop.in b/desktop/spreadsheet.desktop.in
index 3821d28a3..09a552c02 100644
--- a/desktop/spreadsheet.desktop.in
+++ b/desktop/spreadsheet.desktop.in
@@ -9,7 +9,7 @@ Terminal=false
 Type=Application
 Categories=GNOME;Application;Office;Finance;X-Ximian-Main;
 StartupNotify=true
-MimeType=application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.math;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.stardivision.math;application/vnd.lotus-1-2-3;text/x-comma-separated-values;
+MimeType=application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.math;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.stardivision.math;application/vnd.lotus-1-2-3;text/x-comma-separated-values;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template
 X-GNOME-Bugzilla-Bugzilla=Ximian
 X-GNOME-Bugzilla-Product=OpenOffice.org Ximian Edition
 
diff --git a/desktop/textdoc.desktop.in b/desktop/textdoc.desktop.in
index 59e755b7d..42bf33426 100644
--- a/desktop/textdoc.desktop.in
+++ b/desktop/textdoc.desktop.in
@@ -9,7 +9,7 @@ Terminal=false
 Type=Application
 Categories=GNOME;Application;Office;X-Ximian-Main;
 StartupNotify=true
-MimeType=application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.ms-word;application/x-mswrite;application/vnd.stardivision.writer;application/vnd.wordperfect;application/wordperfect;application/rtf;text/plain;
+MimeType=application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.ms-word;application/x-mswrite;application/vnd.stardivision.writer;application/vnd.wordperfect;application/wordperfect;application/rtf;text/plain;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master
 X-GNOME-Bugzilla-Bugzilla=Ximian
 X-GNOME-Bugzilla-Product=OpenOffice.org Ximian Edition
 X-GNOME-Bugzilla-OtherBinaries=soffice.bin;getstyle-gnome