# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1261332238 0
# Node ID a52831eada674bd6d47d16b20bf13887b26a182d
# Parent  1d969bd224f2f47d40b37fa72eca8455bce1b996
Add pidgin-2 and purple-2 .pc variants

Instead of adding ${includedir}/libpurple to the include path, purple-2 adds
${includedir}. This allows projects to #include <libpurple/debug.h> rather than
#include <debug.h>, which prevents libpurple's headers colliding with the
project's own, and is more conventional.

media/codec.h needed tweaking to compile.

diff -r 1d969bd224f2 -r a52831eada67 configure.ac
--- a/configure.ac	Sun Dec 20 17:37:17 2009 +0000
+++ b/configure.ac	Sun Dec 20 18:03:58 2009 +0000
@@ -2502,6 +2502,8 @@
 		   pidgin/Makefile
 		   pidgin/pidgin.pc
 		   pidgin/pidgin-uninstalled.pc
+		   pidgin/pidgin-2.pc
+		   pidgin/pidgin-2-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
@@ -2519,6 +2521,8 @@
 		   libpurple/gconf/Makefile
 		   libpurple/purple.pc
 		   libpurple/purple-uninstalled.pc
+		   libpurple/purple-2.pc
+		   libpurple/purple-2-uninstalled.pc
 		   libpurple/plugins/Makefile
 		   libpurple/plugins/mono/Makefile
 		   libpurple/plugins/mono/api/Makefile
diff -r 1d969bd224f2 -r a52831eada67 libpurple/media/codec.h
--- a/libpurple/media/codec.h	Sun Dec 20 17:37:17 2009 +0000
+++ b/libpurple/media/codec.h	Sun Dec 20 18:03:58 2009 +0000
@@ -32,7 +32,7 @@
 /** An opaque structure representing an audio or video codec. */
 typedef struct _PurpleMediaCodec PurpleMediaCodec;
 
-#include "util.h"
+#include "../util.h"
 
 #include <glib-object.h>
 
diff -r 1d969bd224f2 -r a52831eada67 libpurple/purple-2-uninstalled.pc.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/purple-2-uninstalled.pc.in	Sun Dec 20 18:03:58 2009 +0000
@@ -0,0 +1,22 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
+Name: libpurple
+Description: libpurple is a GLib-based instant messenger library.
+Version: @VERSION@
+Requires: glib-2.0
+Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
+Libs: ${abs_builddir}/libpurple.la
diff -r 1d969bd224f2 -r a52831eada67 libpurple/purple-2.pc.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/purple-2.pc.in	Sun Dec 20 18:03:58 2009 +0000
@@ -0,0 +1,16 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
+Name: libpurple
+Description: libpurple is a GLib-based instant messenger library.
+Version: @VERSION@
+Requires: glib-2.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lpurple
diff -r 1d969bd224f2 -r a52831eada67 pidgin/pidgin-2-uninstalled.pc.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pidgin-2-uninstalled.pc.in	Sun Dec 20 18:03:58 2009 +0000
@@ -0,0 +1,21 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+
+plugindir=${libdir}/pidgin
+
+Name: Pidgin
+Description: Pidgin is a GTK2-based instant messenger application.
+Version: @VERSION@
+Requires: gtk+-2.0 purple
+Cflags: -I${abs_top_srcdir}
diff -r 1d969bd224f2 -r a52831eada67 pidgin/pidgin-2.pc.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pidgin-2.pc.in	Sun Dec 20 18:03:58 2009 +0000
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+plugindir=${libdir}/pidgin
+
+Name: Pidgin
+Description: Pidgin is a GTK2-based instant messenger application.
+Version: @VERSION@
+Requires: gtk+-2.0 purple
+Cflags: -I${includedir}