commit 78e6039028cc223807fdd87675521ba45eed2680
Merge: e5b2bbd aefe455
Author: phantomjinx <[email protected]>
Date: Sun May 15 18:48:36 2011 +0100
Merge branch 'master' into gtk-3.0
Conflicts:
configure.ac
ChangeLog | 55 +++++++++
NEWS | 8 ++
configure.ac | 20 ++--
generate-ChangeLog.sh | 13 ++-
libgtkpod/directories.c | 2 +-
libgtkpod/file.c | 8 +-
libgtkpod/filetype_iface.c | 9 ++-
plugins/filetype_mp3/Makefile.am | 3 +-
plugins/filetype_mp4/mp4file.c | 2 +-
po/ca.po | 224 ++++++++++++++++++++------------------
po/cs_CZ.po | 224 ++++++++++++++++++++------------------
po/de.po | 224 ++++++++++++++++++++------------------
po/es.po | 224 ++++++++++++++++++++------------------
po/fr.po | 224 ++++++++++++++++++++------------------
po/he.po | 224 ++++++++++++++++++++------------------
po/it.po | 224 ++++++++++++++++++++------------------
po/ja.po | 224 ++++++++++++++++++++------------------
po/nl.po | 220 +++++++++++++++++++------------------
po/pt_BR.po | 220 +++++++++++++++++++------------------
po/ro.po | 224 ++++++++++++++++++++------------------
po/ru.po | 224 ++++++++++++++++++++------------------
po/sv.po | 224 ++++++++++++++++++++------------------
po/zh_CN.po | 224 ++++++++++++++++++++------------------
po/zh_TW.po | 220 +++++++++++++++++++------------------
version.sh | 4 +-
25 files changed, 1847 insertions(+), 1625 deletions(-)
---
diff --cc configure.ac
index badb995,5e78ab7..4a0bc57
--- a/configure.ac
+++ b/configure.ac
@@@ -77,14 -74,15 +77,15 @@@ els
fi
dnl check for required libs that are managed with pkg-config
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0,, [AC_MSG_FAILURE([***
$GTK_PKG_ERRORS])])
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.15.0,, [AC_MSG_FAILURE([***
$GLIB_PKG_ERRORS])])
-PKG_CHECK_MODULES(GMODULE, gmodule-2.0,, [AC_MSG_FAILURE([***
$GMODULE_PKG_ERRORS])])
-PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 0.14.0,, [AC_MSG_FAILURE([***
$GTHREAD_PKG_ERRORS])])
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0.8,, [AC_MSG_FAILURE([***
$GTK_PKG_ERRORS])])
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.5,, [AC_MSG_FAILURE([***
$GLIB_PKG_ERRORS])])
+PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.28.5,, [AC_MSG_FAILURE([***
$GMODULE_PKG_ERRORS])])
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.28.5,, [AC_MSG_FAILURE([***
$GTHREAD_PKG_ERRORS])])
PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 >= 0.7.0,, [AC_MSG_FAILURE([***
$LIBGPOD_PKG_ERRORS])])
- PKG_CHECK_MODULES(LIBANJUTA, libanjuta-3.0 >= 2.91,, [AC_MSG_FAILURE([***
$LIBANJUTA_PKG_ERRORS])])
- PKG_CHECK_MODULES(LIBGDL, gdl-3.0 >= 3.0.0,, [AC_MSG_FAILURE([***
$LIBGDL_PKG_ERRORS])])
- PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.28.5,, [AC_MSG_FAILURE([***
$GIO_PKG_ERRORS])])
+ PKG_CHECK_MODULES(LIBANJUTA, libanjuta-1.0 >= 2.30.0,, [AC_MSG_FAILURE([***
$LIBANJUTA_PKG_ERRORS])])
+ PKG_CHECK_MODULES(LIBGDL, gdl-1.0 >= 2.26.0,, [AC_MSG_FAILURE([***
$LIBGDL_PKG_ERRORS])])
+ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.0,, [AC_MSG_FAILURE([***
$GIO_PKG_ERRORS])])
+ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.7.7,, [AC_MSG_FAILURE([***
$LIBXML_PKG_ERRORS])])
dnl Check if GDK has GSEAL for GdkDragContext
PKG_CHECK_MODULES(GSEALED_GDK, gdk-2.0 >= 2.21.0, have_gsealed_gdk=yes,
have_gsealed_gdk=no)
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
