merge of '57fa0ccbbdbca8c188108e3c4fbde4702976f3c6'

     and 'b29b99ceeb63af04c2736ab8176705046dc326c0'

diff --git a/packages/gtkmm/gtkmm.inc b/packages/gtkmm/gtkmm.inc
index f0c6dc0..ce73737 100644 (file)
--- a/packages/gtkmm/gtkmm.inc
+++ b/packages/gtkmm/gtkmm.inc
@@ -3,7 +3,8 @@ 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 @@ FILES_${PN} = "${libdir}/lib*.so.*"
 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
+}

diff --git a/packages/gtkmm/gtkmm_2.10.10.bb b/packages/gtkmm/gtkmm_2.10.10.bb
new file mode 100644 (file)
index 0000000..459641e
--- /dev/null
+++ b/packages/gtkmm/gtkmm_2.10.10.bb
@@ -0,0 +1,5 @@
+require gtkmm.inc
+
+PR = "r0"
+
+SRC_URI = "${GNOME_MIRROR}/gtkmm/2.8/gtkmm-${PV}.tar.bz2"

diff --git a/packages/gtkmm/gtkmm_2.8.3.bb b/packages/gtkmm/gtkmm_2.8.3.bb
deleted file mode 100644 (file)
index dae6829..0000000
--- a/packages/gtkmm/gtkmm_2.8.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require gtkmm.inc
-
-PR = "r1"
-
-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
-}