From c18b2b599b9e1e0d63bdacb2ade1ed4fbf49b317 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 29 Jan 2010 15:20:02 +0000
Subject: policykit: Rename to polkit to match upstream and upgrade

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/policykit/policykit-gnome_0.9.2.bb | 19 -------------------
 meta/packages/policykit/policykit_0.9.bb         | 13 -------------
 meta/packages/polkit/polkit-gnome_0.96.bb        | 18 ++++++++++++++++++
 meta/packages/polkit/polkit_0.96.bb              |  9 +++++++++
 4 files changed, 27 insertions(+), 32 deletions(-)
 delete mode 100644 meta/packages/policykit/policykit-gnome_0.9.2.bb
 delete mode 100644 meta/packages/policykit/policykit_0.9.bb
 create mode 100644 meta/packages/polkit/polkit-gnome_0.96.bb
 create mode 100644 meta/packages/polkit/polkit_0.96.bb

(limited to 'meta/packages')

diff --git a/meta/packages/policykit/policykit-gnome_0.9.2.bb b/meta/packages/policykit/policykit-gnome_0.9.2.bb
deleted file mode 100644
index a4a1ad359..000000000
--- a/meta/packages/policykit/policykit-gnome_0.9.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-HOMEPAGE = "http://www.packagekit.org/"
-DEPENDS = "policykit dbus-glib gconf gtk+"
-
-SRC_URI = "http://hal.freedesktop.org/releases/PolicyKit-gnome-${PV}.tar.bz2 \
-          "
-
-EXTRA_OECONF = " --disable-scrollkeeper \
-                 --disable-man-pages \
-                 --disable-examples \
-                 --disable-gtk-doc"
-
-S = "${WORKDIR}/PolicyKit-gnome-${PV}"
-
-inherit autotools_stage pkgconfig
-
-FILES_${PN} += " ${datadir}/dbus-1 \
-                 ${datadir}/PolicyKit \
-               "
-
diff --git a/meta/packages/policykit/policykit_0.9.bb b/meta/packages/policykit/policykit_0.9.bb
deleted file mode 100644
index eed1c0fa8..000000000
--- a/meta/packages/policykit/policykit_0.9.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-HOMEPAGE = "http://www.packagekit.org/"
-PR = "r4"
-
-SRC_URI = "http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz"
-
-
-DEPENDS = "pam expat dbus-glib"
-RDEPENDS = "pam"
-EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc"
-
-S = "${WORKDIR}/PolicyKit-${PV}"
-
-inherit autotools_stage pkgconfig
diff --git a/meta/packages/polkit/polkit-gnome_0.96.bb b/meta/packages/polkit/polkit-gnome_0.96.bb
new file mode 100644
index 000000000..b10847aa5
--- /dev/null
+++ b/meta/packages/polkit/polkit-gnome_0.96.bb
@@ -0,0 +1,18 @@
+HOMEPAGE = "http://www.packagekit.org/"
+DEPENDS = "polkit dbus-glib gconf gtk+"
+
+SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \
+          "
+
+EXTRA_OECONF = " --disable-scrollkeeper \
+                 --disable-man-pages \
+                 --disable-examples \
+                 --disable-gtk-doc \
+                 --disable-introspection "
+
+inherit autotools_stage pkgconfig
+
+FILES_${PN} += " ${datadir}/dbus-1 \
+                 ${datadir}/PolicyKit \
+               "
+
diff --git a/meta/packages/polkit/polkit_0.96.bb b/meta/packages/polkit/polkit_0.96.bb
new file mode 100644
index 000000000..4b9ead854
--- /dev/null
+++ b/meta/packages/polkit/polkit_0.96.bb
@@ -0,0 +1,9 @@
+HOMEPAGE = "http://www.packagekit.org/"
+
+SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz"
+
+DEPENDS = "pam expat dbus-glib eggdbus"
+RDEPENDS = "pam"
+EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
+
+inherit autotools_stage pkgconfig
-- 
cgit v1.2.3