[bijiben] install note mimetype



commit aa897d83626fa599a58ca5bc9ba0de897cb18856
Author: Manish Sinha <manishsinha ubuntu com>
Date:   Mon Jul 29 22:39:10 2013 +0200

    install note mimetype
    
    See 704521

 .gitignore          |    1 +
 Makefile.am         |    2 +-
 NEWS                |    1 +
 configure.ac        |   12 ++++++++++++
 data/Makefile.am    |   25 ++++++++++++++++++++++---
 data/bijiben.xml.in |    7 +++++++
 po/POTFILES.in      |    1 +
 7 files changed, 45 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bfb7385..5a475f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ stamp-*
 aclocal.m4
 Makefile
 Makefile.in
+data/bijiben.xml
 data/bijiben.desktop
 data/bijiben.desktop.in
 data/org.gnome.bijiben.gschema.valid
diff --git a/Makefile.am b/Makefile.am
index 58879ac..f2876ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ bijibendoc = \
        INSTALL\
        NEWS
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb
 
 # Ignore gtk theme cache files on distcheck
 distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache'
diff --git a/NEWS b/NEWS
index 18d8877..f7aa0f0 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Overview of changes in 3.9.5
 ============================
 
 * 703703: Add zeitgeist CREATE, LEAVE, MODIFY and DELETE event (Manish Sinha)
+  704521: Install x-note mimetype (Manish Sinha)
 
 * Bug Fixes
   703706: Crash when immediately closing a new note
diff --git a/configure.ac b/configure.ac
index 023071e..cc09596 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,18 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
+#
+# Check if we should update the mime database
+#
+
+AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
+
+AC_ARG_ENABLE(update-mimedb,
+   AC_HELP_STRING([--disable-update-mimedb],
+                   [disable the update-mime-database after install [default=no]]),,
+    enable_update_mimedb=yes)
+AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, (test x$enable_update_mimedb = xyes) && (test x$UPDATE_MIME_DATABASE != 
xno))
+
 
 
 AM_PROG_LIBTOOL
diff --git a/data/Makefile.am b/data/Makefile.am
index 2dbd37a..58196ba 100755
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,11 @@
 
 SUBDIRS = icons
 
+xml_in_files = bijiben.xml.in
+xml_files = $(xml_in_files:.xml.in=.xml)
+
+ INTLTOOL_XML_RULE@
+
 @INTLTOOL_DESKTOP_RULE@
 
 desktop_in_files = bijiben.desktop.in
@@ -14,6 +19,9 @@ service_DATA = $(service_in_files:.service.in=.service)
 service_in_files =                             \
        org.gnome.Bijiben.SearchProvider.service.in
 
+mimedir = $(datadir)/mime/packages
+mime_DATA = $(xml_files)
+
 org.gnome.Bijiben.SearchProvider.service: org.gnome.Bijiben.SearchProvider.service.in Makefile
        $(AM_V_GEN) sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
@@ -35,10 +43,21 @@ EXTRA_DIST =                            \
        org.gnome.bijiben.gschema.xml.in \
        shell-search-provider-dbus-interfaces.xml \
        $(service_in_files)             \
-       $(searchprovider_DATA)
+       $(searchprovider_DATA) \
+       $(xml_in_files)
 
 DISTCLEANFILES =                        \
        $(desktop_files)                \
        $(gsettings_SCHEMAS)            \
-       $(service_DATA)
-       
+       $(service_DATA)   \
+       $(xml_files)
+
+install-data-hook:
+if ENABLE_UPDATE_MIMEDB
+       $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+endif
+
+uninstall-hook:
+if ENABLE_UPDATE_MIMEDB
+       $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+endif
diff --git a/data/bijiben.xml.in b/data/bijiben.xml.in
new file mode 100644
index 0000000..56636a9
--- /dev/null
+++ b/data/bijiben.xml.in
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info";>
+    <mime-type type="application/x-note">
+        <_comment>Notes</_comment>
+        <glob pattern="*.note"/>
+    </mime-type>
+</mime-info>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7609626..4fcff8c 100755
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 # List of source files containing translatable strings.
 data/bijiben.desktop.in.in
+data/bijiben.xml.in
 src/bjb-app-menu.c
 src/bjb-color-button.c
 src/bjb-editor-toolbar.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]