From 5751ea748f6207f78bca684ea961b9b4bd1a88c1 Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Fri, 7 Nov 2008 16:41:02 +0000
Subject: Poppler moved from meta-extras to meta.

---
 meta-extras/packages/poppler/poppler-data_0.1.bb | 16 ----------------
 meta-extras/packages/poppler/poppler-fpu.inc     |  6 ------
 meta-extras/packages/poppler/poppler.inc         | 23 -----------------------
 meta-extras/packages/poppler/poppler_0.6.bb      |  2 --
 meta/packages/poppler/poppler-data_0.1.bb        | 16 ++++++++++++++++
 meta/packages/poppler/poppler-fpu.inc            |  6 ++++++
 meta/packages/poppler/poppler.inc                | 23 +++++++++++++++++++++++
 meta/packages/poppler/poppler_0.6.bb             |  2 ++
 8 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 meta-extras/packages/poppler/poppler-data_0.1.bb
 delete mode 100644 meta-extras/packages/poppler/poppler-fpu.inc
 delete mode 100644 meta-extras/packages/poppler/poppler.inc
 delete mode 100644 meta-extras/packages/poppler/poppler_0.6.bb
 create mode 100644 meta/packages/poppler/poppler-data_0.1.bb
 create mode 100644 meta/packages/poppler/poppler-fpu.inc
 create mode 100644 meta/packages/poppler/poppler.inc
 create mode 100644 meta/packages/poppler/poppler_0.6.bb

diff --git a/meta-extras/packages/poppler/poppler-data_0.1.bb b/meta-extras/packages/poppler/poppler-data_0.1.bb
deleted file mode 100644
index ca22e4dba..000000000
--- a/meta-extras/packages/poppler/poppler-data_0.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-LICENSE = "Adobe"
-PR = "r0"
-
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
-
-do_compile() {
-}
-
-do_install() {
-	oe_runmake install DESTDIR=${D}
-}
-
-FILES_${PN} += "${datadir}"
-PACKAGE_ARCH = "all"
-
diff --git a/meta-extras/packages/poppler/poppler-fpu.inc b/meta-extras/packages/poppler/poppler-fpu.inc
deleted file mode 100644
index a26273020..000000000
--- a/meta-extras/packages/poppler/poppler-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_poppler_fpu_setting(bb, d):
-	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-		return "--enable-fixedpoint"
-	return ""
-
diff --git a/meta-extras/packages/poppler/poppler.inc b/meta-extras/packages/poppler/poppler.inc
deleted file mode 100644
index c33d6f0ea..000000000
--- a/meta-extras/packages/poppler/poppler.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-DEPENDS = "fontconfig jpeg zlib gtk+ cairo"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = " --enable-xpdf-headers \
-		 --disable-gtk-test \
-		 --disable-poppler-qt --disable-poppler-qt4 \
-		 --enable-zlib \
-	       "
-
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
-require poppler-fpu.inc
-EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
-
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta-extras/packages/poppler/poppler_0.6.bb b/meta-extras/packages/poppler/poppler_0.6.bb
deleted file mode 100644
index 92c25bc0a..000000000
--- a/meta-extras/packages/poppler/poppler_0.6.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require poppler.inc
-PR = "r2"
diff --git a/meta/packages/poppler/poppler-data_0.1.bb b/meta/packages/poppler/poppler-data_0.1.bb
new file mode 100644
index 000000000..ca22e4dba
--- /dev/null
+++ b/meta/packages/poppler/poppler-data_0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
+LICENSE = "Adobe"
+PR = "r0"
+
+SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+
+do_compile() {
+}
+
+do_install() {
+	oe_runmake install DESTDIR=${D}
+}
+
+FILES_${PN} += "${datadir}"
+PACKAGE_ARCH = "all"
+
diff --git a/meta/packages/poppler/poppler-fpu.inc b/meta/packages/poppler/poppler-fpu.inc
new file mode 100644
index 000000000..a26273020
--- /dev/null
+++ b/meta/packages/poppler/poppler-fpu.inc
@@ -0,0 +1,6 @@
+
+def get_poppler_fpu_setting(bb, d):
+	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--enable-fixedpoint"
+	return ""
+
diff --git a/meta/packages/poppler/poppler.inc b/meta/packages/poppler/poppler.inc
new file mode 100644
index 000000000..c33d6f0ea
--- /dev/null
+++ b/meta/packages/poppler/poppler.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
+DEPENDS = "fontconfig jpeg zlib gtk+ cairo"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --enable-xpdf-headers \
+		 --disable-gtk-test \
+		 --disable-poppler-qt --disable-poppler-qt4 \
+		 --enable-zlib \
+	       "
+
+#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+require poppler-fpu.inc
+EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
+
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/meta/packages/poppler/poppler_0.6.bb b/meta/packages/poppler/poppler_0.6.bb
new file mode 100644
index 000000000..92c25bc0a
--- /dev/null
+++ b/meta/packages/poppler/poppler_0.6.bb
@@ -0,0 +1,2 @@
+require poppler.inc
+PR = "r2"
-- 
cgit v1.2.3