diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-30 13:27:57 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-30 13:27:57 +0000 |
| commit | c51133644c2ea2b1e75e962ccc6d24cdc107ff1c (patch) | |
| tree | e760429f95e745a66ad67ec29996e516a4867943 | |
| parent | a9784bef976a1bee8cb58f2422fc6e9055ff8090 (diff) | |
| parent | 582c7a75d0b25062783b087ffcc6cd4a3cd86f4c (diff) | |
merge of '6f0db148d82d30078ed867182e31679b32d6fe62'
and '844f33ecedcd7290081e897e5557e7a5b56b5724'
| -rw-r--r-- | packages/openmoko-pim/openmoko-dates_svn.bb | 5 | ||||
| -rw-r--r-- | packages/pimlico/dates.inc | 3 | ||||
| -rw-r--r-- | packages/pimlico/dates_0.3.1.bb | 2 | ||||
| -rw-r--r-- | packages/pimlico/dates_svn.bb | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index cc5978f546..af927ddc47 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -3,10 +3,9 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" -RCONFLICTS = "dates" -RREPLACES = "dates" +RCONFLICTS_${PN} = "dates" PV = "0.1+svn${SRCDATE}" -PR = "r7" +PR = "r8" inherit gnome autotools pkgconfig gtk-icon-cache diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index 641ff60aea..4f92b2c767 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -3,8 +3,7 @@ LICENSE = "LGPL" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" RDEPENDS = "libedata-cal" -RCONFLICTS = "openmoko-dates" -RREPLACES = "openmoko-dates" +RCONFLICTS_${PN} = "openmoko-dates" inherit autotools pkgconfig gtk-icon-cache diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb index 731ca31289..176d2b9077 100644 --- a/packages/pimlico/dates_0.3.1.bb +++ b/packages/pimlico/dates_0.3.1.bb @@ -1,5 +1,5 @@ require dates.inc -PR = "r2" +PR = "r3" SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index 956eb3dc64..cac0eb4fae 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,6 +1,6 @@ require dates.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" |