[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 9894c79c533767c4aa6f998bce77e3fb34b21bc0
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Feb 22 15:22:22 2007 +1100

    Added mime-types
    
    darcs-hash:20070222042222-d4795-db1e39b56049af74311cb57fda6203d2562e3d0f.gz

diff --git a/Makefile.am b/Makefile.am
index cb2a313..952e1ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = modules src tools test doc
+SUBDIRS = modules src tools test doc desktop
 
 EXTRA_DIST = ChangeLog
 
@@ -8,6 +8,7 @@ ChangeLog:
 	darcs changes > ChangeLog
 
 debian-snapshot:
+	darcs changes > ChangeLog
 	sh debian/control.sh
 	dpkg-buildpackage -rfakeroot -b -d
 	rm -f debian/repo/*
diff --git a/configure.in b/configure.in
index a93f5e0..4a8ee02 100644
--- a/configure.in
+++ b/configure.in
@@ -399,4 +399,5 @@ doc/Makefile
 doc/tutorial/Makefile
 doc/examples/Makefile
 doc/examples/gfs2doc
+desktop/Makefile
 ])
diff --git a/debian/gerris-snapshot.install b/debian/gerris-snapshot.install
index 6bdb20c..04dcb5f 100644
--- a/debian/gerris-snapshot.install
+++ b/debian/gerris-snapshot.install
@@ -11,3 +11,4 @@ usr/lib/gerris/*.la
 usr/lib/gerris/*.mdf
 usr/lib/gerris/*.py
 usr/lib/pkgconfig/*.pc
+usr/share/mime/packages/*.xml
diff --git a/debian/postinst b/debian/postinst
new file mode 100755
index 0000000..7ca7f50
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -x /usr/bin/update-mime-database ] ; then
+    if /usr/bin/update-mime-database /usr/share/mime; then :
+    else
+	exit 1
+    fi
+fi
+
+exit 0
diff --git a/debian/postrm b/debian/postrm
new file mode 100755
index 0000000..7ca7f50
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -x /usr/bin/update-mime-database ] ; then
+    if /usr/bin/update-mime-database /usr/share/mime; then :
+    else
+	exit 1
+    fi
+fi
+
+exit 0
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
new file mode 100644
index 0000000..0150a3d
--- /dev/null
+++ b/desktop/Makefile.am
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+
+mimedir = $(datadir)/mime/packages
+mime_DATA = gerris.xml
diff --git a/desktop/gerris.xml b/desktop/gerris.xml
new file mode 100644
index 0000000..6fa0bf9
--- /dev/null
+++ b/desktop/gerris.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/gerris">
+    <sub-class-of type="text/plain"/>
+    <comment xml:lang="en">Gerris simulation</comment>
+    <glob pattern="*.gfs"/>
+  </mime-type>
+  <mime-type type="application/gerris-compressed">
+    <sub-class-of type="application/x-gzip"/>
+    <comment xml:lang="en">Gerris simulation</comment>
+    <glob pattern="*.gfs.gz"/>
+  </mime-type>
+  <mime-type type="application/gerris-2D">
+    <sub-class-of type="application/gerris"/>
+    <comment xml:lang="en">Gerris 2D simulation</comment>
+    <magic priority="80">
+      <match type="string" value="# Gerris Flow Solver 2D " offset="0"/>
+    </magic>
+  </mime-type>
+  <mime-type type="application/gerris-3D">
+    <sub-class-of type="application/gerris"/>
+    <comment xml:lang="en">Gerris 3D simulation</comment>
+    <magic priority="80">
+      <match type="string" value="# Gerris Flow Solver 3D " offset="0"/>
+    </magic>
+  </mime-type>
+</mime-info>

-- 
Gerris Flow Solver