diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-06-17 10:25:34 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-06-17 10:25:34 +0000 |
| commit | aff97e9475c2a48122851f24b5500fd11c4600c4 (patch) | |
| tree | 8f08e0d2536697e0a9d65cd3aabe3887e2269ea2 /packages | |
| parent | cfd086c000f94b852dc953d2ed2637e155a2e899 (diff) | |
| parent | ce8819cf9c39e47d0ae5718e6ed960f773f75c31 (diff) | |
merge of 'b0f2b6b66673367e2119e54761590a724c20c2e1'
and 'd4199b222eb8c2755fae3eefe9fdbd225e6d9e81'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gnome/gnome-cups-manager_0.31.bb | 3 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6/magician/defconfig | 2 | ||||
| -rw-r--r-- | packages/python/python-pygobject_2.12.2.bb | 5 | ||||
| -rw-r--r-- | packages/python/python-pygtk2_2.10.3.bb | 4 |
4 files changed, 13 insertions, 1 deletions
diff --git a/packages/gnome/gnome-cups-manager_0.31.bb b/packages/gnome/gnome-cups-manager_0.31.bb index 2023cdac5d..4f8cd1de7b 100644 --- a/packages/gnome/gnome-cups-manager_0.31.bb +++ b/packages/gnome/gnome-cups-manager_0.31.bb @@ -6,6 +6,9 @@ DEPENDS="glib-2.0 gtk+ pango libgnomecups" inherit gnome pkgconfig +FILES += "${datadir}/icons/hicolor/48x48/stock/data/emblem-*.png \ + ${datadir}/icons/hicolor/48x48/devices/gnome-dev-printer-new.png" + SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/0.31/gnome-cups-manager-0.31.tar.bz2" do_stage() { diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index 17e35c9512..bdc4fa5443 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -931,7 +931,7 @@ CONFIG_LEDS_MAGICIAN=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HWTIMER=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_LEDS_TRIGGER_SHARED=y diff --git a/packages/python/python-pygobject_2.12.2.bb b/packages/python/python-pygobject_2.12.2.bb index a79032f301..1604b54715 100644 --- a/packages/python/python-pygobject_2.12.2.bb +++ b/packages/python/python-pygobject_2.12.2.bb @@ -9,6 +9,11 @@ S = "${WORKDIR}/pygobject-${PV}" inherit autotools distutils-base pkgconfig +# otherwise the main package keeps snatching the .pc file away +# and therefore depends on glib-2.0-dev (which only the -dev +# package should). +PACKAGES =+ "${PN}-dev" + do_stage() { autotools_stage_all install -d ${STAGING_LIBDIR}/../share/pygobject/ diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb index d3811ddddd..ad1f36a205 100644 --- a/packages/python/python-pygtk2_2.10.3.bb +++ b/packages/python/python-pygtk2_2.10.3.bb @@ -17,6 +17,10 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" inherit autotools pkgconfig distutils-base +PACKAGES =+ "${PN}-dev" +FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug" + do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ } |