Mercurial > pidgin
changeset 29081:299ef6fd1a23
propagate from branch 'im.pidgin.pidgin' (head dbaa86f7e1344923764e572cebfb30ce7c53ee80)
to branch 'im.pidgin.pidgin.next.minor' (head 035e390145aacfff19b413ac1870e7f1b81739e2)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sat, 22 Aug 2009 18:54:15 +0000 |
| parents | 84804fd076bc (diff) 4b61989ab198 (current diff) |
| children | 39716f7d2c93 |
| files | ChangeLog configure.ac |
| diffstat | 6 files changed, 21 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Aug 22 18:52:16 2009 +0000 +++ b/ChangeLog Sat Aug 22 18:54:15 2009 +0000 @@ -1,5 +1,7 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.7.0 (??/??/????): + version 2.6.2 (??/??/2009): libpurple: * Fix --disable-avahi to actually disable it in configure, as opposed
--- a/ChangeLog.API Sat Aug 22 18:52:16 2009 +0000 +++ b/ChangeLog.API Sat Aug 22 18:54:15 2009 +0000 @@ -1,5 +1,7 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.7.0 (??/??/????): + version 2.6.1 (08/18/2009): No changes
--- a/ChangeLog.win32 Sat Aug 22 18:52:16 2009 +0000 +++ b/ChangeLog.win32 Sat Aug 22 18:54:15 2009 +0000 @@ -1,3 +1,5 @@ +version 2.7.0 (??/??/????): + version 2.6.1 (08/18/2009): * No changes
--- a/configure.ac Sat Aug 22 18:52:16 2009 +0000 +++ b/configure.ac Sat Aug 22 18:54:15 2009 +0000 @@ -43,19 +43,19 @@ # # Make sure to update finch/libgnt/configure.ac with libgnt version changes. # -m4_define([purple_lt_current], [6]) +m4_define([purple_lt_current], [7]) m4_define([purple_major_version], [2]) -m4_define([purple_minor_version], [6]) -m4_define([purple_micro_version], [2]) +m4_define([purple_minor_version], [7]) +m4_define([purple_micro_version], [0]) m4_define([purple_version_suffix], [devel]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) -m4_define([gnt_lt_current], [6]) +m4_define([gnt_lt_current], [7]) m4_define([gnt_major_version], [2]) -m4_define([gnt_minor_version], [6]) -m4_define([gnt_micro_version], [2]) +m4_define([gnt_minor_version], [7]) +m4_define([gnt_micro_version], [0]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) @@ -312,7 +312,7 @@ dnl ####################################################################### dnl # Check for GLib 2.0 (required) dnl ####################################################################### -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.4.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.14.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ @@ -352,7 +352,7 @@ [enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no]) dnl ####################################################################### -dnl # Check for GTK+ 2.0 and other things used by the GTK UI +dnl # Check for GTK+ 2.10 and other things used by the GTK UI dnl ####################################################################### AC_ARG_ENABLE(screensaver, [AC_HELP_STRING([--disable-screensaver], @@ -399,11 +399,11 @@ fi if test "x$enable_gtkui" = "xyes" ; then - PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.4.0], , [ + PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ -You must have GTK+ 2.4.0 or newer development headers installed to compile +You must have GTK+ 2.10.0 or newer development headers installed to compile Pidgin. If you want to build only Finch then specify --disable-gtkui when running configure. ])])
--- a/finch/libgnt/configure.ac Sat Aug 22 18:52:16 2009 +0000 +++ b/finch/libgnt/configure.ac Sat Aug 22 18:54:15 2009 +0000 @@ -24,10 +24,10 @@ # Make sure to update ../../configure.ac with libgnt version changes. # -m4_define([gnt_lt_current], [6]) +m4_define([gnt_lt_current], [7]) m4_define([gnt_major_version], [2]) -m4_define([gnt_minor_version], [6]) -m4_define([gnt_micro_version], [2]) +m4_define([gnt_minor_version], [7]) +m4_define([gnt_micro_version], [0]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version])