diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-06-25 15:39:31 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2005-06-25 15:39:31 +0000 |
| commit | 7bad222de4a0894fdcf9dec0637d8c1c1405f5bb (patch) | |
| tree | 9d3da88fa9611f84fd731464ac11903f51449049 | |
| parent | 9cdd7c3035a25f6e5268227fbbb1d9818f7b4eb0 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded
2005/06/25 17:39:11+02:00 utwente.nl!koen
All gnome-vfs versions: add plugin-file and mime-date to RRECCOMMENDS
shared-mime-info_0.16.bb: new file
BKrev: 42bd7ab3DHIMRUlnOoYdqqVIqDqOoQ
| -rw-r--r-- | packages/gnome/gnome-vfs-dbus_2.8.4.4.bb | 2 | ||||
| -rw-r--r-- | packages/gnome/gnome-vfs_2.6.0.bb | 1 | ||||
| -rw-r--r-- | packages/gnome/gnome-vfs_2.6.2.bb | 1 | ||||
| -rw-r--r-- | packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb | 1 | ||||
| -rw-r--r-- | packages/shared-mime-info/shared-mime-info_0.14.bb | 18 | ||||
| -rw-r--r-- | packages/shared-mime-info/shared-mime-info_0.16.bb | 0 |
6 files changed, 5 insertions, 18 deletions
diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb index bb4222e458..2e2e80274d 100644 --- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb +++ b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb @@ -7,6 +7,8 @@ RPROVIDES = "gnome-vfs" inherit gnome pkgconfig DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba" +RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" + SRC_URI = "http://ftp.imendio.com/pub/extra/${PN}/${PN}-${PV}.tar.gz \ file://gconftool-lossage.patch;patch=1;pnum=1" diff --git a/packages/gnome/gnome-vfs_2.6.0.bb b/packages/gnome/gnome-vfs_2.6.0.bb index a048cdd172..fe59d43f22 100644 --- a/packages/gnome/gnome-vfs_2.6.0.bb +++ b/packages/gnome/gnome-vfs_2.6.0.bb @@ -4,6 +4,7 @@ PR = "r3" inherit gnome DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data orbit2 zlib samba" +RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1" diff --git a/packages/gnome/gnome-vfs_2.6.2.bb b/packages/gnome/gnome-vfs_2.6.2.bb index 0b0211b404..3b15f282ba 100644 --- a/packages/gnome/gnome-vfs_2.6.2.bb +++ b/packages/gnome/gnome-vfs_2.6.2.bb @@ -4,6 +4,7 @@ PR = "r4" inherit gnome DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data orbit2 zlib samba" +RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1" diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb index 44a53a4433..612b91462d 100644 --- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb +++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb @@ -7,6 +7,7 @@ RPROVIDES = "gnome-vfs" inherit gnome pkgconfig DEPENDS = "libxml2 gconf-osso dbus bzip2 gnome-mime-data zlib samba osso-gwconnect" +RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \ file://gconftool-lossage.patch;patch=1;pnum=1" diff --git a/packages/shared-mime-info/shared-mime-info_0.14.bb b/packages/shared-mime-info/shared-mime-info_0.14.bb deleted file mode 100644 index eecbc808f2..0000000000 --- a/packages/shared-mime-info/shared-mime-info_0.14.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "base" -PR = "r1" - -DEPENDS = "libxml2 intltool-native" - -SRC_URI = "http://freedesktop.org/Software/shared-mime-info/${PN}-${PV}.tar.gz" -LICENSE = "GPL" -inherit autotools pkgconfig gettext - -FILES_${PN} += "${datadir}/mime" -#FILES_${PN}-doc += " ${datadir}/gtk-doc" - -EXTRA_OECONF = "--disable-update-mimedb" - -pkg_postinst () { - echo "Updating MIME database... this may take a while." - ${bindir}/update-mime-database ${datadir}/mime -} diff --git a/packages/shared-mime-info/shared-mime-info_0.16.bb b/packages/shared-mime-info/shared-mime-info_0.16.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/shared-mime-info/shared-mime-info_0.16.bb |