[oe-commits] org.oe.dev merge of '7da15dd442647956379d156f938fbc66c4db5251'

[oe commit]

merge of '7da15dd442647956379d156f938fbc66c4db5251'
     and 'fbf6625ada3dc98b6ca6bf3250baa56f91b08e87'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 1cc5e1375ebc4a5db05258a8915e819dbad6a77a
ViewMTN: http://monotone.openembedded.org/revision/info/1cc5e1375ebc4a5db05258a8915e819dbad6a77a
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/termcap
packages/termcap/termcap_11.0.1.bb
packages/vte/vte_0.16.8.bb
Diffs:

#
# mt diff -r7da15dd442647956379d156f938fbc66c4db5251 -r1cc5e1375ebc4a5db05258a8915e819dbad6a77a
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [6f40fd83301e829dda5ced38774f734103633954]
#    to [db2cb7f7e9a06a07e1f8adf006d23e857b02634b]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	6f40fd83301e829dda5ced38774f734103633954
+++ conf/distro/include/sane-srcrevs.inc	db2cb7f7e9a06a07e1f8adf006d23e857b02634b
@@ -50,7 +50,7 @@ SRCREV_pn-openmoko-icon-theme-standard ?
 SRCREV_pn-openmoko-firststart2 ?= "2873"
 SRCREV_pn-openmoko-footer ?= "2354"
 SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "2840"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "2967"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-mediaplayer2 ?= "2952"


#
# mt diff -rfbf6625ada3dc98b6ca6bf3250baa56f91b08e87 -r1cc5e1375ebc4a5db05258a8915e819dbad6a77a
#
# 
# 
# add_dir "packages/termcap"
# 
# add_file "packages/termcap/termcap_11.0.1.bb"
#  content [48cdc1c638e5a412fa3ee8a54c4e33907a4ccbb5]
# 
# patch "packages/vte/vte_0.16.8.bb"
#  from [877f5cc30d4eaa0bb61c823b10a4536806cf11bf]
#    to [4642ff116b6101c8293be250f4507ca114aa02b7]
# 
============================================================
--- packages/termcap/termcap_11.0.1.bb	48cdc1c638e5a412fa3ee8a54c4e33907a4ccbb5
+++ packages/termcap/termcap_11.0.1.bb	48cdc1c638e5a412fa3ee8a54c4e33907a4ccbb5
@@ -0,0 +1,16 @@
+DESCRIPTION = "Terminal Capabilities File"
+SECTION = "base"
+HOMEPAGE = "http://www.catb.org/~esr/terminfo/"
+LICENSE = "PD"
+
+SRC_URI = "http://www.catb.org/~esr/terminfo/termtypes.tc.gz"
+S = "${WORKDIR}"
+
+do_install() {
+	install -d ${D}${sysconfdir}
+	install -m 0644 termtypes.tc ${D}${sysconfdir}/termcap
+}
+
+PACKAGES = "termcap"
+FILES_termcap = "${sysconfdir}"
+
============================================================
--- packages/vte/vte_0.16.8.bb	877f5cc30d4eaa0bb61c823b10a4536806cf11bf
+++ packages/vte/vte_0.16.8.bb	4642ff116b6101c8293be250f4507ca114aa02b7
@@ -1,6 +1,7 @@ LICENSE = "LGPL"
 DESCRIPTION = "vte is a virtual terminal emulator"
 LICENSE = "LGPL"
-PR = "r2"
+RDEPENDS = "termcap"
+PR = "r3"
 
 inherit gnome