diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
| commit | c326ad5a1960df22c5efd71bd815b9b12688556e (patch) | |
| tree | 09bd868c4446f3510a070ed601e7b67c6b791cde /recipes/telepathy | |
| parent | dd0fdfe9ed922189f4251c688b7a16faa76cd904 (diff) | |
| parent | 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/tgt/tgt_1.0.5.bb
Diffstat (limited to 'recipes/telepathy')
| -rw-r--r-- | recipes/telepathy/empathy_0.1.bb | 2 | ||||
| -rw-r--r-- | recipes/telepathy/empathy_0.14.bb | 2 | ||||
| -rw-r--r-- | recipes/telepathy/empathy_0.4.bb | 2 | ||||
| -rw-r--r-- | recipes/telepathy/empathy_0.5.bb | 2 | ||||
| -rw-r--r-- | recipes/telepathy/empathy_2.23.90.bb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/recipes/telepathy/empathy_0.1.bb b/recipes/telepathy/empathy_0.1.bb index 299485e668..882d2814da 100644 --- a/recipes/telepathy/empathy_0.1.bb +++ b/recipes/telepathy/empathy_0.1.bb @@ -5,7 +5,7 @@ DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade" RDEPENDS_${PN} = "telepathy-mission-control" RRECOMMENDS_${PN} = "telepathy-gabble" -PR ="r1" +PR = "r2" SRC_URI = "http://projects.collabora.co.uk/~xclaesse/empathy-0.1.tar.gz \ file://no-gnome.diff" diff --git a/recipes/telepathy/empathy_0.14.bb b/recipes/telepathy/empathy_0.14.bb index 374d22d328..0b646a50e0 100644 --- a/recipes/telepathy/empathy_0.14.bb +++ b/recipes/telepathy/empathy_0.14.bb @@ -5,7 +5,7 @@ DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs" RDEPENDS_${PN} = "telepathy-mission-control" RRECOMMENDS_${PN} = "telepathy-gabble" -PR ="r0" +PR = "r1" inherit gnome diff --git a/recipes/telepathy/empathy_0.4.bb b/recipes/telepathy/empathy_0.4.bb index ff69498fdf..0644424441 100644 --- a/recipes/telepathy/empathy_0.4.bb +++ b/recipes/telepathy/empathy_0.4.bb @@ -5,7 +5,7 @@ DEPENDS = "libgnomeui telepathy-mission-control libtelepathy gtk+ gconf libglade RDEPENDS_${PN} = "telepathy-mission-control" RRECOMMENDS_${PN} = "telepathy-gabble" -PR ="r0" +PR = "r1" inherit gnome diff --git a/recipes/telepathy/empathy_0.5.bb b/recipes/telepathy/empathy_0.5.bb index 078eb08f87..29e50f01d8 100644 --- a/recipes/telepathy/empathy_0.5.bb +++ b/recipes/telepathy/empathy_0.5.bb @@ -5,7 +5,7 @@ DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs" RDEPENDS_${PN} = "telepathy-mission-control" RRECOMMENDS_${PN} = "telepathy-gabble" -PR ="r1" +PR = "r2" inherit gnome diff --git a/recipes/telepathy/empathy_2.23.90.bb b/recipes/telepathy/empathy_2.23.90.bb index 95ba85a5d2..78cdac712e 100644 --- a/recipes/telepathy/empathy_2.23.90.bb +++ b/recipes/telepathy/empathy_2.23.90.bb @@ -8,7 +8,7 @@ RRECOMMENDS_${PN} = "telepathy-gabble" inherit gnome PARALLEL_MAKE = "" -PR = "r1" +PR = "r2" PACKAGES =+ "empathy-scrollkeeper-junk" FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper" |