[oe-commits] org.oe.dev merge of 'bb1bb675997832a7601e5748309247add662cc9a'

[pfalcon commit]

merge of 'bb1bb675997832a7601e5748309247add662cc9a'
     and 'd247b65521d61fba926d1749aacaf2ae4bc82f02'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 5230a1c76ed243f666e89373013908e08c70d51c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5230a1c76ed243f666e89373013908e08c70d51c
Files:
1
packages/udev/files/init
packages/udev/udev-092/init
packages/udev/udev-097/init
packages/udev/udev-100/init
packages/udev/udev_092.bb
packages/udev/udev_097.bb
packages/udev/udev_100.bb
packages/gtkmm/gtkmm_2.8.3.bb
packages/gtkmm/gtkmm_2.10.10.bb
packages/efl1/esmart_0.9.0.009.bb
packages/gtkmm/gtkmm.inc
Diffs:

#
# mt diff -rbb1bb675997832a7601e5748309247add662cc9a -r5230a1c76ed243f666e89373013908e08c70d51c
#
# 
# 
# patch "packages/udev/files/init"
#  from [0eaf02554e92a27efee8e176c35b8eee809a1ca6]
#    to [78cf2bbff25b54330eeed70f9417f2b3b3c148bd]
# 
# patch "packages/udev/udev-092/init"
#  from [109a0d50fdcbfc1bd8277ba6a8099efe39a135bc]
#    to [bc6df3bb6aa5a75599fc8b1b61b3ab0f0ef4510d]
# 
# patch "packages/udev/udev-097/init"
#  from [999cce42a7fe3f683e975df81d8b450187c4e8f3]
#    to [a021c5d9e997b40e7e2f15568976b1a8d3441348]
# 
# patch "packages/udev/udev-100/init"
#  from [999cce42a7fe3f683e975df81d8b450187c4e8f3]
#    to [a021c5d9e997b40e7e2f15568976b1a8d3441348]
# 
# patch "packages/udev/udev_092.bb"
#  from [a4b112038d53214ff29eb19b0a49cd3300db87e9]
#    to [9c280c1d2cc7237d3dd3cc93dd6a6861334b7786]
# 
# patch "packages/udev/udev_097.bb"
#  from [1670066b56c71bc70cf150d20bcd3c01c94180c3]
#    to [8d341ef0c55e6945df0f9050797bba9644b6d15b]
# 
# patch "packages/udev/udev_100.bb"
#  from [052ad350b235989b24d5180ae1d34444ec6f5b93]
#    to [cf318dbe137533d51d411b1f6361520cd7e366a3]
# 
============================================================
--- packages/udev/files/init	0eaf02554e92a27efee8e176c35b8eee809a1ca6
+++ packages/udev/files/init	78cf2bbff25b54330eeed70f9417f2b3b3c148bd
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 
 UDEVSTART=/sbin/udevstart
 
============================================================
--- packages/udev/udev-092/init	109a0d50fdcbfc1bd8277ba6a8099efe39a135bc
+++ packages/udev/udev-092/init	bc6df3bb6aa5a75599fc8b1b61b3ab0f0ef4510d
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          udev
 # Required-Start:    mountvirtfs 
============================================================
--- packages/udev/udev-097/init	999cce42a7fe3f683e975df81d8b450187c4e8f3
+++ packages/udev/udev-097/init	a021c5d9e997b40e7e2f15568976b1a8d3441348
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          udev
 # Required-Start:    mountvirtfs 
============================================================
--- packages/udev/udev-100/init	999cce42a7fe3f683e975df81d8b450187c4e8f3
+++ packages/udev/udev-100/init	a021c5d9e997b40e7e2f15568976b1a8d3441348
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          udev
 # Required-Start:    mountvirtfs 
============================================================
--- packages/udev/udev_092.bb	a4b112038d53214ff29eb19b0a49cd3300db87e9
+++ packages/udev/udev_092.bb	9c280c1d2cc7237d3dd3cc93dd6a6861334b7786
@@ -1,9 +1,9 @@ RPROVIDES_${PN} = "hotplug"
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r18"
+PR = "r19"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
============================================================
--- packages/udev/udev_097.bb	1670066b56c71bc70cf150d20bcd3c01c94180c3
+++ packages/udev/udev_097.bb	8d341ef0c55e6945df0f9050797bba9644b6d15b
@@ -8,7 +8,7 @@ needed to link programs with libvolume_i
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
============================================================
--- packages/udev/udev_100.bb	052ad350b235989b24d5180ae1d34444ec6f5b93
+++ packages/udev/udev_100.bb	cf318dbe137533d51d411b1f6361520cd7e366a3
@@ -9,7 +9,7 @@ needed to link programs with libvolume_i
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \


#
# mt diff -rd247b65521d61fba926d1749aacaf2ae4bc82f02 -r5230a1c76ed243f666e89373013908e08c70d51c
#
# 
# 
# rename "packages/gtkmm/gtkmm_2.8.3.bb"
#     to "packages/gtkmm/gtkmm_2.10.10.bb"
# 
# patch "packages/efl1/esmart_0.9.0.009.bb"
#  from [c389709e369d7d5abcc1ea9ac78639079cfa3d99]
#    to [50ef9d7ecd9979943010a6a384223d87e0c2abab]
# 
# patch "packages/gtkmm/gtkmm.inc"
#  from [e31db8a96e6aa60a1f27bc20642644a3204a2e57]
#    to [7ec54b72cd502a1cb8e82dbb3ff44ccfbc0575b4]
# 
# patch "packages/gtkmm/gtkmm_2.10.10.bb"
#  from [c45df8de54265c0f006a7958dae49e88c83d7783]
#    to [42dacfdf2a031c9cdccd5a2559171f16c6dc4440]
# 
============================================================
--- packages/efl1/esmart_0.9.0.009.bb	c389709e369d7d5abcc1ea9ac78639079cfa3d99
+++ packages/efl1/esmart_0.9.0.009.bb	50ef9d7ecd9979943010a6a384223d87e0c2abab
@@ -13,6 +13,7 @@ PACKAGES =+ "${PN}-textentry \
              ${PN}-file-dialog \
              ${PN}-draggies \
              ${PN}-trans-x11"
+FILES_${PN}-dbg += "${libdir}/.debug/ ${libdir}/esmart/*/.debug/"
 FILES_${PN}-textentry = "${libdir}/libesmart_text_entry*.so*"
 FILES_${PN}-thumb = "${libdir}/libesmart_thumb*.so*"
 FILES_${PN}-container = "${libdir}/libesmart_container*"
============================================================
--- packages/gtkmm/gtkmm.inc	e31db8a96e6aa60a1f27bc20642644a3204a2e57
+++ packages/gtkmm/gtkmm.inc	7ec54b72cd502a1cb8e82dbb3ff44ccfbc0575b4
@@ -1,9 +1,10 @@ LICENSE = "LGPL"
 DESCRIPTION = "C++ bindings for the GTK+ toolkit."
 HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "glibmm gtk+"
+DEPENDS = "atk glibmm gtk+"
+PR = "r0"
 
 inherit autotools pkgconfig flow-lossage
 
@@ -11,3 +12,11 @@ LIBV = "2.4.0"
 FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
 
 LIBV = "2.4.0"
+
+do_stage () {
+        autotools_stage_all
+
+        install -d ${STAGING_INCDIR}/gtkmm-2.4
+        install -m 0644 gdk/gdkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
+        install -m 0644 gtk/gtkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
+}
============================================================
--- packages/gtkmm/gtkmm_2.8.3.bb	c45df8de54265c0f006a7958dae49e88c83d7783
+++ packages/gtkmm/gtkmm_2.10.10.bb	42dacfdf2a031c9cdccd5a2559171f16c6dc4440
@@ -1,13 +1,5 @@ require gtkmm.inc
 require gtkmm.inc
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "${GNOME_MIRROR}/gtkmm/2.8/gtkmm-${PV}.tar.bz2"
-
-do_stage () {
-	autotools_stage_all
-
-	install -d ${STAGING_INCDIR}/gtkmm-2.4
-	install -m 0644 gdk/gdkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
-	install -m 0644 gtk/gtkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
-}