From b3f5ec3f8906c4e166433590e3f9f579f4a0a528 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Thu, 6 Mar 2008 10:36:31 +0000
Subject: util-macros: upgrade to 1.1.6

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3964 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../xorg-util/files/unbreak_cross_compile.patch    | 25 ++++++++--------------
 .../packages/xorg-util/util-macros-native_1.1.5.bb |  3 ---
 .../packages/xorg-util/util-macros-native_1.1.6.bb |  3 +++
 meta/packages/xorg-util/util-macros-sdk_1.1.5.bb   |  3 ---
 meta/packages/xorg-util/util-macros-sdk_1.1.6.bb   |  3 +++
 meta/packages/xorg-util/util-macros_1.1.5.bb       | 13 -----------
 meta/packages/xorg-util/util-macros_1.1.6.bb       | 13 +++++++++++
 7 files changed, 28 insertions(+), 35 deletions(-)
 delete mode 100644 meta/packages/xorg-util/util-macros-native_1.1.5.bb
 create mode 100644 meta/packages/xorg-util/util-macros-native_1.1.6.bb
 delete mode 100644 meta/packages/xorg-util/util-macros-sdk_1.1.5.bb
 create mode 100644 meta/packages/xorg-util/util-macros-sdk_1.1.6.bb
 delete mode 100644 meta/packages/xorg-util/util-macros_1.1.5.bb
 create mode 100644 meta/packages/xorg-util/util-macros_1.1.6.bb

diff --git a/meta/packages/xorg-util/files/unbreak_cross_compile.patch b/meta/packages/xorg-util/files/unbreak_cross_compile.patch
index fd84aade1e..1f784944d3 100644
--- a/meta/packages/xorg-util/files/unbreak_cross_compile.patch
+++ b/meta/packages/xorg-util/files/unbreak_cross_compile.patch
@@ -1,21 +1,12 @@
 ---
- xorg-macros.m4.in |    4 ----
- 1 file changed, 4 deletions(-)
+ xorg-macros.m4.in |    2 --
+ 1 file changed, 2 deletions(-)
 
-Index: util-macros-1.1.5/xorg-macros.m4.in
-===================================================================
---- util-macros-1.1.5.orig/xorg-macros.m4.in	2006-11-08 14:23:10.000000000 +0000
-+++ util-macros-1.1.5/xorg-macros.m4.in	2007-01-31 15:28:55.000000000 +0000
-@@ -194,8 +194,6 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
- XORG_SGML_PATH=$prefix/share/sgml
- HAVE_DEFS_ENT=
- 
--AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
--
- AC_PATH_PROG(LINUXDOC, linuxdoc)
- AC_PATH_PROG(PS2PDF, ps2pdf)
- 
-@@ -250,8 +248,6 @@ BUILDPDFDOC=no
+--- util-macros-1.1.6.orig/xorg-macros.m4.in
++++ util-macros-1.1.6/xorg-macros.m4.in
+@@ -252,12 +252,10 @@ HAVE_DEFS_ENT=
+ BUILDTXTDOC=no
+ BUILDPDFDOC=no
  BUILDPSDOC=no
  BUILDHTMLDOC=no
  
@@ -24,3 +15,5 @@ Index: util-macros-1.1.5/xorg-macros.m4.in
  AC_PATH_PROG(DOCBOOKPS, docbook2ps)
  AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
  AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+ AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+ 
diff --git a/meta/packages/xorg-util/util-macros-native_1.1.5.bb b/meta/packages/xorg-util/util-macros-native_1.1.5.bb
deleted file mode 100644
index 0f4ed124f0..0000000000
--- a/meta/packages/xorg-util/util-macros-native_1.1.5.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require util-macros_${PV}.bb
-
-inherit native
diff --git a/meta/packages/xorg-util/util-macros-native_1.1.6.bb b/meta/packages/xorg-util/util-macros-native_1.1.6.bb
new file mode 100644
index 0000000000..0f4ed124f0
--- /dev/null
+++ b/meta/packages/xorg-util/util-macros-native_1.1.6.bb
@@ -0,0 +1,3 @@
+require util-macros_${PV}.bb
+
+inherit native
diff --git a/meta/packages/xorg-util/util-macros-sdk_1.1.5.bb b/meta/packages/xorg-util/util-macros-sdk_1.1.5.bb
deleted file mode 100644
index 597868f9b6..0000000000
--- a/meta/packages/xorg-util/util-macros-sdk_1.1.5.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require util-macros_${PV}.bb
-
-inherit sdk
diff --git a/meta/packages/xorg-util/util-macros-sdk_1.1.6.bb b/meta/packages/xorg-util/util-macros-sdk_1.1.6.bb
new file mode 100644
index 0000000000..597868f9b6
--- /dev/null
+++ b/meta/packages/xorg-util/util-macros-sdk_1.1.6.bb
@@ -0,0 +1,3 @@
+require util-macros_${PV}.bb
+
+inherit sdk
diff --git a/meta/packages/xorg-util/util-macros_1.1.5.bb b/meta/packages/xorg-util/util-macros_1.1.5.bb
deleted file mode 100644
index 9cb22ade46..0000000000
--- a/meta/packages/xorg-util/util-macros_1.1.5.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X autotools macros"
-PR = "r2"
-PE = "1"
-
-SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
-
-XORG_PN = "util-macros"
-
-# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
diff --git a/meta/packages/xorg-util/util-macros_1.1.6.bb b/meta/packages/xorg-util/util-macros_1.1.6.bb
new file mode 100644
index 0000000000..9cb22ade46
--- /dev/null
+++ b/meta/packages/xorg-util/util-macros_1.1.6.bb
@@ -0,0 +1,13 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "X autotools macros"
+PR = "r2"
+PE = "1"
+
+SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
+
+XORG_PN = "util-macros"
+
+# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
-- 
cgit v1.2.3