[oe-commits] org.oe.dev merge of 'b359934132c00e5f2526bdc32d64426a6a981342'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:27:58 UTC 2007
merge of 'b359934132c00e5f2526bdc32d64426a6a981342'
and 'ff65430b509a09da4f9af915b0a172be205ba8d3'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: be71d5d419cf2691925b6df8c960264a219ea468
ViewMTN: http://monotone.openembedded.org/revision.psp?id=be71d5d419cf2691925b6df8c960264a219ea468
Files:
1
packages/pimlico/contacts_0.3.bb
packages/pimlico/contacts_0.4.bb
packages/pimlico/tasks_0.2.bb
packages/pimlico/tasks_0.4.bb
packages/pimlico/contacts.inc
packages/pimlico/dates.inc
packages/pimlico/tasks.inc
packages/pimlico/tasks_svn.bb
packages/pimlico/contacts_svn.bb
packages/pimlico/dates_0.3.1.bb
packages/pimlico/dates_svn.bb
packages/tasks/task-base.bb
Diffs:
#
# mt diff -rb359934132c00e5f2526bdc32d64426a6a981342 -rbe71d5d419cf2691925b6df8c960264a219ea468
#
#
# no changes
#
#
# mt diff -rff65430b509a09da4f9af915b0a172be205ba8d3 -rbe71d5d419cf2691925b6df8c960264a219ea468
#
#
#
# rename "packages/pimlico/contacts_0.3.bb"
# to "packages/pimlico/contacts_0.4.bb"
#
# rename "packages/pimlico/tasks_0.2.bb"
# to "packages/pimlico/tasks_0.4.bb"
#
# add_file "packages/pimlico/contacts.inc"
# content [38562bb570c26dae7efe5495e05642d1e60d2401]
#
# add_file "packages/pimlico/dates.inc"
# content [a64609f3f3056abc3ec4fb11dcea81c42a9757cb]
#
# add_file "packages/pimlico/tasks.inc"
# content [7fe2986be6824773545f4c004d522c8cc8dc3ebe]
#
# add_file "packages/pimlico/tasks_svn.bb"
# content [e8bd8796ee8a1316a5108ca339c5341100d0c400]
#
# patch "packages/pimlico/contacts_0.4.bb"
# from [5e4b6bb67ea2d4131cf93cedc4e9a0066ca62d27]
# to [66b347c3844418209c135658ff6be9b558d018e3]
#
# patch "packages/pimlico/contacts_svn.bb"
# from [e58db632431846e231a58595a85ff8b371dd3991]
# to [235a8abb5e9ef9ed32a7c269154b59e8682f6504]
#
# patch "packages/pimlico/dates_0.3.1.bb"
# from [e15f25db929a0de65c10e4800a9d1d5bc9885251]
# to [0d82614c9974a690d03a027b66595d92a965b882]
#
# patch "packages/pimlico/dates_svn.bb"
# from [b21e6a4fa06d37cff2da111686e26f8970b8ddf0]
# to [e18884ca4c8f458513d4f2b4b896dcb49a4a267c]
#
# patch "packages/pimlico/tasks_0.4.bb"
# from [fac36702109ce52dd4a04eb1f8ca5c20399a6e2e]
# to [c21fccd9b2ad183d0cc7168475f99e3f75c89937]
#
# patch "packages/tasks/task-base.bb"
# from [b8ef97e2c3d9d8192eff9668ddbfaded5d22fcef]
# to [83aab91cd9208b0a8eb3faa8dc7b5fb6b213f4f2]
#
============================================================
--- packages/pimlico/contacts.inc 38562bb570c26dae7efe5495e05642d1e60d2401
+++ packages/pimlico/contacts.inc 38562bb570c26dae7efe5495e05642d1e60d2401
@@ -0,0 +1,16 @@
+DESCRIPTION = "Address-book application."
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ eds-dbus"
+RDEPENDS = "libedata-book"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+ install -d ${D}/${datadir}/pixmaps
+ install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
+ install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
+}
+
+FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
+ ${datadir}/pixmaps/stock_person.png"
============================================================
--- packages/pimlico/dates.inc a64609f3f3056abc3ec4fb11dcea81c42a9757cb
+++ packages/pimlico/dates.inc a64609f3f3056abc3ec4fb11dcea81c42a9757cb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Dates is a calendar application."
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+RDEPENDS = "libedata-cal"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+# EXTRA_OECONF = "--disable-debug"
+
+FILES_${PN} += "${datadir}/pixmaps/dates.png"
+
+do_install_append () {
+ install -d ${D}/${datadir}/pixmaps
+ install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
+}
+
============================================================
--- packages/pimlico/tasks.inc 7fe2986be6824773545f4c004d522c8cc8dc3ebe
+++ packages/pimlico/tasks.inc 7fe2986be6824773545f4c004d522c8cc8dc3ebe
@@ -0,0 +1,6 @@
+DESCRIPTION = "Task list application"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ eds-dbus"
+
+inherit autotools pkgconfig gtk-icon-cache
============================================================
--- packages/pimlico/tasks_svn.bb e8bd8796ee8a1316a5108ca339c5341100d0c400
+++ packages/pimlico/tasks_svn.bb e8bd8796ee8a1316a5108ca339c5341100d0c400
@@ -0,0 +1,8 @@
+require tasks.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.4+svn${SRCDATE}"
+S = "${WORKDIR}/trunk"
+
+SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
============================================================
--- packages/pimlico/contacts_0.3.bb 5e4b6bb67ea2d4131cf93cedc4e9a0066ca62d27
+++ packages/pimlico/contacts_0.4.bb 66b347c3844418209c135658ff6be9b558d018e3
@@ -1,25 +1,5 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ eds-dbus"
-RDEPENDS = "libedata-book"
-DESCRIPTION = "Contacts is an address-book application."
+require contacts.inc
-PR = "r1"
-
SRC_URI = "http://projects.o-hand.com/sources/${PN}/${PN}-${PV}.tar.gz \
file://stock_contact.png \
file://stock_person.png"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-do_install_append () {
- install -d ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
-}
-
-FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
- ${datadir}/pixmaps/stock_person.png"
-
============================================================
--- packages/pimlico/contacts_svn.bb e58db632431846e231a58595a85ff8b371dd3991
+++ packages/pimlico/contacts_svn.bb 235a8abb5e9ef9ed32a7c269154b59e8682f6504
@@ -1,29 +1,17 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus gnome-vfs"
-RDEPENDS = "gnome-vfs-plugin-file"
-RRECOMMENDS = "gnome-vfs-plugin-http"
-DESCRIPTION = "Contacts is an address-book application."
-PR = "r5"
+require contacts.inc
-PV = "0.1+svn${SRCDATE}"
+#DEPENDS += "gnome-vfs"
+#RDEPENDS += "gnome-vfs-plugin-file"
+#RRECOMMENDS += "gnome-vfs-plugin-http"
+PV = "0.4+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
file://stock_contact.png \
file://stock_person.png"
-inherit autotools pkgconfig
-
S = "${WORKDIR}/trunk"
+#EXTRA_OECONF = "--enable-gnome-vfs"
-EXTRA_OECONF = "--enable-gnome-vfs"
-
-do_install_append () {
- install -d ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
-}
-
-FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
- ${datadir}/pixmaps/stock_person.png"
-
============================================================
--- packages/pimlico/dates_0.3.1.bb e15f25db929a0de65c10e4800a9d1d5bc9885251
+++ packages/pimlico/dates_0.3.1.bb 0d82614c9974a690d03a027b66595d92a965b882
@@ -1,13 +1,5 @@
-DESCRIPTION = "Dates is a calendar application."
-SECTION = "x11"
-LICENSE = "LGPL"
-PR = "r1"
+require dates.inc
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+PR = "r1"
+SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
-SRC_URI = "http://projects.o-hand.com/sources/dates/${P}.tar.gz"
-
-inherit autotools pkgconfig gtk-icon-cache
-
-FILES_${PN} += "${datadir}/pixmaps/dates.png"
-
============================================================
--- packages/pimlico/dates_svn.bb b21e6a4fa06d37cff2da111686e26f8970b8ddf0
+++ packages/pimlico/dates_svn.bb e18884ca4c8f458513d4f2b4b896dcb49a4a267c
@@ -1,18 +1,8 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-DESCRIPTION = "Dates is a calendar application."
+require dates.inc
-PV = "0.1+svn${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.3.1+svn${SRCDATE}"
S = "${WORKDIR}/trunk"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
-
-inherit autotools pkgconfig gtk-icon-cache
-
-FILES_${PN} += "${datadir}/pixmaps/dates.png"
-
-do_install_append () {
- install -d ${D}/${datadir}/pixmaps
- install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
-}
============================================================
--- packages/pimlico/tasks_0.2.bb fac36702109ce52dd4a04eb1f8ca5c20399a6e2e
+++ packages/pimlico/tasks_0.4.bb c21fccd9b2ad183d0cc7168475f99e3f75c89937
@@ -1,12 +1,3 @@
-DESCRIPTION = "Tasks is a simple TODO application."
-SECTION = "x11"
-LICENSE = "LGPL"
-PR = "r0"
+require tasks.inc
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-
SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz"
-
-inherit autotools pkgconfig gtk-icon-cache
-
-
============================================================
--- packages/tasks/task-base.bb b8ef97e2c3d9d8192eff9668ddbfaded5d22fcef
+++ packages/tasks/task-base.bb 83aab91cd9208b0a8eb3faa8dc7b5fb6b213f4f2
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r20"
+PR = "r21"
PACKAGES = "task-base \
task-base-oh-minimal \
@@ -273,6 +273,7 @@ task-distro-wifi-rrecommends = "\
kernel-module-ieee80211-crypt-ccmp \
kernel-module-ieee80211-crypt-tkip \
kernel-module-ieee80211-crypt-wep \
+ kernel-module-ecb \
kernel-module-arc4 \
kernel-module-michael-mic \
kernel-module-aes"
More information about the Openembedded-commits
mailing list