[poppler] poppler: ChangeLog, 1.104, 1.105 configure.ac, 1.23, 1.24 poppler-cairo.pc.in, 1.1.1.1, 1.2 poppler-glib.pc.in, 1.4, 1.5 poppler-qt.pc.in, 1.3, 1.4 poppler-splash.pc.in, 1.1.1.1, 1.2

[Kristian Hogsberg]

Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv12122

Modified Files:
	ChangeLog configure.ac poppler-cairo.pc.in poppler-glib.pc.in 
	poppler-qt.pc.in poppler-splash.pc.in 
Log Message:
2005-06-02  Kristian Høgsberg  <krh at redhat.com>

        Patch from Stanislav Brabec <sbrabec at suse.cz>:

        * configure.ac:
        * poppler-cairo.pc.in:
        * poppler-glib.pc.in:
        * poppler-qt.pc.in:
        * poppler-splash.pc.in: Misc fixes to pkg-config files.



Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- ChangeLog	2 Jun 2005 00:35:44 -0000	1.104
+++ ChangeLog	2 Jun 2005 18:49:55 -0000	1.105
@@ -1,3 +1,13 @@
+2005-06-02  Kristian Høgsberg  <krh at redhat.com>
+
+	Patch from Stanislav Brabec <sbrabec at suse.cz>:
+
+	* configure.ac:
+	* poppler-cairo.pc.in:
+	* poppler-glib.pc.in:
+	* poppler-qt.pc.in:
+	* poppler-splash.pc.in: Misc fixes to pkg-config files.
+
 2005-06-01  Jeff Muizelaar  <jeff at infidigm.net>
 
 	* poppler/Error.cc:

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- configure.ac	18 May 2005 17:39:59 -0000	1.23
+++ configure.ac	2 Jun 2005 18:49:55 -0000	1.24
@@ -175,15 +175,17 @@
   AC_DEFINE(HAVE_SPLASH)
 fi
 
+CAIRO_VERSION="0.5"
+AC_SUBST(CAIRO_VERSION)
 AC_ARG_ENABLE(cairo-output,
               AC_HELP_STRING([--disable-cairo-output],
                              [Don't build the cairo graphics backend.]),
               enable_cairo_output=$enableval,
               enable_cairo_output="try")
 if test x$enable_cairo_output = xyes; then
-  PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0 fontconfig)
+  PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION fontconfig)
 elif test x$enable_cairo_output = xtry; then
-  PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0 fontconfig,
+  PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION fontconfig,
                     [enable_cairo_output="yes"],
                     [enable_cairo_output="no"])
 fi

Index: poppler-cairo.pc.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler-cairo.pc.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- poppler-cairo.pc.in	3 Mar 2005 19:45:58 -0000	1.1.1.1
+++ poppler-cairo.pc.in	2 Jun 2005 18:49:55 -0000	1.2
@@ -6,5 +6,4 @@
 Name: poppler-cairo
 Description: Cairo backend for Poppler PDF rendering library
 Version: @VERSION@
-
-Requires: poppler- at VERSION@ cairo >= 0.3
+Requires: poppler = @VERSION@ cairo >= @CAIRO_VERSION@

Index: poppler-glib.pc.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler-glib.pc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- poppler-glib.pc.in	6 May 2005 16:38:57 -0000	1.4
+++ poppler-glib.pc.in	2 Jun 2005 18:49:55 -0000	1.5
@@ -3,10 +3,10 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: poppler
+Name: poppler-glib
 Description: GLib wrapper for poppler
 Version: @VERSION@
-Requires: gobject-2.0 gdk-pixbuf-2.0
+Requires: poppler = @VERSION@ gobject-2.0 gdk-pixbuf-2.0
 
 Libs: -L${libdir} -lpoppler-glib
 Cflags: -I${includedir}/poppler/glib

Index: poppler-qt.pc.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler-qt.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- poppler-qt.pc.in	6 May 2005 16:38:57 -0000	1.3
+++ poppler-qt.pc.in	2 Jun 2005 18:49:55 -0000	1.4
@@ -6,6 +6,7 @@
 Name: poppler-qt
 Description: Qt bindings for poppler
 Version: @VERSION@
+Requires: poppler = @VERSION@
 
 Libs: -L${libdir} -lpoppler-qt
 Cflags: -I${includedir}/poppler

Index: poppler-splash.pc.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler-splash.pc.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- poppler-splash.pc.in	3 Mar 2005 19:45:58 -0000	1.1.1.1
+++ poppler-splash.pc.in	2 Jun 2005 18:49:55 -0000	1.2
@@ -6,5 +6,4 @@
 Name: poppler-splash
 Description: Splash backend for Poppler PDF rendering library
 Version: @VERSION@
-
-Requires: poppler- at VERSION@
+Requires: poppler = @VERSION@