diff options
| author |   Daniel Willmann <daniel@totalueberwachung.de> | 2009-06-25 19:38:54 +0200 |
|---|---|---|
| committer | Daniel Willmann <daniel@totalueberwachung.de> | 2009-06-25 19:38:54 +0200 |
| commit | 8d7b22ddb05c15562d5bd90e14eb68c295869784 (patch) | |
| tree | 878c2a713fe8d6b306a29f5c7a62898c3c94c70b /recipes/openmoko-projects | |
| parent | 5d8462117aeb1723846f5aab81115270d55df87d (diff) | |
| parent | df690bcd0c81d724b2d51a7371dd8ce9084bf73f (diff) | |
| download | openembedded-8d7b22ddb05c15562d5bd90e14eb68c295869784.tar.gz | |
Merge branch 'shr/import' of git@git.openembedded.org:openembedded into shr/import
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/freesmartphone/frameworkd_git.bb
recipes/freesmartphone/libfso-glib_git.bb
recipes/openmoko-projects/paroli_git.bb
Diffstat (limited to 'recipes/openmoko-projects')
| -rw-r--r-- | recipes/openmoko-projects/paroli-elementary_git.bb | 16 | ||||
| -rw-r--r-- | recipes/openmoko-projects/paroli_git.bb | 4 |
2 files changed, 2 insertions, 18 deletions
diff --git a/recipes/openmoko-projects/paroli-elementary_git.bb b/recipes/openmoko-projects/paroli-elementary_git.bb deleted file mode 100644 index 3afa4d949a..0000000000 --- a/recipes/openmoko-projects/paroli-elementary_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "python-elementary paroli bindings" -DEPENDS = "python-cython-native python-pyrex-native python-numeric eina elementary" -RDEPENDS = "python-lang python-evas python-ecore python-edje" -PROVIDES = "python-elementary" -PV = "0.1+gitr${SRCPV}" -PR = "r2" - -inherit setuptools - -SRC_URI = "git://git.paroli-project.org/python-elementary.git;protocol=http" - -S = "${WORKDIR}/git" - -do_stage() { - distutils_stage_all -} diff --git a/recipes/openmoko-projects/paroli_git.bb b/recipes/openmoko-projects/paroli_git.bb index 8cf2c743f6..b2b8bda654 100644 --- a/recipes/openmoko-projects/paroli_git.bb +++ b/recipes/openmoko-projects/paroli_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Paroli" SECTION = "x11" LICENSE = "GPL" PV = "0.2.1+gitr${SRCREV}" -PR = "r24" +PR = "r25" SRC_URI = "git://git.paroli-project.org/paroli.git;protocol=http" S = "${WORKDIR}/git" @@ -31,7 +31,7 @@ RDEPENDS_shr = "\ python-textutils \ python-dbus \ python-pygobject \ - pypthon-elementary \ + python-elementary \ dbus-x11 \ task-fso-compliance \ elementary \ |