diff options
author | Holger Freyther <zecke@selfish.org> | 2008-03-22 00:32:21 +0000 |
---|---|---|
committer | Holger Freyther <zecke@selfish.org> | 2008-03-22 00:32:21 +0000 |
commit | 0362af65b95845f571763fa56e6031a8089091fc (patch) | |
tree | bae11f352af2fc04b16ae6ddae46fc6cb51b36f5 /packages/tasks | |
parent | 2f8d9c7a57e00b9acd7f7ac445b3ee6cd4eba886 (diff) | |
parent | a4535d80cb60e8eb76cdd2570e76b39eee2332d0 (diff) |
merge of '4216327dbc55e359d557266da86971e66ff5f595'
and 'd72643015c099d3f2c3ec5c5bb1294365effbe54'
Diffstat (limited to 'packages/tasks')
-rw-r--r-- | packages/tasks/task-base.bb | 3 | ||||
-rw-r--r-- | packages/tasks/task-gpe.bb | 4 | ||||
-rw-r--r-- | packages/tasks/task-openmoko-ui.bb | 1 | ||||
-rw-r--r-- | packages/tasks/task-python-everything.bb | 10 | ||||
-rw-r--r-- | packages/tasks/task-slugos.bb | 3 |
5 files changed, 11 insertions, 10 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 15835508aa..a55d5dd504 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r63" +PR = "r66" inherit task @@ -206,7 +206,6 @@ RDEPENDS_task-base-alsa = "\ # RRECOMMENDS_task-base-alsa = "\ alsa-state \ - alsa-states \ kernel-module-snd-mixer-oss \ kernel-module-snd-pcm-oss" diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb index bbb3857b3b..bc5105f6a8 100644 --- a/packages/tasks/task-gpe.bb +++ b/packages/tasks/task-gpe.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Palmtop Environment" -PR = "r5" +PR = "r6" LICENSE = "MIT" inherit task @@ -126,7 +126,7 @@ RDEPENDS_gpe-task-desktopapps = "\ RDEPENDS_gpe-task-sectest = "\ mbmerlin \ nmap \ - ettercap \ + ettercap-ng \ stunnel \ curl \ # dsniff \ diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb index 4f3399ac8f..33eab591ed 100644 --- a/packages/tasks/task-openmoko-ui.bb +++ b/packages/tasks/task-openmoko-ui.bb @@ -53,5 +53,6 @@ THEMES_rokre2 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-q THEMES_rokre6 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" THEMES_chumby = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_htcblueangel = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" RDEPENDS_task-openmoko-ui += "${THEMES}" diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index 18455f5b96..e4a185dde8 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,7 +1,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml26" +PR = "ml27" RDEPENDS = "\ python-ao \ @@ -10,14 +10,15 @@ RDEPENDS = "\ python-dbus \ python-dialog \ python-pydirectfb \ - python-efl \ - python-efl-examples \ + task-python-efl \ + task-python-efl-examples \ python-pycurl \ python-fam \ python-fnorb \ python-formencode \ python-fpconst \ python-fuse \ + python-gammu \ python-gmpy \ python-gnosis \ python-gsmd \ @@ -32,6 +33,7 @@ RDEPENDS = "\ python-libgmail \ python-lightmediascanner \ python-lxml \ + python-m2crypto \ python-mad \ python-numarray \ python-numeric \ @@ -90,8 +92,6 @@ RDEPENDS = "\ BROKEN_PACKAGES = "\ python-egenix-mx-base \ - python-gammu \ - python-m2crypto \ python-mysqldb \ python-pyqwt \ " diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 01cdaa21b4..2d57cfee5a 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r17" +PR = "r18" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -122,6 +122,7 @@ RDEPENDS += "\ update-modules sysvinit tinylogin udev \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ + libgcc \ beep \ util-linux-mount \ util-linux-umount \ |