From ba2b8cb172e39cf305fcefbcc42d1875552af344 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 31 Dec 2008 18:56:40 +0000
Subject: automake: 1.10.1 -> 1.10.2

---
 meta/packages/automake/automake-native_1.10.1.bb |  1 -
 meta/packages/automake/automake-native_1.10.2.bb |  1 +
 meta/packages/automake/automake.inc              |  2 +-
 meta/packages/automake/automake_1.10.1.bb        | 38 ------------------------
 meta/packages/automake/automake_1.10.2.bb        | 38 ++++++++++++++++++++++++
 5 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 meta/packages/automake/automake-native_1.10.1.bb
 create mode 100644 meta/packages/automake/automake-native_1.10.2.bb
 delete mode 100644 meta/packages/automake/automake_1.10.1.bb
 create mode 100644 meta/packages/automake/automake_1.10.2.bb

diff --git a/meta/packages/automake/automake-native_1.10.1.bb b/meta/packages/automake/automake-native_1.10.1.bb
deleted file mode 100644
index 8fc754e82..000000000
--- a/meta/packages/automake/automake-native_1.10.1.bb
+++ /dev/null
@@ -1 +0,0 @@
-require automake-native.inc
diff --git a/meta/packages/automake/automake-native_1.10.2.bb b/meta/packages/automake/automake-native_1.10.2.bb
new file mode 100644
index 000000000..8fc754e82
--- /dev/null
+++ b/meta/packages/automake/automake-native_1.10.2.bb
@@ -0,0 +1 @@
+require automake-native.inc
diff --git a/meta/packages/automake/automake.inc b/meta/packages/automake/automake.inc
index ab2edf26b..e8d17a70e 100644
--- a/meta/packages/automake/automake.inc
+++ b/meta/packages/automake/automake.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "A tool for automatically generating Makefiles."
-LICENSE = "GPL"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
diff --git a/meta/packages/automake/automake_1.10.1.bb b/meta/packages/automake/automake_1.10.1.bb
deleted file mode 100644
index 4c54d069c..000000000
--- a/meta/packages/automake/automake_1.10.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require automake.inc
-
-RDEPENDS_automake += "\
-    autoconf \
-    perl \
-    perl-module-bytes \
-    perl-module-constant \
-    perl-module-cwd \
-    perl-module-data-dumper \
-    perl-module-dynaloader \
-    perl-module-errno \
-    perl-module-exporter-heavy \
-    perl-module-file-basename \
-    perl-module-file-compare \
-    perl-module-file-copy \
-    perl-module-file-glob \
-    perl-module-file-spec-unix \
-    perl-module-file-stat \
-    perl-module-getopt-long \
-    perl-module-io \
-    perl-module-io-file \
-    perl-module-posix \
-    perl-module-strict \
-    perl-module-text-parsewords \
-    perl-module-vars "
-
-SRC_URI += "file://path_prog_fixes.patch;patch=1"
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-	install -d ${D}${datadir}
-	if [ ! -e ${D}${datadir}/aclocal ]; then
-		ln -sf aclocal-1.10 ${D}${datadir}/aclocal
-	fi
-	if [ ! -e ${D}${datadir}/automake ]; then
-		ln -sf automake-1.10 ${D}${datadir}/automake
-	fi
-}
diff --git a/meta/packages/automake/automake_1.10.2.bb b/meta/packages/automake/automake_1.10.2.bb
new file mode 100644
index 000000000..4c54d069c
--- /dev/null
+++ b/meta/packages/automake/automake_1.10.2.bb
@@ -0,0 +1,38 @@
+require automake.inc
+
+RDEPENDS_automake += "\
+    autoconf \
+    perl \
+    perl-module-bytes \
+    perl-module-constant \
+    perl-module-cwd \
+    perl-module-data-dumper \
+    perl-module-dynaloader \
+    perl-module-errno \
+    perl-module-exporter-heavy \
+    perl-module-file-basename \
+    perl-module-file-compare \
+    perl-module-file-copy \
+    perl-module-file-glob \
+    perl-module-file-spec-unix \
+    perl-module-file-stat \
+    perl-module-getopt-long \
+    perl-module-io \
+    perl-module-io-file \
+    perl-module-posix \
+    perl-module-strict \
+    perl-module-text-parsewords \
+    perl-module-vars "
+
+SRC_URI += "file://path_prog_fixes.patch;patch=1"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.10 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.10 ${D}${datadir}/automake
+	fi
+}
-- 
cgit v1.2.3