[oe-commits] org.oe.dev gpephone: Unify all SVN recipes, fix several issues.

florian commit openembedded-commits at lists.openembedded.org
Tue Jan 15 16:12:41 UTC 2008


gpephone: Unify all SVN recipes, fix several issues.

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 3a9c0f4a00528662d37b097973dd3b51287562c4
ViewMTN: http://monotone.openembedded.org/revision/info/3a9c0f4a00528662d37b097973dd3b51287562c4
Files:
1
packages/gpephone/addressbook_svn.bb
packages/gpephone/contact_svn.bb
packages/gpephone/firewall_svn.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gpephone/libabenabler2_svn.bb
packages/gpephone/libabenabler_svn.bb
packages/gpephone/libcalenabler2_svn.bb
packages/gpephone/libmsgenabler_1.0.bb
packages/gpephone/librecord2_svn.bb
packages/gpephone/libsettings_svn.bb
packages/gpephone/machined_svn.bb
packages/gpephone/ptim-engine_svn.bb
packages/gpephone/ptim-headers_svn.bb
packages/gpephone/ptim-helper_svn.bb
packages/gpephone/ptim-manager_svn.bb
packages/gpephone/quickdial_svn.bb
packages/gpephone/useen_svn.bb
Diffs:

#
# mt diff -r64c06913c22a9e5e86178b37c2a23bd8aa5baf77 -r3a9c0f4a00528662d37b097973dd3b51287562c4
#
# 
# 
# patch "packages/gpephone/addressbook_svn.bb"
#  from [109115b4d8175a5c26d96375484eac86020f1fc3]
#    to [2f736f148a7f8733f862502f7ea15dc9a7818a00]
# 
# patch "packages/gpephone/contact_svn.bb"
#  from [2bdcfd37fa7331f354b090527f502870cee6fea5]
#    to [7972b2952ee56c26a4f9768c0d579d27d14c9b1f]
# 
# patch "packages/gpephone/firewall_svn.bb"
#  from [707e5f62435c7c0130c795babdbe705aced3f0e8]
#    to [2d0b3255aeb70f0b2d0c7b4926484b4954ed2372]
# 
# patch "packages/gpephone/gpe-applauncher_svn.bb"
#  from [4d20c813ad46630580e0ffc689c3794f8154fff7]
#    to [6440fe8aa26c874ff5b0ef8ba11e739418a62743]
# 
# patch "packages/gpephone/libabenabler2_svn.bb"
#  from [6cedd4eaaae17335f9912cbdd4124a86765aae34]
#    to [22f1cd9eeaa95300a79ed51b8b2a097c6567a0d4]
# 
# patch "packages/gpephone/libabenabler_svn.bb"
#  from [8fbbb2915a10d96ef59cee640bc880d3fba234cb]
#    to [cb7b0bf422e58f8c25ab31340031100f7fcd894d]
# 
# patch "packages/gpephone/libcalenabler2_svn.bb"
#  from [ca595393866e1e0b2240421e240db9ddbefbedff]
#    to [5b6055aa245611a73721654f2dd87047930cbb27]
# 
# patch "packages/gpephone/libmsgenabler_1.0.bb"
#  from [10f73c41814056d4275d16b2685ca899455ef739]
#    to [71441c3a8ea417a1e08ecae7245f9d759c690c3c]
# 
# patch "packages/gpephone/librecord2_svn.bb"
#  from [b437eb625142c9037b79657bf84ba5305ae560e2]
#    to [d22430f9f2e594e66730d1beb973b3690d08702d]
# 
# patch "packages/gpephone/libsettings_svn.bb"
#  from [3ec47b4c7f7282f6b14237e73d2fc1fec4ec2701]
#    to [b0e07271b04905ad3a3458893e93c4b54635fbe3]
# 
# patch "packages/gpephone/machined_svn.bb"
#  from [b1aa2bc7c8b777a29ced8ae606722efa408e1301]
#    to [7e9b0c026c20bc06b7096008d90923bd86524633]
# 
# patch "packages/gpephone/ptim-engine_svn.bb"
#  from [ef51d9a661f2eb0e31b90b646ef0763265f8e070]
#    to [3cbbae29d72d3c01316172678ad3f68817878123]
# 
# patch "packages/gpephone/ptim-headers_svn.bb"
#  from [f87f52cf9dd3b0fbbcd93b9dc26924797234e78b]
#    to [ad9799e1762c1048057c6521901d7c0ca0285b24]
# 
# patch "packages/gpephone/ptim-helper_svn.bb"
#  from [513ccb848c66db512ec88c73d15970eb5210a843]
#    to [aa8aaf8204bc0e79b11602028b16ba56764f4c29]
# 
# patch "packages/gpephone/ptim-manager_svn.bb"
#  from [e0ddcec53b318d7b7301948e99d5a260791f538f]
#    to [52d2b87ce5e5642e3f2f11f97e4e11b64ef8af70]
# 
# patch "packages/gpephone/quickdial_svn.bb"
#  from [5a7854af3e370761f2adf68476bdf0c2eea3e7d1]
#    to [65c4c197535acedd5ba6cfdfc84531ed2906f358]
# 
# patch "packages/gpephone/useen_svn.bb"
#  from [df6794b692b6307ab4efda6349b60b4a0680e420]
#    to [c877d081287cc4561ce042aa75ea9d9a610103b3]
# 
============================================================
--- packages/gpephone/addressbook_svn.bb	109115b4d8175a5c26d96375484eac86020f1fc3
+++ packages/gpephone/addressbook_svn.bb	2f736f148a7f8733f862502f7ea15dc9a7818a00
@@ -1,9 +1,9 @@ PR          = "r0"
 LICENSE     = "LiPS"
 DESCRIPTION = "LiPS address book"
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/gpephone/contact_svn.bb	2bdcfd37fa7331f354b090527f502870cee6fea5
+++ packages/gpephone/contact_svn.bb	7972b2952ee56c26a4f9768c0d579d27d14c9b1f
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ libgpephone dbus-glib li
 DESCRIPTION = "G(PE)^2 address book v2"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget"
-PV = "0.0+svn-${SRCREV}"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
 inherit gpephone autotools
============================================================
--- packages/gpephone/firewall_svn.bb	707e5f62435c7c0130c795babdbe705aced3f0e8
+++ packages/gpephone/firewall_svn.bb	2d0b3255aeb70f0b2d0c7b4926484b4954ed2372
@@ -5,8 +5,6 @@ PV = "0.0+svnr-${SRCREV}"
 PR          = "r0"
 PV = "0.0+svnr-${SRCREV}"
 
-SRCREV_pn-${PN} ?= "1400"
-
 DEFAULT_PREFERENCE = "-1"
 
 DEPENDS = "gtk+ libmsgenabler libabenabler libiac libgpewidget libgpephone gconf-dbus"
============================================================
--- packages/gpephone/gpe-applauncher_svn.bb	4d20c813ad46630580e0ffc689c3794f8154fff7
+++ packages/gpephone/gpe-applauncher_svn.bb	6440fe8aa26c874ff5b0ef8ba11e739418a62743
@@ -1,9 +1,9 @@ PR          = "r1"
 LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r1"
-PV          = "0.11+svn-${SRCREV}"
+PV          = "0.11+svnr-${SRCREV}"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/libabenabler2_svn.bb	6cedd4eaaae17335f9912cbdd4124a86765aae34
+++ packages/gpephone/libabenabler2_svn.bb	22f1cd9eeaa95300a79ed51b8b2a097c6567a0d4
@@ -1,17 +1,17 @@ DEPENDS = "glib-2.0 librecord2 gconf sql
 DESCRIPTION = "LiPS address book library."
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 librecord2 gconf sqlite3"
-PV = "0.0+svn-${SRCDATE}"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
+inherit gpephone pkgconfig autotools
+
 SRC_URI = "${GPEPHONE_SVN}"
 
 S = "${WORKDIR}/${PN}"
 
-inherit gpephone pkgconfig autotools
-
 do_stage () {
         autotools_stage_all
 }
============================================================
--- packages/gpephone/libabenabler_svn.bb	8fbbb2915a10d96ef59cee640bc880d3fba234cb
+++ packages/gpephone/libabenabler_svn.bb	cb7b0bf422e58f8c25ab31340031100f7fcd894d
@@ -1,10 +1,10 @@ PR          = "r0"
 LICENSE     = "LGPL"
 DESCRIPTION = "LiPS address book library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord liblipsevent libim sqlite3"
 PR          = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/gpephone/libcalenabler2_svn.bb	ca595393866e1e0b2240421e240db9ddbefbedff
+++ packages/gpephone/libcalenabler2_svn.bb	5b6055aa245611a73721654f2dd87047930cbb27
@@ -1,18 +1,17 @@ LICENSE = "LiPS"
 DESCRIPTION = "LiPS calendar API."
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LiPS"
-DEPENDS = "glib-2.0 sqlite3 libical"
-PV = "0.0+svn-${SRCREV}"
+DEPENDS = "glib-2.0 sqlite3 libical libalmmgr"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
-SRC_URI = "${GPEPHONE_SVN}"
 
-S = "${WORKDIR}/${PN}"
+inherit gpephone pkgconfig autotools
 
-GPE_TARBALL_SUFFIX = "bz2"
+SRC_URI = "${GPEPHONE_SVN}"
 
-inherit gpephone pkgconfig autotools
+S = "${WORKDIR}/${PN}"
 
 do_stage () {
     autotools_stage_all
============================================================
--- packages/gpephone/libmsgenabler_1.0.bb	10f73c41814056d4275d16b2685ca899455ef739
+++ packages/gpephone/libmsgenabler_1.0.bb	71441c3a8ea417a1e08ecae7245f9d759c690c3c
@@ -1,14 +1,16 @@ DEPENDS     = "glib-2.0 dbus-glib librec
 LICENSE     = "LiPS"
 DESCRIPTION = "LiPS message backend library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 dbus-glib librecord sqlite3"
-PR          = "r0"
+PR          = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpephone pkgconfig autotools
 
+FILES_${PN} += "$(datadir)/libmsgenabler"
+
 do_stage () {
 	autotools_stage_all
 }
============================================================
--- packages/gpephone/librecord2_svn.bb	b437eb625142c9037b79657bf84ba5305ae560e2
+++ packages/gpephone/librecord2_svn.bb	d22430f9f2e594e66730d1beb973b3690d08702d
@@ -1,10 +1,10 @@ PR          = "r0"
 LICENSE     = "LiPS"
 DESCRIPTION = "LiPS database API."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
 PR          = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/gpephone/libsettings_svn.bb	3ec47b4c7f7282f6b14237e73d2fc1fec4ec2701
+++ packages/gpephone/libsettings_svn.bb	b0e07271b04905ad3a3458893e93c4b54635fbe3
@@ -1,9 +1,9 @@ DEPENDS = "glib-2.0 gconf-dbus"
 DESCRIPTION = "G(PE)^2 settings API library"
 SECTION = "gpe/libs"
 PRIORITY = "required"
 LICENSE = "LiPS"
 DEPENDS = "glib-2.0 gconf-dbus"
-PV = "0.0+svn-${SRCDATE}"
+PV = "0.0+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/gpephone/machined_svn.bb	b1aa2bc7c8b777a29ced8ae606722efa408e1301
+++ packages/gpephone/machined_svn.bb	7e9b0c026c20bc06b7096008d90923bd86524633
@@ -1,9 +1,9 @@ DEPENDS = "glib-2.0 dbus-glib gtk+"
 DESCRIPTION = "Device abstraction and support daemon"
 SECTION = "gpephone"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 dbus-glib gtk+"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/ptim-engine_svn.bb	ef51d9a661f2eb0e31b90b646ef0763265f8e070
+++ packages/gpephone/ptim-engine_svn.bb	3cbbae29d72d3c01316172678ad3f68817878123
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ ptim-headers"
 DESCRIPTION = "Phone input method engine"
 SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/ptim-headers_svn.bb	f87f52cf9dd3b0fbbcd93b9dc26924797234e78b
+++ packages/gpephone/ptim-headers_svn.bb	ad9799e1762c1048057c6521901d7c0ca0285b24
@@ -1,9 +1,9 @@ DEPENDS = "gtk+"
 DESCRIPTION = "Phone input method - shared headers"
 SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 inherit gpephone pkgconfig autotools
 
============================================================
--- packages/gpephone/ptim-helper_svn.bb	513ccb848c66db512ec88c73d15970eb5210a843
+++ packages/gpephone/ptim-helper_svn.bb	aa8aaf8204bc0e79b11602028b16ba56764f4c29
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ ptim-headers"
 DESCRIPTION = "Phone input method helper module"
 SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/ptim-manager_svn.bb	e0ddcec53b318d7b7301948e99d5a260791f538f
+++ packages/gpephone/ptim-manager_svn.bb	52d2b87ce5e5642e3f2f11f97e4e11b64ef8af70
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ ptim-headers libiac"
 DESCRIPTION = "Phone input method manager module"
 SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers libiac"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/quickdial_svn.bb	5a7854af3e370761f2adf68476bdf0c2eea3e7d1
+++ packages/gpephone/quickdial_svn.bb	65c4c197535acedd5ba6cfdfc84531ed2906f358
@@ -5,11 +5,9 @@ PV = "0.0+svnr-${SRCREV}"
 PR          = "r0"
 PV = "0.0+svnr-${SRCREV}"
 
-SRCREV_pn-${PN} ?= "1393"
-
 DEFAULT_PREFERENCE = "-1"
 
-DEPENDS = "gtk+ librecord2 libgpephone hiker"
+DEPENDS = "gtk+ librecord2 libgpephone"
 
 inherit gpephone autotools pkgconfig
 
@@ -17,5 +15,6 @@ S = "${WORKDIR}/${PN}"
 
 S = "${WORKDIR}/${PN}"
 
+EXTRA_OECONF = "--disable-hiker"
 
 FILES_${PN} += "${datadir}/qdial/database"
============================================================
--- packages/gpephone/useen_svn.bb	df6794b692b6307ab4efda6349b60b4a0680e420
+++ packages/gpephone/useen_svn.bb	c877d081287cc4561ce042aa75ea9d9a610103b3
@@ -5,8 +5,6 @@ PV = "0.0+svnr-${SRCREV}"
 PR          = "r0"
 PV = "0.0+svnr-${SRCREV}"
 
-SRCREV_pn-${PN} ?= "1400"
-
 DEFAULT_PREFERENCE = "-1"
 
 DEPENDS = "glib-2.0"






More information about the Openembedded-commits mailing list