pidgin.next.major: c9c5ba48: Update the pkg-config versions. Also, dr...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: c9c5ba486ea016ed8a4454c0f070edfc5af646a9
Parent:   f8a0990bfbc6d64f9afc8786d17d770824ef00b0
Author:   qulogic at pidgin.im
Date:     03/16/11 15:45:26
Branch:   im.pidgin.pidgin.next.major
URL: http://d.pidgin.im/viewmtn/revision/info/c9c5ba486ea016ed8a4454c0f070edfc5af646a9

Changelog: 

Update the pkg-config versions. Also, drop the unversioned pc files,
to be less confusing.

Changes against parent f8a0990bfbc6d64f9afc8786d17d770824ef00b0

  dropped  libpurple/purple-uninstalled.pc.in
  dropped  libpurple/purple.pc.in
  dropped  pidgin/pidgin-uninstalled.pc.in
  dropped  pidgin/pidgin.pc.in
  renamed  libpurple/purple-2-uninstalled.pc.in
       to  libpurple/purple-3-uninstalled.pc.in
  renamed  libpurple/purple-2.pc.in
       to  libpurple/purple-3.pc.in
  renamed  pidgin/pidgin-2-uninstalled.pc.in
       to  pidgin/pidgin-3-uninstalled.pc.in
  renamed  pidgin/pidgin-2.pc.in
       to  pidgin/pidgin-3.pc.in
  patched  configure.ac
  patched  libpurple/Makefile.am
  patched  pidgin/Makefile.am
  patched  pidgin/pidgin-3-uninstalled.pc.in
  patched  pidgin/pidgin-3.pc.in

-------------- next part --------------
============================================================
--- configure.ac	caa1182940ef04d779a3efa015dceec4311fb629
+++ configure.ac	072a9f4094f1129efcdd7f9061045ef551f713f1
@@ -2536,10 +2536,8 @@ AC_CONFIG_FILES([Makefile
 		   m4macros/Makefile
 		   pidgin.apspec
 		   pidgin/Makefile
-		   pidgin/pidgin.pc
-		   pidgin/pidgin-uninstalled.pc
-		   pidgin/pidgin-2.pc
-		   pidgin/pidgin-2-uninstalled.pc
+		   pidgin/pidgin-3.pc
+		   pidgin/pidgin-3-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
@@ -2556,10 +2554,8 @@ AC_CONFIG_FILES([Makefile
 		   libpurple/ciphers/Makefile
 		   libpurple/example/Makefile
 		   libpurple/gconf/Makefile
-		   libpurple/purple.pc
-		   libpurple/purple-uninstalled.pc
-		   libpurple/purple-2.pc
-		   libpurple/purple-2-uninstalled.pc
+		   libpurple/purple-3.pc
+		   libpurple/purple-3-uninstalled.pc
 		   libpurple/plugins/Makefile
 		   libpurple/plugins/mono/Makefile
 		   libpurple/plugins/mono/api/Makefile
============================================================
--- libpurple/Makefile.am	a6d81774193e9ebe6f5e198b5b1cd1adf1bd5feb
+++ libpurple/Makefile.am	d872d4a8845f1e164d961c41efebddab9211ec33
@@ -9,8 +9,8 @@ EXTRA_DIST = \
 		purple-send-async \
 		purple-url-handler \
 		purple.h.in \
-		purple.pc.in \
-		purple-uninstalled.pc.in \
+		purple-3.pc.in \
+		purple-3-uninstalled.pc.in \
 		version.h.in \
 		Makefile.mingw \
 		win32/global.mak \
@@ -30,7 +30,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = purple.pc
+pkgconfig_DATA = purple-3.pc
 
 SUBDIRS = $(GCONF_DIR) plugins protocols ciphers . tests example
 
============================================================
--- pidgin/Makefile.am	f1f60a27a7796e0824aee31a3b2162b82724b406
+++ pidgin/Makefile.am	b34d199ee0564827ab8c124406df51f74ef83242
@@ -3,8 +3,8 @@ EXTRA_DIST = \
 		getopt.h \
 		getopt1.c \
 		Makefile.mingw \
-		pidgin.pc.in \
-		pidgin-uninstalled.pc.in \
+		pidgin-3.pc.in \
+		pidgin-3-uninstalled.pc.in \
 		win32/MinimizeToTray.h \
 		win32/MinimizeToTray.c \
 		win32/pidgin_dll_rc.rc.in \
@@ -32,7 +32,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 if ENABLE_GTK
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pidgin.pc
+pkgconfig_DATA = pidgin-3.pc
 
 SUBDIRS = pixmaps plugins
 
============================================================
--- libpurple/purple.pc.in	b1d02b88bb513aceaeccf560ebff576339071048
+++ /dev/null	
@@ -1,16 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-datarootdir=@datarootdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-
-plugindir=${libdir}/purple- at PURPLE_MAJOR_VERSION@
-
-Name: libpurple
-Description: libpurple is a GLib-based instant messenger library.
-Version: @VERSION@
-Requires: glib-2.0
-Cflags: -I${includedir}/libpurple
-Libs: -L${libdir} -lpurple
============================================================
--- pidgin/pidgin.pc.in	dae4a320bf3c5e6e4d146919c1852d65a3a5f541
+++ /dev/null	
@@ -1,16 +0,0 @@
-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}/pidgin
-
============================================================
--- libpurple/purple-uninstalled.pc.in	b7a430642c719c793ed24f1e600f891d92c1798c
+++ /dev/null	
@@ -1,19 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-datarootdir=@datarootdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-
-abs_srcdir=@abs_srcdir@
-abs_builddir=@abs_builddir@
-
-plugindir=${libdir}/purple- at PURPLE_MAJOR_VERSION@
-
-Name: libpurple
-Description: libpurple is a GLib-based instant messenger library.
-Version: @VERSION@
-Requires: glib-2.0
-Cflags: -I${abs_srcdir} -I${abs_builddir}
-Libs: ${abs_builddir}/libpurple.la
============================================================
--- pidgin/pidgin-uninstalled.pc.in	2f633d16aedc792ed4e1098f5e4bd61250a4f73b
+++ /dev/null	
@@ -1,18 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-datarootdir=@datarootdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-
-abs_srcdir=@abs_srcdir@
-abs_builddir=@abs_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_srcdir}
============================================================
--- pidgin/pidgin-2-uninstalled.pc.in	1264471406c31c23aab2228fa7b572fd1413688a
+++ pidgin/pidgin-3-uninstalled.pc.in	7d687b17c4c6ccff1ce8675ed0cd2deb1ae434cb
@@ -17,5 +17,5 @@ Version: @VERSION@
 Name: Pidgin
 Description: Pidgin is a GTK2-based instant messenger application.
 Version: @VERSION@
-Requires: gtk+-2.0 purple
+Requires: gtk+-2.0 purple-3
 Cflags: -I${abs_top_srcdir}
============================================================
--- pidgin/pidgin-2.pc.in	a1bb4908d26cbff714292975092914a251260527
+++ pidgin/pidgin-3.pc.in	2675d7a8428b39c28c987e10317b23fb4ae54971
@@ -11,5 +11,5 @@ Version: @VERSION@
 Name: Pidgin
 Description: Pidgin is a GTK2-based instant messenger application.
 Version: @VERSION@
-Requires: gtk+-2.0 purple
+Requires: gtk+-2.0 purple-3
 Cflags: -I${includedir}