diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-02 19:09:19 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-02 19:09:19 +0100 |
| commit | dd53c790d6c3b19bff547755f804e5f2fccc56ed (patch) | |
| tree | 592f015c44735d719e52f57c86533cbf6981ca14 /packages/vte | |
| parent | 6be41f1374dc9bf7f53673273d8b02bfbfe6a02e (diff) | |
| parent | b765ebc700bd5b639f70ccf2268284be624f46df (diff) | |
Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev
Conflicts:
classes/qt4e.bbclass
packages/bluez/bluez4_4.31.bb
packages/mc/mc_4.6.2.bb
packages/vte/vte.inc
packages/vte/vte_0.16.13.bb
packages/vte/vte_0.16.14.bb
Diffstat (limited to 'packages/vte')
| -rw-r--r-- | packages/vte/vte.inc | 10 | ||||
| -rw-r--r-- | packages/vte/vte_0.16.13.bb | 2 | ||||
| -rw-r--r-- | packages/vte/vte_0.16.14.bb | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc index dcf25c945d..08642287d5 100644 --- a/packages/vte/vte.inc +++ b/packages/vte/vte.inc @@ -4,8 +4,10 @@ DEPENDS += "glib-2.0 gtk+ intltool-native ncurses" inherit gnome -SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1 \ - file://vte.desktop.in" +SRC_URI += "\ + file://vte-pkgconfig-fixes.patch;patch=1 \ + file://vte.desktop.in \ +" EXTRA_OECONF = "--disable-gtk-doc --disable-python" @@ -16,6 +18,10 @@ do_install_append() { sed s/@VERSION@/${PV}/ <${WORKDIR}/vte.desktop.in >${D}${datadir}/applications/vte.desktop } +do_stage() { + autotools_stage_all +} + PACKAGES =+ "libvte vte-termcap gnome-pty-helper" FILES_libvte = "${libdir}/*.so.*" FILES_gnome-pty-helper = "${libexecdir}/gnome-pty-helper" diff --git a/packages/vte/vte_0.16.13.bb b/packages/vte/vte_0.16.13.bb deleted file mode 100644 index f408632430..0000000000 --- a/packages/vte/vte_0.16.13.bb +++ /dev/null @@ -1,2 +0,0 @@ -require vte.inc -PR = "r3" diff --git a/packages/vte/vte_0.16.14.bb b/packages/vte/vte_0.16.14.bb index 9453fee206..4e88640b02 100644 --- a/packages/vte/vte_0.16.14.bb +++ b/packages/vte/vte_0.16.14.bb @@ -1 +1,2 @@ require vte.inc +PR = "r1" |