merge of '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'

     and 'bc1bceb6bfab051d162269a77df02ea351b62358'

diff --git a/packages/libnotify/libnotify_0.4.2.bb b/packages/libnotify/libnotify_0.4.2.bb
deleted file mode 100644 (file)
index f3f3aff..0000000
--- a/packages/libnotify/libnotify_0.4.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION =  "sends desktop notifications to a notification daemon"
-HOMEPAGE =     "http://www.galago-project.org/"
-LICENSE =      "LGPL"
-DEPENDS =      "dbus gtk+"
-PR =           "r0"
-
-SRC_URI =      "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-       autotools_stage_all
-}

diff --git a/packages/libnotify/libnotify_0.4.3.bb b/packages/libnotify/libnotify_0.4.3.bb
deleted file mode 100644 (file)
index f3f3aff..0000000
--- a/packages/libnotify/libnotify_0.4.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION =  "sends desktop notifications to a notification daemon"
-HOMEPAGE =     "http://www.galago-project.org/"
-LICENSE =      "LGPL"
-DEPENDS =      "dbus gtk+"
-PR =           "r0"
-
-SRC_URI =      "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-       autotools_stage_all
-}

diff --git a/packages/libnotify/libnotify_0.4.4.bb b/packages/libnotify/libnotify_0.4.4.bb
index f3f3aff..9152133 100644 (file)
--- a/packages/libnotify/libnotify_0.4.4.bb
+++ b/packages/libnotify/libnotify_0.4.4.bb
@@ -1,10 +1,11 @@
-DESCRIPTION =  "sends desktop notifications to a notification daemon"
-HOMEPAGE =     "http://www.galago-project.org/"
-LICENSE =      "LGPL"
-DEPENDS =      "dbus gtk+"
-PR =           "r0"
+DESCRIPTION = "Send desktop notifications to a notification daemon"
+HOMEPAGE = "http://www.galago-project.org/"
+SECTION = "libs"
+LICENSE = "LGPL"
+DEPENDS = "dbus gtk+"
+PR = "r0"
 
-SRC_URI =      "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 

diff --git a/packages/notification-daemon/notification-daemon_0.3.5.bb b/packages/notification-daemon/notification-daemon_0.3.5.bb
deleted file mode 100644 (file)
index 791c285..0000000
--- a/packages/notification-daemon/notification-daemon_0.3.5.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "a dbus service that listens to desktop notification requests and displays them"
-HOMEPAGE = "http://www.galago-project.org/"
-LICENSE = "GPL"
-DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
-
-PACKAGES = "${PN}"
-FILES_${PN} = "${libexecdir}/notification-daemon \
-       ${datadir}/dbus-1/services/notification-daemon.service \
-       ${libdir}/notification-daemon-1.0/engines/libstandard.so \
-       ${sysconfdir}/gconf/schemas/notification-daemon.schemas"
-
-SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"
-EXTRA_OECONF = "--disable-binreloc"
-
-inherit autotools pkgconfig

diff --git a/packages/notification-daemon/notification-daemon_0.3.6.bb b/packages/notification-daemon/notification-daemon_0.3.6.bb
index 8ee89ea..ee0f597 100644 (file)
--- a/packages/notification-daemon/notification-daemon_0.3.6.bb
+++ b/packages/notification-daemon/notification-daemon_0.3.6.bb
@@ -1,16 +1,21 @@
-DESCRIPTION = "a dbus service that listens to desktop notification requests and displays them"
+DESCRIPTION = "A dbus service that listens to desktop notification requests and displays them"
 HOMEPAGE = "http://www.galago-project.org/"
+SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
-
-PACKAGES = "${PN}"
-FILES_${PN} = "${libexecdir}/notification-daemon \
-       ${datadir}/dbus-1/services/notification-daemon.service \
-       ${libdir}/notification-daemon-1.0/engines/libstandard.so \
-       ${sysconfdir}/gconf/schemas/notification-daemon.schemas"
+PR = "r1"
 
 SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
-       file://dbus-glib-tool-prefix.patch;patch=1"
-EXTRA_OECONF = "--disable-binreloc"
+           file://dbus-glib-tool-prefix.patch;patch=1"
+
+EXTRA_OECONF = "--disable-binreloc"
 
 inherit autotools pkgconfig
+
+PACKAGES = "${PN}"
+FILES_${PN} = "\
+  ${libexecdir}/notification-daemon \
+  ${datadir}/dbus-1/services \
+  ${libdir}/notification-daemon-1.0/engines/libstandard.so \
+  ${sysconfdir}/gconf/schemas/notification-daemon.schemas \
+"

diff --git a/packages/notification-daemon/notification-daemon_0.3.7.bb b/packages/notification-daemon/notification-daemon_0.3.7.bb
new file mode 100644 (file)
index 0000000..43721f5
--- /dev/null
+++ b/packages/notification-daemon/notification-daemon_0.3.7.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "A dbus service that listens to desktop notification requests and displays them"
+HOMEPAGE = "http://www.galago-project.org/"
+SECTION = "x11"
+LICENSE = "GPL"
+DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
+
+SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"
+
+EXTRA_OECONF = "--disable-binreloc"
+
+inherit autotools pkgconfig
+
+PACKAGES = "${PN}"
+FILES_${PN} = "\
+  ${libexecdir}/notification-daemon \
+  ${datadir}/dbus-1/services/ \
+  ${libdir}/notification-daemon-1.0/engines/libstandard.so \
+  ${sysconfdir}/gconf/schemas/notification-daemon.schemas \
+"