5 files changed, 34 insertions, 7 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 62fbfec9ff..a936259fe6 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1953,7 +1953,7 @@ PREFERRED_VERSION_void11 ?= "0.2.0"
 PREFERRED_VERSION_vorbis-tools ?= "1.0.1"
 PREFERRED_VERSION_vpnc ?= "0.3.3"
 PREFERRED_VERSION_vsftpd ?= "2.0.5"
-PREFERRED_VERSION_vte ?= "0.16.9"
+PREFERRED_VERSION_vte ?= "0.16.13"
 PREFERRED_VERSION_vtun ?= "2.6"
 PREFERRED_VERSION_w3cam ?= "0.7.2"
 PREFERRED_VERSION_wakelan ?= "1.1"
diff --git a/packages/meta/distro-feed-configs.bb b/packages/meta/distro-feed-configs.bb
new file mode 100644
index 0000000000..f30671d6d2
--- /dev/null
+++ b/packages/meta/distro-feed-configs.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Configuration files for online package repositories aka feeds"
+PR = "r0"
+
+DISTRO_FEED_PREFIX ?= "remote"
+DISTRO_FEED_URI ?= "http://my-distribution.org/remote-feed/"
+
+do_compile() {
+    mkdir -p ${S}/${sysconfdir}/opkg
+    for feed in all ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}; do
+        echo "src/gz ${DISTRO_FEED_PREFIX}-${feed} ${DISTRO_FEED_URI}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
+    done
+}
+do_install () {
+        install -d ${D}${sysconfdir}/opkg
+        install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#def distro_feed_configs(d):
+#    import bb
+#    parchs = bb.data.getVar( "PACKAGE_EXTRA_ARCHS", d, 1 ).split()
+#    march = bb.data.getVar( "MACHINE_ARCH", d, 1 ).split()
+#    archs = [ "all" ] + parchs + march
+#    confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ]
+#    return " ".join( confs )
+#
+#CONFFILES_${PN} += '${@distro_feed_configs(d)}'
+
+CONFFILES_${PN} += '${@ " ".join( [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in "all ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}".split() ] ) }'
diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc
index 587ea85a39..76dacff581 100644
--- a/packages/vte/vte.inc
+++ b/packages/vte/vte.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "vte is a virtual terminal emulator"
 LICENSE = "LGPL"
 DEPENDS += " glib-2.0 gtk+ intltool-native"
-RDEPENDS = "termcap"
 
 inherit gnome
 
@@ -13,5 +12,7 @@ do_stage() {
 	autotools_stage_all
 }
 
-PACKAGES =+ "libvte"
+PACKAGES =+ "libvte vte-termcap"
 FILES_libvte = "${libdir}/*.so*"
+RDEPENDS_libvte = "vte-termcap"
+FILES_vte-termcap = "${datadir}/vte/termcap"
diff --git a/packages/vte/vte_0.16.8.bb b/packages/vte/vte_0.16.8.bb
deleted file mode 100644
index f408632430..0000000000
--- a/packages/vte/vte_0.16.8.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require vte.inc
-PR = "r3"
diff --git a/packages/vte/vte_0.16.9.bb b/packages/vte/vte_0.16.9.bb
deleted file mode 100644
index 5875fd317f..0000000000
--- a/packages/vte/vte_0.16.9.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require vte.inc
-PR = "r4"