[evince] Unify the MIME type lists

From: Carlos Garcia Campos <carlosgc src gnome org>
To: commits-list gnome org
Cc:
Subject: [evince] Unify the MIME type lists
Date: Sun, 22 Jun 2014 11:06:10 +0000 (UTC)
commit 362b51ca729e66805c3cf3aa590333f289fb3df2
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Sun Jun 22 12:56:58 2014 +0200

    Unify the MIME type lists
    
    Define all MIME type lists in configure.ac and use those for the backend
    and desktop files.

 backend/comics/Makefile.am                         |    4 +-
 backend/comics/comicsdocument.evince-backend.in    |    4 --
 backend/comics/comicsdocument.evince-backend.in.in |    4 ++
 backend/djvu/Makefile.am                           |    4 +-
 backend/djvu/djvudocument.evince-backend.in        |    4 --
 backend/djvu/djvudocument.evince-backend.in.in     |    4 ++
 backend/dvi/Makefile.am                            |    4 +-
 backend/dvi/dvidocument.evince-backend.in          |    4 --
 backend/dvi/dvidocument.evince-backend.in.in       |    4 ++
 backend/pdf/Makefile.am                            |    4 +-
 backend/pdf/pdfdocument.evince-backend.in          |    6 ----
 backend/pdf/pdfdocument.evince-backend.in.in       |    6 ++++
 backend/ps/Makefile.am                             |    4 +-
 backend/ps/psdocument.evince-backend.in            |    5 ---
 backend/ps/psdocument.evince-backend.in.in         |    5 +++
 backend/tiff/Makefile.am                           |    4 +-
 ...ackend.in => tiffdocument.evince-backend.in.in} |    2 +-
 backend/xps/Makefile.am                            |    4 +-
 ...backend.in => xpsdocument.evince-backend.in.in} |    2 +-
 configure.ac                                       |   30 +++++++++++++++----
 po/POTFILES.in                                     |   14 ++++----
 21 files changed, 69 insertions(+), 53 deletions(-)
---
diff --git a/backend/comics/Makefile.am b/backend/comics/Makefile.am
index 6890211..c8af55f 100644
--- a/backend/comics/Makefile.am
+++ b/backend/comics/Makefile.am
@@ -22,8 +22,8 @@ libcomicsdocument_la_LIBADD =                         \
        $(BACKEND_LIBS)                                 \
        $(LIB_LIBS)
 
-backend_in_files = comicsdocument.evince-backend.in
-backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
+backend_in_files = comicsdocument.evince-backend.in.in
+backend_DATA = $(backend_in_files:.evince-backend.in.in=.evince-backend)
 
 EXTRA_DIST = $(backend_in_files)
 
diff --git a/backend/comics/comicsdocument.evince-backend.in.in 
b/backend/comics/comicsdocument.evince-backend.in.in
new file mode 100644
index 0000000..ad52df8
--- /dev/null
+++ b/backend/comics/comicsdocument.evince-backend.in.in
@@ -0,0 +1,4 @@
+[Evince Backend]
+Module=comicsdocument
+_TypeDescription=Comic Books
+MimeType= COMICS_MIME_TYPES@
diff --git a/backend/djvu/Makefile.am b/backend/djvu/Makefile.am
index d0179f9..4b46052 100644
--- a/backend/djvu/Makefile.am
+++ b/backend/djvu/Makefile.am
@@ -28,8 +28,8 @@ libdjvudocument_la_LIBADD =                           \
        $(BACKEND_LIBS)                                 \
        $(DJVU_LIBS)
 
-backend_in_files = djvudocument.evince-backend.in
-backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
+backend_in_files = djvudocument.evince-backend.in.in
+backend_DATA = $(backend_in_files:.evince-backend.in.in=.evince-backend)
 
 EXTRA_DIST = $(backend_in_files)
 
diff --git a/backend/djvu/djvudocument.evince-backend.in.in b/backend/djvu/djvudocument.evince-backend.in.in
new file mode 100644
index 0000000..fa1e2f6
--- /dev/null
+++ b/backend/djvu/djvudocument.evince-backend.in.in
@@ -0,0 +1,4 @@
+[Evince Backend]
+Module=djvudocument
+_TypeDescription=DjVu Documents
+MimeType= DJVU_MIME_TYPES@
diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am
index eedf921..dd5093a 100644
--- a/backend/dvi/Makefile.am
+++ b/backend/dvi/Makefile.am
@@ -37,8 +37,8 @@ if WITH_TYPE1_FONTS
 libdvidocument_la_LIBADD += -lt1
 endif
 
-backend_in_files = dvidocument.evince-backend.in
-backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
+backend_in_files = dvidocument.evince-backend.in.in
+backend_DATA = $(backend_in_files:.evince-backend.in.in=.evince-backend)
 
 EXTRA_DIST = $(backend_in_files)
 
diff --git a/backend/dvi/dvidocument.evince-backend.in.in b/backend/dvi/dvidocument.evince-backend.in.in
new file mode 100644
index 0000000..dab8c22
--- /dev/null
+++ b/backend/dvi/dvidocument.evince-backend.in.in
@@ -0,0 +1,4 @@
+[Evince Backend]
+Module=dvidocument
+_TypeDescription=DVI Documents
+MimeType= DVI_MIME_TYPES@
diff --git a/backend/pdf/Makefile.am b/backend/pdf/Makefile.am
index b91939c..cdc81d8 100644
--- a/backend/pdf/Makefile.am
+++ b/backend/pdf/Makefile.am
@@ -24,8 +24,8 @@ libpdfdocument_la_LIBADD =                            \
        $(CAIRO_PDF_LIBS)                               \
        $(CAIRO_PS_LIBS)
 
-backend_in_files = pdfdocument.evince-backend.in
-backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
+backend_in_files = pdfdocument.evince-backend.in.in
+backend_DATA = $(backend_in_files:.evince-backend.in.in=.evince-backend)
 
 EXTRA_DIST = $(backend_in_files)
 
diff --git a/backend/pdf/pdfdocument.evince-backend.in.in b/backend/pdf/pdfdocument.evince-backend.in.in
new file mode 100644
index 0000000..713023b
--- /dev/null
+++ b/backend/pdf/pdfdocument.evince-backend.in.in
@@ -0,0 +1,6 @@
+[Evince Backend]
+Module=pdfdocument
+Resident=true
+_TypeDescription=PDF Documents
+MimeType= PDF_MIME_TYPES@
+
diff --git a/backend/ps/Makefile.am b/backend/ps/Makefile.am
index 31bb8d7..92d1e20 100644
--- a/backend/ps/Makefile.am
+++ b/backend/ps/Makefile.am
@@ -22,8 +22,8 @@ libpsdocument_la_LIBADD =                             \
        $(BACKEND_LIBS)                                 \
        $(SPECTRE_LIBS)
 
-backend_in_files = psdocument.evince-backend.in
-backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
+backend_in_files = psdocument.evince-backend.in.in
+backend_DATA = $(backend_in_files:.evince-backend.in.in=.evince-backend)
 
 EXTRA_DIST = $(backend_in_files)
 
diff --git a/backend/ps/psdocument.evince-backend.in.in b/backend/ps/psdocument.evince-backend.in.in
new file mode 100644
index 0000000..5643b15
--- /dev/null
+++ b/backend/ps/psdocument.evince-backend.in.in
@@ -0,0 +1,5 @@
+[Evince Backend]
+Module=psdocument
+Resident=true
+_TypeDescription=PostScript Documents
+MimeType= PS_MIME_TYPES@
diff --git a/backend/tiff/Makefile.am b/backend/tiff/Makefile.am
index d9bc53f..cf078ce 100644
--- a/backend/tiff/Makefile.am
+++ b/backend/tiff/Makefile.am
@@ -23,8 +23,8 @@ libtiffdocument_la_LIBADD =                           \
        $(BACKEND_LIBS)                 \
        -ltiff
 
-backend_in_files = tiffdocument.evince-backend.in
-backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
+backend_in_files = tiffdocument.evince-backend.in.in
+backend_DATA = $(backend_in_files:.evince-backend.in.in=.evince-backend)
 
 EXTRA_DIST = $(backend_in_files)
 
diff --git a/backend/tiff/tiffdocument.evince-backend.in b/backend/tiff/tiffdocument.evince-backend.in.in
similarity index 71%
rename from backend/tiff/tiffdocument.evince-backend.in
rename to backend/tiff/tiffdocument.evince-backend.in.in
index 3d13c3b..c850200 100644
--- a/backend/tiff/tiffdocument.evince-backend.in
+++ b/backend/tiff/tiffdocument.evince-backend.in.in
@@ -1,4 +1,4 @@
 [Evince Backend]
 Module=tiffdocument
 _TypeDescription=TIFF Documents
-MimeType=image/tiff
+MimeType= TIFF_MIME_TYPES@
diff --git a/backend/xps/Makefile.am b/backend/xps/Makefile.am
index c94fb60..9a9f866 100644
--- a/backend/xps/Makefile.am
+++ b/backend/xps/Makefile.am
@@ -21,8 +21,8 @@ libxpsdocument_la_LIBADD =                            \
        $(BACKEND_LIBS)                                 \
        $(GXPS_LIBS)
 
-backend_in_files = xpsdocument.evince-backend.in
-backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
+backend_in_files = xpsdocument.evince-backend.in.in
+backend_DATA = $(backend_in_files:.evince-backend.in.in=.evince-backend)
 
 EXTRA_DIST = $(backend_in_files)
 
diff --git a/backend/xps/xpsdocument.evince-backend.in b/backend/xps/xpsdocument.evince-backend.in.in
similarity index 58%
rename from backend/xps/xpsdocument.evince-backend.in
rename to backend/xps/xpsdocument.evince-backend.in.in
index 78f19cb..2feeb2b 100644
--- a/backend/xps/xpsdocument.evince-backend.in
+++ b/backend/xps/xpsdocument.evince-backend.in.in
@@ -2,4 +2,4 @@
 Module=xpsdocument
 Resident=true
 _TypeDescription=XPS Documents
-MimeType=application/oxps;application/vnd.ms-xpsdocument
+MimeType= XPS_MIME_TYPES@
diff --git a/configure.ac b/configure.ac
index b7358c0..a120310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,26 +650,35 @@ dnl =================== End of compile warnings=================================
 dnl =================== Mime types list ====================================================
 
 if test "x$enable_pdf" = "xyes" ; then
-       EVINCE_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf;application/x-xzpdf;"
+        
PDF_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf;application/x-xzpdf;application/x-ext-pdf;"
 fi
+AC_SUBST(PDF_MIME_TYPES)
 if test "x$enable_ps" = "xyes" ; then
-       
EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps;"
+        
PS_MIME_TYPES="application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps;application/x-ext-ps;application/x-ext-eps;"
 fi
+AC_SUBST(PS_MIME_TYPES)
 if test "x$enable_dvi" = "xyes"; then
-       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-dvi;application/x-bzdvi;application/x-gzdvi;"
+        DVI_MIME_TYPES="application/x-dvi;application/x-bzdvi;application/x-gzdvi;application/x-ext-dvi;"
 fi
+AC_SUBST(DVI_MIME_TYPES)
 if test "x$enable_djvu" = "xyes"; then
-       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/vnd.djvu;"
+        DJVU_MIME_TYPES="image/vnd.djvu;application/x-ext-djv;application/x-ext-djvu;"
 fi
+AC_SUBST(DJVU_MIME_TYPES)
 if test "x$enable_tiff" = "xyes"; then
-       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/tiff;"
+        TIFF_MIME_TYPES="image/tiff;"
 fi
+AC_SUBST(TIFF_MIME_TYPES)
 if test "x$enable_comics" = "xyes"; then
-       
EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;"
+        
COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/x-ext-cbr;application/x-ext-cbz;application/x-ext-cb7;application/x-ext-cbt;"
 fi
+AC_SUBST(COMICS_MIME_TYPES)
 if test "x$enable_xps" = "xyes"; then
-       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/oxps;application/vnd.ms-xpsdocument;"
+        XPS_MIME_TYPES="application/oxps;application/vnd.ms-xpsdocument;"
 fi
+AC_SUBST(XPS_MIME_TYPES)
+
+EVINCE_MIME_TYPES="${PDF_MIME_TYPES}${PS_MIME_TYPES}${DVI_MIME_TYPES}${DJVU_MIME_TYPES}${TIFF_MIME_TYPES}${COMICS_MIME_TYPES}${XPS_MIME_TYPES}"
 AC_SUBST(EVINCE_MIME_TYPES)
 
 AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your 
system]))
@@ -723,13 +732,20 @@ AC_SUBST([AM_LDFLAGS])
 
 AC_CONFIG_FILES([
 backend/Makefile
+backend/comics/comicsdocument.evince-backend.in
 backend/comics/Makefile
+backend/djvu/djvudocument.evince-backend.in
 backend/djvu/Makefile
+backend/dvi/dvidocument.evince-backend.in
 backend/dvi/Makefile
 backend/dvi/mdvi-lib/Makefile
+backend/pdf/pdfdocument.evince-backend.in
 backend/pdf/Makefile
+backend/ps/psdocument.evince-backend.in
 backend/ps/Makefile
+backend/tiff/tiffdocument.evince-backend.in
 backend/tiff/Makefile
+backend/xps/xpsdocument.evince-backend.in
 backend/xps/Makefile
 cut-n-paste/Makefile
 cut-n-paste/gimpcellrenderertoggle/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d94d468..ca952b3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,18 +2,18 @@
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
 backend/comics/comics-document.c
-[type: gettext/ini]backend/comics/comicsdocument.evince-backend.in
+[type: gettext/ini]backend/comics/comicsdocument.evince-backend.in.in
 backend/djvu/djvu-document.c
-[type: gettext/ini]backend/djvu/djvudocument.evince-backend.in
+[type: gettext/ini]backend/djvu/djvudocument.evince-backend.in.in
 backend/dvi/dvi-document.c
-[type: gettext/ini]backend/dvi/dvidocument.evince-backend.in
+[type: gettext/ini]backend/dvi/dvidocument.evince-backend.in.in
 backend/pdf/ev-poppler.cc
-[type: gettext/ini]backend/pdf/pdfdocument.evince-backend.in
+[type: gettext/ini]backend/pdf/pdfdocument.evince-backend.in.in
 backend/ps/ev-spectre.c
-[type: gettext/ini]backend/ps/psdocument.evince-backend.in
+[type: gettext/ini]backend/ps/psdocument.evince-backend.in.in
 backend/tiff/tiff-document.c
-[type: gettext/ini]backend/tiff/tiffdocument.evince-backend.in
-[type: gettext/ini]backend/xps/xpsdocument.evince-backend.in
+[type: gettext/ini]backend/tiff/tiffdocument.evince-backend.in.in
+[type: gettext/ini]backend/xps/xpsdocument.evince-backend.in.in
 data/evince.desktop.in.in
 data/evince-previewer.desktop.in.in
 data/org.gnome.Evince.gschema.xml.in
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]