From d0e82a364c7e5145486ca935921654fc12ba84c8 Mon Sep 17 00:00:00 2001
From: Vivian Zhang <vivian.zhang@intel.com>
Date: Mon, 10 Nov 2008 16:59:38 +0800
Subject: Moved gypsy from meta-extras to meta and upgraded it to 0.6

---
 meta-extras/packages/gypsy/files/fixups.patch | 19 -------------------
 meta-extras/packages/gypsy/gypsy.inc          | 14 --------------
 meta-extras/packages/gypsy/gypsy_svn.bb       |  9 ---------
 meta/packages/gypsy/files/fixups.patch        | 19 +++++++++++++++++++
 meta/packages/gypsy/gypsy.inc                 | 14 ++++++++++++++
 meta/packages/gypsy/gypsy_0.6.bb              | 10 ++++++++++
 meta/packages/gypsy/gypsy_svn.bb              |  9 +++++++++
 7 files changed, 52 insertions(+), 42 deletions(-)
 delete mode 100644 meta-extras/packages/gypsy/files/fixups.patch
 delete mode 100644 meta-extras/packages/gypsy/gypsy.inc
 delete mode 100644 meta-extras/packages/gypsy/gypsy_svn.bb
 create mode 100644 meta/packages/gypsy/files/fixups.patch
 create mode 100644 meta/packages/gypsy/gypsy.inc
 create mode 100644 meta/packages/gypsy/gypsy_0.6.bb
 create mode 100644 meta/packages/gypsy/gypsy_svn.bb

diff --git a/meta-extras/packages/gypsy/files/fixups.patch b/meta-extras/packages/gypsy/files/fixups.patch
deleted file mode 100644
index 8bc8c5cbac..0000000000
--- a/meta-extras/packages/gypsy/files/fixups.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- docs/reference/Makefile.am |    2 ++
- 1 file changed, 2 insertions(+)
-
---- gypsy.orig/docs/reference/Makefile.am
-+++ gypsy/docs/reference/Makefile.am
-@@ -81,10 +81,12 @@ expand_content_files=
- # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
- 
- INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS)
- GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS)
- 
-+EXTRA_DIST =
-+CLEANFILES =
- # This includes the standard gtk-doc make rules, copied by gtkdocize.
- include $(top_srcdir)/gtk-doc.make
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
diff --git a/meta-extras/packages/gypsy/gypsy.inc b/meta-extras/packages/gypsy/gypsy.inc
deleted file mode 100644
index 456d9fb6a5..0000000000
--- a/meta-extras/packages/gypsy/gypsy.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "GPS Controlling Daemon"
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 dbus bluez-libs dbus-glib"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF += "--with-distro=debian"
-
-do_configure_prepend () {
-	touch ${S}/gtk-doc.make
-}
-
-FILES_${PN} += "/usr/share/dbus-1/services/"
diff --git a/meta-extras/packages/gypsy/gypsy_svn.bb b/meta-extras/packages/gypsy/gypsy_svn.bb
deleted file mode 100644
index ac1b6bc12f..0000000000
--- a/meta-extras/packages/gypsy/gypsy_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require gypsy.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-PV = "0.0+svnr${SRCREV}"
-S = "${WORKDIR}/${PN}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \
-           file://fixups.patch;patch=1"
diff --git a/meta/packages/gypsy/files/fixups.patch b/meta/packages/gypsy/files/fixups.patch
new file mode 100644
index 0000000000..8bc8c5cbac
--- /dev/null
+++ b/meta/packages/gypsy/files/fixups.patch
@@ -0,0 +1,19 @@
+---
+ docs/reference/Makefile.am |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- gypsy.orig/docs/reference/Makefile.am
++++ gypsy/docs/reference/Makefile.am
+@@ -81,10 +81,12 @@ expand_content_files=
+ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+ 
+ INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS)
+ GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS)
+ 
++EXTRA_DIST =
++CLEANFILES =
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+ include $(top_srcdir)/gtk-doc.make
+ 
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
diff --git a/meta/packages/gypsy/gypsy.inc b/meta/packages/gypsy/gypsy.inc
new file mode 100644
index 0000000000..456d9fb6a5
--- /dev/null
+++ b/meta/packages/gypsy/gypsy.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "GPS Controlling Daemon"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 dbus bluez-libs dbus-glib"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += "--with-distro=debian"
+
+do_configure_prepend () {
+	touch ${S}/gtk-doc.make
+}
+
+FILES_${PN} += "/usr/share/dbus-1/services/"
diff --git a/meta/packages/gypsy/gypsy_0.6.bb b/meta/packages/gypsy/gypsy_0.6.bb
new file mode 100644
index 0000000000..68a07ffcd7
--- /dev/null
+++ b/meta/packages/gypsy/gypsy_0.6.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "GPS Controlling Daemon"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 dbus bluez-libs dbus-glib libxslt"
+
+SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-${PV}.tar.gz" 
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "/usr/share/dbus-1/services/"
diff --git a/meta/packages/gypsy/gypsy_svn.bb b/meta/packages/gypsy/gypsy_svn.bb
new file mode 100644
index 0000000000..ac1b6bc12f
--- /dev/null
+++ b/meta/packages/gypsy/gypsy_svn.bb
@@ -0,0 +1,9 @@
+require gypsy.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.0+svnr${SRCREV}"
+S = "${WORKDIR}/${PN}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \
+           file://fixups.patch;patch=1"
-- 
cgit v1.2.3-54-g00ecf