Bump api and libtool versions and rename libview and libdocument libr…

…aries

See bug #626030

backend/comics/Makefile.am

@@ -16,7 +16,7 @@ libcomicsdocument_la_SOURCES = \
 
 libcomicsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libcomicsdocument_la_LIBADD =				\
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(BACKEND_LIBS)					\
 	$(LIB_LIBS)
 

backend/djvu/Makefile.am

@@ -22,7 +22,7 @@ libdjvudocument_la_SOURCES = 	\
 
 libdjvudocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libdjvudocument_la_LIBADD =				\
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(BACKEND_LIBS)					\
 	$(DJVU_LIBS)
 

backend/dvi/Makefile.am

@@ -27,7 +27,7 @@ libdvidocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libdvidocument_la_LIBADD = 				\
 	mdvi-lib/libmdvi.la				\
 	-lkpathsea					\
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(BACKEND_LIBS)					\
 	$(SPECTRE_LIBS)
 

backend/pdf/Makefile.am

@@ -16,7 +16,7 @@ libpdfdocument_la_SOURCES =			\
 
 libpdfdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpdfdocument_la_LIBADD =				\
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(BACKEND_LIBS)					\
 	$(POPPLER_LIBS)					\
 	$(CAIRO_PDF_LIBS)				\

backend/pixbuf/Makefile.am

@@ -15,7 +15,7 @@ libpixbufdocument_la_SOURCES =		\
 
 libpixbufdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpixbufdocument_la_LIBADD =				\
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(BACKEND_LIBS)
 
 backend_in_files = pixbufdocument.evince-backend.in

backend/ps/Makefile.am

@@ -16,7 +16,7 @@ libpsdocument_la_SOURCES = 	\
 
 libpsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpsdocument_la_LIBADD = 				\
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(BACKEND_LIBS)					\
 	$(SPECTRE_LIBS)
 

backend/tiff/Makefile.am

@@ -17,7 +17,7 @@ libtiffdocument_la_SOURCES =	\
 
 libtiffdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libtiffdocument_la_LIBADD = 				\
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(BACKEND_LIBS)			\
 	-ltiff
 

configure.ac

@@ -9,7 +9,7 @@ m4_define([ev_extra_version],[])
 m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
 
 # The evince API version
-m4_define([ev_api_version], [2.32])
+m4_define([ev_api_version], [3.0])
 
 # Libtool versioning. The backend and view libraries have separate versions.
 # Before making a release, the libtool version should be modified.
@@ -128,7 +128,7 @@ AC_ARG_WITH([gtk],
      2.0|3.0) ;;
      *) AC_MSG_ERROR([invalid gtk version specified]) ;;
    esac],
-  [with_gtk=2.0])
+  [with_gtk=3.0])
 AC_MSG_RESULT([$with_gtk])
 
 dnl Specify required versions of dependencies

evince-document.pc.in

@@ -8,5 +8,5 @@ Name: Evince Document
 Description: GNOME document viewer backend library
 Version: @VERSION@
 Requires: gio-2.0 >= @GLIB_REQUIRED@ gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
-Libs: -L${libdir} -levdocument
+Libs: -L${libdir} -levdocument3
 Cflags: -I${includedir}

evince-view.pc.in

@@ -7,5 +7,5 @@ Name: Evince View
 Description: GNOME document viewer view library
 Version: @VERSION@
 Requires: evince-document-@EV_API_VERSION@ = @VERSION@ gthread-2.0
-Libs: -L${libdir} -levview
+Libs: -L${libdir} -levview3
 Cflags: -I${includedir}

help/reference/libdocument/Makefile.am

@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = 1.10
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE = libevdocument
+DOC_MODULE = libevdocument3
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 DOC_MODULE_VERSION = $(EV_API_VERSION)
@@ -107,7 +107,7 @@ GTKDOC_CFLAGS = \
 	$(DISABLE_DEPRECATED)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(LIBDOCUMENT_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.

help/reference/libview/Makefile.am

@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = 1.10
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE = libevview
+DOC_MODULE = libevview3
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 DOC_MODULE_VERSION = $(EV_API_VERSION)
@@ -113,8 +113,8 @@ GTKDOC_CFLAGS = \
 	$(DISABLE_DEPRECATED)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/libdocument/libevdocument.la \
-	$(top_builddir)/libview/libevview.la \
+	$(top_builddir)/libdocument/libevdocument3.la \
+	$(top_builddir)/libview/libevview3.la \
 	$(LIBDOCUMENT_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.

help/reference/shell/Makefile.am

@@ -121,8 +121,8 @@ GTKDOC_LIBS = \
 	$(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la	\
 	$(top_builddir)/cut-n-paste/smclient/libsmclient.la		\
 	$(top_builddir)/properties/libevproperties.la			\
-	$(top_builddir)/libdocument/libevdocument.la			\
-	$(top_builddir)/libview/libevview.la				\
+	$(top_builddir)/libdocument/libevdocument3.la			\
+	$(top_builddir)/libview/libevview3.la				\
 	$(top_builddir)/libmisc/libevmisc.la				\
 	$(SHELL_LIBS)							\
 	$(GTK_PRINT_LIBS)						\

libdocument/Makefile.am

@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libevdocument.la
+lib_LTLIBRARIES = libevdocument3.la
 
 NOINST_H_FILES =				\
 	ev-debug.h				\
@@ -49,7 +49,7 @@ INST_H_FILES = 					\
 headerdir = $(includedir)/evince/$(EV_API_VERSION)/libdocument
 header_DATA = $(INST_H_FILES)
 
-libevdocument_la_SOURCES=			\
+libevdocument3_la_SOURCES=			\
 	ev-annotation.c				\
 	ev-async-renderer.c			\
 	ev-attachment.c				\
@@ -90,7 +90,7 @@ libevdocument_la_SOURCES=			\
 	$(NOINST_H_FILES)			\
 	$(INST_H_FILES)
 
-libevdocument_la_CPPFLAGS = \
+libevdocument3_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"EvinceDocument\"		\
 	-DEVINCE_UIDIR=\"$(pkgdatadir)\"		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
@@ -99,20 +99,20 @@ libevdocument_la_CPPFLAGS = \
 	-DEVINCE_COMPILATION				\
 	$(AM_CPPFLAGS)
 
-libevdocument_la_CFLAGS = \
+libevdocument3_la_CFLAGS = \
 	$(LIBDOCUMENT_CFLAGS)			\
 	-I$(top_srcdir)/cut-n-paste/synctex	\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
 	$(AM_CFLAGS)
 
-libevdocument_la_LDFLAGS = \
+libevdocument3_la_LDFLAGS = \
 	-version-info $(EV_DOCUMENT_LT_VERSION_INFO)	\
 	-no-undefined	\
 	-export-symbols-regex "^ev_*"	\
 	$(AM_LDFLAGS)
 
-libevdocument_la_LIBADD = \
+libevdocument3_la_LIBADD = \
 	$(LIBDOCUMENT_LIBS)	\
 	$(top_builddir)/cut-n-paste/synctex/libsynctex.la
 
@@ -150,7 +150,7 @@ EXTRA_DIST = \
 
 if ENABLE_INTROSPECTION
 
-EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES) $(filter %.c,$(libevdocument_la_SOURCES))
+EvinceDocument-$(EV_API_VERSION).gir: libevdocument3.la Makefile $(INST_H_FILES) $(filter %.c,$(libevdocument3_la_SOURCES))
 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
 	$(G_IR_SCANNER) -v --namespace EvinceDocument \
 	--strip-prefix=Ev \

libmisc/Makefile.am

@@ -16,7 +16,7 @@ libevmisc_la_CFLAGS =	\
 	$(DISABLE_DEPRECATED)
 
 libevmisc_la_LIBADD = \
-	$(top_builddir)/libdocument/libevdocument.la \
-	$(top_builddir)/libview/libevview.la
+	$(top_builddir)/libdocument/libevdocument3.la \
+	$(top_builddir)/libview/libevview3.la
 
 -include $(top_srcdir)/git.mk

libview/Makefile.am

@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libevview.la
+lib_LTLIBRARIES = libevview3.la
 
 NOINST_H_FILES =			\
 	ev-annotation-window.h		\
@@ -28,7 +28,7 @@ INST_H_FILES = 				\
 headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview
 header_DATA = $(INST_H_FILES)
 
-libevview_la_SOURCES = 			\
+libevview3_la_SOURCES =			\
 	ev-annotation-window.c		\
 	ev-document-model.c		\
 	ev-loading-window.c		\
@@ -49,7 +49,7 @@ libevview_la_SOURCES = 			\
 	$(NOINST_H_FILES)		\
 	$(INST_H_FILES)
 
-libevview_la_CPPFLAGS = \
+libevview3_la_CPPFLAGS = \
 	-DEVINCEDATADIR=\"$(pkgdatadir)\"	\
 	-DG_LOG_DOMAIN=\"EvinceView\"		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
@@ -59,20 +59,20 @@ libevview_la_CPPFLAGS = \
 	-I$(top_builddir)			\
 	$(AM_CPPFLAGS)
 
-libevview_la_CFLAGS = \
+libevview3_la_CFLAGS = \
 	$(LIBVIEW_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DISABLE_DEPRECATED)	\
 	$(AM_CFLAGS)
 
-libevview_la_LDFLAGS = \
+libevview3_la_LDFLAGS = \
 	-version-info $(EV_VIEW_LT_VERSION_INFO)	\
 	-no-undefined	\
 	-export-symbols-regex "^ev_*"	\
 	$(AM_LDFLAGS)
 
-libevview_la_LIBADD = \
-	$(top_builddir)/libdocument/libevdocument.la \
+libevview3_la_LIBADD = \
+	$(top_builddir)/libdocument/libevdocument3.la \
 	$(LIBVIEW_LIBS)
 
 BUILT_SOURCES = 			\
@@ -118,7 +118,7 @@ EXTRA_DIST = \
 
 if ENABLE_INTROSPECTION
 
-EvinceView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES) $(filter %.c,$(libevview_la_SOURCES))
+EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filter %.c,$(libevview3_la_SOURCES))
 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
 	$(G_IR_SCANNER) -v --namespace EvinceView \
 	--add-include-path=$(top_builddir)/libdocument \

previewer/Makefile.am

@@ -28,8 +28,8 @@ evince_previewer_LDFLAGS += -mwindows
 endif
 
 evince_previewer_LDADD = \
-	$(top_builddir)/libdocument/libevdocument.la	\
-	$(top_builddir)/libview/libevview.la		\
+	$(top_builddir)/libdocument/libevdocument3.la	\
+	$(top_builddir)/libview/libevview3.la		\
 	$(top_builddir)/libmisc/libevmisc.la		\
 	$(PREVIEWER_LIBS)
 

properties/Makefile.am

@@ -24,7 +24,7 @@ libevince_properties_page_la_SOURCES = 	\
 
 libevince_properties_page_la_LIBADD = 		\
 	libevproperties.la			\
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(FRONTEND_LIBS)			\
 	$(NAUTILUS_LIBS)
 

shell/Makefile.am

@@ -106,8 +106,8 @@ evince_LDADD=										\
 	$(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la	\
 	$(top_builddir)/cut-n-paste/smclient/libsmclient.la				\
 	$(top_builddir)/properties/libevproperties.la					\
-	$(top_builddir)/libdocument/libevdocument.la					\
-	$(top_builddir)/libview/libevview.la						\
+	$(top_builddir)/libdocument/libevdocument3.la					\
+	$(top_builddir)/libview/libevview3.la						\
 	$(top_builddir)/libmisc/libevmisc.la						\
 	$(SHELL_LIBS)
 

thumbnailer/Makefile.am

@@ -25,7 +25,7 @@ evince_thumbnailer_LDFLAGS += -mwindows
 endif
 
 evince_thumbnailer_LDADD = \
-	$(top_builddir)/libdocument/libevdocument.la	\
+	$(top_builddir)/libdocument/libevdocument3.la	\
 	$(FRONTEND_LIBS)
 
 schema_files = \