Formatting changes to make merging easier

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1853 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 13 insertions, 11 deletions

diff --git a/meta/packages/gtk+/gtk+_2.6.10.bb b/meta/packages/gtk+/gtk+_2.6.10.bb
index 8230515f3b..298e4c648d 100644
--- a/meta/packages/gtk+/gtk+_2.6.10.bb
+++ b/meta/packages/gtk+/gtk+_2.6.10.bb
@@ -28,22 +28,22 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
 inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
-        ${bindir}/gtk-update-icon-cache \
         ${bindir}/gtk-query-immodules-2.0 \
+        ${bindir}/gtk-update-icon-cache \
         ${libdir}/lib*.so.* \
         ${datadir}/themes ${sysconfdir} \
         ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
 FILES_${PN}-dev += " \
         ${datadir}/gtk-2.0/include \
-        ${libdir}/gtk-2.0/include \
-        ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
-        ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
-        ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
-        ${bindir}/gdk-pixbuf-csource"
+        ${libdir}/gtk-2.0/include \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+        ${bindir}/gdk-pixbuf-csource"
 FILES_${PN}-dbg += " \
         ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
-        ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
-        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
+        ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
+        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
 
 
 RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
@@ -52,6 +52,8 @@ EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-disp
 # --disable-cruft
 
 LIBV = "2.4.0"
+LEAD_SONAME = "libgtk-x11*"
+
 
 do_configure_prepend() {
         for i in `find . -name "Makefile.am"`   
diff --git a/meta/packages/gtk+/gtk+_2.6.8.bb b/meta/packages/gtk+/gtk+_2.6.8.bb
index f1ccb46b61..194a275900 100644
--- a/meta/packages/gtk+/gtk+_2.6.8.bb
+++ b/meta/packages/gtk+/gtk+_2.6.8.bb
@@ -20,14 +20,14 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://no-deprecation.patch;patch=1 \
            file://filesystem-volumes.patch;patch=1 \
            file://filechooser-respect-style.patch;patch=1 \
-           file://filechooser-default.patch;patch=1 \
+           file://filechooser-default.patch;patch=1 \
            "
 
 inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
         ${bindir}/gtk-query-immodules-2.0 \
-        ${bindir}/gtk-update-icon-cache \
+        ${bindir}/gtk-update-icon-cache \
         ${libdir}/lib*.so.* \
         ${datadir}/themes ${sysconfdir} \
         ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
@@ -88,7 +88,7 @@ python populate_packages_prepend () {
         immodules_root = os.path.join(gtk_libdir, 'immodules')
 
         do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-        do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+        do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)