From cd5fa1ee4e3f8fdeb620487d8dc5e4c8ca9da15f Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Sat, 16 May 2009 09:55:30 +0100
Subject: telepathy-glib: 0.7.11 -> 0.7.29

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../telepathy-glib/prefer_python_2.5.patch         | 22 ++++++------
 meta/packages/telepathy/telepathy-glib_0.7.11.bb   | 41 ----------------------
 meta/packages/telepathy/telepathy-glib_0.7.29.bb   | 41 ++++++++++++++++++++++
 3 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 meta/packages/telepathy/telepathy-glib_0.7.11.bb
 create mode 100644 meta/packages/telepathy/telepathy-glib_0.7.29.bb

(limited to 'meta')

diff --git a/meta/packages/telepathy/telepathy-glib/prefer_python_2.5.patch b/meta/packages/telepathy/telepathy-glib/prefer_python_2.5.patch
index 95b4f5458..27d89af8a 100644
--- a/meta/packages/telepathy/telepathy-glib/prefer_python_2.5.patch
+++ b/meta/packages/telepathy/telepathy-glib/prefer_python_2.5.patch
@@ -1,13 +1,13 @@
-Index: telepathy-glib-0.7.0/configure.ac
+Index: telepathy-glib-0.7.29/configure.ac
 ===================================================================
---- telepathy-glib-0.7.0.orig/configure.ac	2007-11-22 18:09:07.000000000 +0000
-+++ telepathy-glib-0.7.0/configure.ac	2007-12-31 23:07:04.000000000 +0000
-@@ -179,7 +179,7 @@
-   AC_MSG_ERROR([dbus-binding-tool (from dbus-glib) is required])
- fi
- PYTHON=
--AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python])
-+AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python2.3 python])
- if test -z "$PYTHON"; then
-   AC_MSG_ERROR([Python is required to compile this package])
+--- telepathy-glib-0.7.29.orig/configure.ac	2009-05-15 14:33:49.000000000 +0100
++++ telepathy-glib-0.7.29/configure.ac	2009-05-15 14:33:56.000000000 +0100
+@@ -174,7 +174,7 @@
+ if test -z "$XSLTPROC"; then
+   AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])
  fi
+-AM_PATH_PYTHON([2.3])
++AM_PATH_PYTHON([2.5])
+ 
+ dnl glibc backtrace functions
+ AC_CHECK_FUNCS(backtrace backtrace_symbols_fd)
diff --git a/meta/packages/telepathy/telepathy-glib_0.7.11.bb b/meta/packages/telepathy/telepathy-glib_0.7.11.bb
deleted file mode 100644
index 4d143bac1..000000000
--- a/meta/packages/telepathy/telepathy-glib_0.7.11.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection managers"
-HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
-DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
-LICENSE = "LGPL"
-
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz \
-           file://prefer_python_2.5.patch;patch=1 "
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${datadir}/telepathy \
-		${datadir}/dbus-1"
-
-do_stage() {
-	#
-	# copied autotools_stage_all because telepathy-glib has one lib only built as static
-	# so it can not be oe_libinstalled
-	#
-	rm -rf ${STAGE_TEMP}
-	mkdir -p ${STAGE_TEMP}
-	oe_runmake DESTDIR="${STAGE_TEMP}" install
-	if [ -d ${STAGE_TEMP}/${includedir} ]; then
-		cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
-	fi
-	if [ -d ${STAGE_TEMP}/${libdir} ]
-	then
-		for i in ${STAGE_TEMP}/${libdir}/*.la
-		do
-			if [ ! -f "$i" ]; then
-				cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
-				break
-			fi
-		done
-		oe_libinstall -so -C telepathy-glib/.libs libtelepathy-glib ${STAGING_LIBDIR}
-	fi
-	if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
-		install -d ${STAGING_DATADIR}/aclocal
-		cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
-	fi
-	rm -rf ${STAGE_TEMP}
-}
diff --git a/meta/packages/telepathy/telepathy-glib_0.7.29.bb b/meta/packages/telepathy/telepathy-glib_0.7.29.bb
new file mode 100644
index 000000000..4d143bac1
--- /dev/null
+++ b/meta/packages/telepathy/telepathy-glib_0.7.29.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection managers"
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
+LICENSE = "LGPL"
+
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz \
+           file://prefer_python_2.5.patch;patch=1 "
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/telepathy \
+		${datadir}/dbus-1"
+
+do_stage() {
+	#
+	# copied autotools_stage_all because telepathy-glib has one lib only built as static
+	# so it can not be oe_libinstalled
+	#
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	oe_runmake DESTDIR="${STAGE_TEMP}" install
+	if [ -d ${STAGE_TEMP}/${includedir} ]; then
+		cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+	fi
+	if [ -d ${STAGE_TEMP}/${libdir} ]
+	then
+		for i in ${STAGE_TEMP}/${libdir}/*.la
+		do
+			if [ ! -f "$i" ]; then
+				cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+				break
+			fi
+		done
+		oe_libinstall -so -C telepathy-glib/.libs libtelepathy-glib ${STAGING_LIBDIR}
+	fi
+	if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
+		install -d ${STAGING_DATADIR}/aclocal
+		cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+	fi
+	rm -rf ${STAGE_TEMP}
+}
-- 
cgit v1.2.3