X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=9ab4bbfde51fe2d419536e3a180c54fb5dd12fdb;hb=d47bc2205d248b34dbfcdd349473f54d45d5ec70;hp=62487c77f5d353e5d087776849f59c01f646e9cd;hpb=e8b86e2b66a451c6fd232f59ca6660e838afd6c0;p=evince.git

diff --git a/configure.ac b/configure.ac
index 62487c77..9ab4bbfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([Evince],[0.6.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
+AC_INIT([Evince],[0.6.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
 
 AM_CONFIG_HEADER(config.h)
@@ -40,7 +40,7 @@ dnl Check dependencies
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 
-POPPLER_REQUIRED=0.5.3
+POPPLER_REQUIRED=0.5.4
 DBUS_GLIB_REQUIRED=0.33
 GTK_REQUIRED=2.8.15
 KEYRING_REQUIRED=0.4.0
@@ -359,43 +359,43 @@ if test "x$enable_comics" = "xyes"; then
 	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-cbr;application/x-cbz"
 fi
 if test "x$enable_pixbuf" = "xyes"; then
-       EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/*"
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/*"
 fi
 if test "x$enable_impress" = "xyes"; then
-       EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/vnd.sun.xml.impress"
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/vnd.sun.xml.impress;application/vnd.oasis.opendocument.presentation"
 fi
 AC_SUBST(EVINCE_MIME_TYPES)
 
 AC_CONFIG_FILES([
-Makefile
+backend/Makefile
+comics/Makefile
 cut-n-paste/Makefile
 cut-n-paste/recent-files/Makefile
-cut-n-paste/zoom-control/Makefile
 cut-n-paste/toolbar-editor/Makefile
-data/Makefile
+cut-n-paste/zoom-control/Makefile
 data/evince.desktop.in
-data/icons/Makefile
 data/icons/16x16/Makefile
 data/icons/22x22/Makefile
 data/icons/48x48/Makefile
+data/icons/Makefile
 data/icons/scalable/Makefile
-
-lib/Makefile
-pdf/Makefile
-pixbuf/Makefile
-tiff/Makefile
-ps/Makefile
+data/Makefile
 djvu/Makefile
 dvi/Makefile
 dvi/mdvi-lib/Makefile
+help/Makefile
 impress/Makefile
-comics/Makefile
+lib/Makefile
+Makefile
+pdf/Makefile
+pixbuf/Makefile
 po/Makefile.in
-backend/Makefile
 properties/Makefile
+ps/Makefile
 shell/Makefile
+test/Makefile
 thumbnailer/Makefile
-help/Makefile
+tiff/Makefile
 ])
 
 AC_OUTPUT