diff options
author | Koen Kooi <koen@openembedded.org> | 2005-06-27 10:16:57 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2005-06-27 10:16:57 +0000 |
commit | d36acc758de748a560b2181fc048a7f3f3125927 (patch) | |
tree | 2f8c0b3c528eb8da11b76ffc6583c4cb4b1700ba | |
parent | 964bc8e3be0c30dbce21ccecc52bfd5bddcaddd5 (diff) |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded
2005/06/27 12:16:37+02:00 utwente.nl!koen
gpe-contacts_0.39.bb: fix icon problem, courtesy Florian Boor
BKrev: 42bfd2194CSN4_H5ggHLBxHI6DzFTQ
-rw-r--r-- | packages/gpe-contacts/files/lost-icons.patch | 28 | ||||
-rw-r--r-- | packages/gpe-contacts/gpe-contacts_0.39.bb | 2 |
2 files changed, 29 insertions, 1 deletions
diff --git a/packages/gpe-contacts/files/lost-icons.patch b/packages/gpe-contacts/files/lost-icons.patch index e69de29bb2..aa0b6ded58 100644 --- a/packages/gpe-contacts/files/lost-icons.patch +++ b/packages/gpe-contacts/files/lost-icons.patch @@ -0,0 +1,28 @@ +Index: Makefile.am +=================================================================== +RCS file: /cvs/gpe/base/gpe-contacts/Makefile.am,v +retrieving revision 1.15 +diff -B -b -u -r1.15 Makefile.am +--- Makefile.am 20 Jun 2005 23:18:06 -0000 1.15 ++++ Makefile.am 27 Jun 2005 09:39:29 -0000 +@@ -47,7 +47,7 @@ + + gpe_contacts_SOURCES += main.c + +-pixmaps_extradir = $(datadir)/gpe/pixmaps/default ++pixmaps_extradir = $(datadir)/gpe/pixmaps/default/gpe-contacts + pixmaps_extra_DATA = icons/entry.png \ + icons/export.png \ + icons/frame.png \ +@@ -59,11 +59,6 @@ + @INTLTOOL_DESKTOP_RULE@ + + pixmapsdir = $(datadir)/pixmaps +- +-pixmaps_extradir = $(datadir)/pixmaps +-pixmaps_extra_DATA = icons/gpe-contacts.png \ +- icons/edit-vcard.png +- + metadir = $(datadir)/gpe-contacts + + if HILDON diff --git a/packages/gpe-contacts/gpe-contacts_0.39.bb b/packages/gpe-contacts/gpe-contacts_0.39.bb index bb847fab17..f55238573e 100644 --- a/packages/gpe-contacts/gpe-contacts_0.39.bb +++ b/packages/gpe-contacts/gpe-contacts_0.39.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" inherit gpe autotools -PR = "r1" +PR = "r2" DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" SECTION = "gpe" |