diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:21:24 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:21:24 +0000 |
commit | 86d1d8cd13335c4dca722ac398c69a105fc9ac8f (patch) | |
tree | bf7433f99e0fc0ffbdbddd24c2201d21a9dd60e8 /packages/gaim | |
parent | 249a5476b2d2ec15e71b126bb02bc885b29604ee (diff) | |
parent | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (diff) |
explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
and 'd5130c6d17c31fa91dee51b0074c7e5e8c87717c'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/gaim')
-rw-r--r-- | packages/gaim/gaim.inc | 2 | ||||
-rw-r--r-- | packages/gaim/gaim_2.0.0-cvs-mco1.bb | 4 | ||||
-rw-r--r-- | packages/gaim/gaim_cvs.bb | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/packages/gaim/gaim.inc b/packages/gaim/gaim.inc index 4b5f22b515..83b03f8527 100644 --- a/packages/gaim/gaim.inc +++ b/packages/gaim/gaim.inc @@ -21,6 +21,8 @@ FILES_${PN}-dev += "${libdir}/gaim/*.la" inherit autotools gettext +PACKAGES_DYNAMIC = "gaim-protocol-*" + python populate_packages_prepend () { root = bb.data.expand('${libdir}/gaim', d) diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/gaim/gaim_2.0.0-cvs-mco1.bb index 6b45a89461..7160d8120f 100644 --- a/packages/gaim/gaim_2.0.0-cvs-mco1.bb +++ b/packages/gaim/gaim_2.0.0-cvs-mco1.bb @@ -1,6 +1,6 @@ PR = "r3" -CVSDATE_${PN} = "20050904" -PV = "2.0.0-cvs-mco1-${CVSDATE}" +SRCDATE_${PN} = "20050904" +PV = "2.0.0+cvs${SRCDATE}-mco1" WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim" diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb index cc77b41772..3daaf44c19 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -1,5 +1,5 @@ PR = "r0" -PV = "2.0+cvs-${CVSDATE}" +PV = "2.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://no-superimposed-version-on-logo.patch;patch=1 \ |