Patchwork [1/2] Revert "pango.inc: add directory "/etc/pango""

login
register
mail settings
Submitter Koen Kooi
Date Jan. 17, 2012, 10:19 a.m.
Message ID <1326795583-22661-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/19569/
State Accepted
Commit 25c2d1a825a5d028b99f956be2918ceed4a93ac3
Headers show

Comments

Koen Kooi - Jan. 17, 2012, 10:19 a.m.
This reverts commit 65186bd86170d8c375931a18487c2fdf3bd1b3b0.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-graphics/pango/pango.inc |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
Richard Purdie - Jan. 17, 2012, 3:09 p.m.
On Tue, 2012-01-17 at 11:19 +0100, Koen Kooi wrote:
> This reverts commit 65186bd86170d8c375931a18487c2fdf3bd1b3b0.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-graphics/pango/pango.inc |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)

Merged to master (along with 2/2), thanks.

Richard

Patch

diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index e7262c3..bf528f4 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -46,11 +46,6 @@  fi
 
 }
 
-# Command "pango-querymodules > /etc/pango/pango.modules" needs this directory.
-do_install_prepend() {
-	install -d ${D}/${sysconfdir}/pango
-}
-
 python populate_packages_prepend () {
 	prologue = d.getVar("postinst_prologue", 1)
 
@@ -59,5 +54,6 @@  python populate_packages_prepend () {
 	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
 }
 
+FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
 FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
 FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"