From ce6ae6753d84f6cef9a50aadf3e3bd27a41353ce Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 5 Feb 2010 12:12:21 +0000
Subject: util-macros: 1.4.1 -> 1.5.0

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/conf/distro/include/preferred-xorg-versions.inc |  4 ++--
 meta/packages/xorg-util/util-macros_1.4.1.bb         | 13 -------------
 meta/packages/xorg-util/util-macros_1.5.0.bb         | 13 +++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 meta/packages/xorg-util/util-macros_1.4.1.bb
 create mode 100644 meta/packages/xorg-util/util-macros_1.5.0.bb

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 45a37a2d0..c0f595078 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -93,8 +93,8 @@ PREFERRED_VERSION_renderproto-nativesdk ?= "0.11"
 PREFERRED_VERSION_resourceproto ?= "1.1.0"
 PREFERRED_VERSION_scrnsaverproto ?= "1.2.0"
 PREFERRED_VERSION_trapproto ?= "3.4.3"
-PREFERRED_VERSION_util-macros ?= "1.4.1"
-PREFERRED_VERSION_util-macros-native ?= "1.4.1"
+PREFERRED_VERSION_util-macros ?= "1.5.0"
+PREFERRED_VERSION_util-macros-native ?= "1.5.0"
 PREFERRED_VERSION_videoproto ?= "2.3.0"
 PREFERRED_VERSION_windowswmproto ?= "1.0.4"
 PREFERRED_VERSION_x11perf ?= "1.5"
diff --git a/meta/packages/xorg-util/util-macros_1.4.1.bb b/meta/packages/xorg-util/util-macros_1.4.1.bb
deleted file mode 100644
index 052a65873..000000000
--- a/meta/packages/xorg-util/util-macros_1.4.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-PE = "1"
-
-SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
-
-# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
-DEPENDS = "gettext"
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/packages/xorg-util/util-macros_1.5.0.bb b/meta/packages/xorg-util/util-macros_1.5.0.bb
new file mode 100644
index 000000000..052a65873
--- /dev/null
+++ b/meta/packages/xorg-util/util-macros_1.5.0.bb
@@ -0,0 +1,13 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "X autotools macros"
+PE = "1"
+
+SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
+
+# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
+DEPENDS = "gettext"
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
cgit v1.2.3