From ac5d9b4400a3b0b45336adb0427166184ae7bd32 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 12:38:00 +0200
Subject: conf/distro/minimal.conf: assign DISTRO_TYPE only weakly

---
 conf/distro/minimal.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index f1f04e5e6a..c05676cb50 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -13,7 +13,7 @@
 DISTRO_NAME ?= "minimal"
 DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
 #DISTRO_TYPE = "release"
-DISTRO_TYPE = "debug"
+DISTRO_TYPE ?= "debug"
 
 # Ensure some form of release config, so error out if someone thinks he knows better
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
-- 
cgit v1.2.3


From f2ba78c87b2314b97fd05715e69e79709a383b2c Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 14:31:18 +0200
Subject: granule: move SRC_URI definition into .inc file

---
 recipes/granule/granule.inc      | 2 +-
 recipes/granule/granule_1.2.4.bb | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/recipes/granule/granule.inc b/recipes/granule/granule.inc
index ba32d489f4..71ac55db2d 100644
--- a/recipes/granule/granule.inc
+++ b/recipes/granule/granule.inc
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-${MINVER}.tar.gz"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/granule/granule_1.2.4.bb b/recipes/granule/granule_1.2.4.bb
index cb01eb0388..17120b49a3 100644
--- a/recipes/granule/granule_1.2.4.bb
+++ b/recipes/granule/granule_1.2.4.bb
@@ -1,4 +1,3 @@
 require granule.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-1.tar.gz"
-
+MINVER = "1"
-- 
cgit v1.2.3


From 0965086647cb37896532a25412c07ab67186821a Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 14:35:04 +0200
Subject: granule: add 1.4.0

---
 conf/checksums.ini               | 4 ++++
 recipes/granule/granule_1.4.0.bb | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 recipes/granule/granule_1.4.0.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 03624c2661..3545595433 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9402,6 +9402,10 @@ sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c
 md5=7f4e11d04e369391de27fca82ee60f11
 sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c
 
+[http://downloads.sourceforge.net/granule/granule-1.4.0-7.tar.gz]
+md5=4e327db531133ffeb650392042341443
+sha256=356463f586b8b6147a05ab00ca8b5e7f8f85d2ec3981fbb9c0c0c2e2da6f58c9
+
 [http://grass.osgeo.org/grass62/source/grass-6.2.3.tar.gz]
 md5=75c8832f90e445ff361d767c8a2c3ece
 sha256=a172d233fcbfc7f2c2de01af1f6fc7828e46867785dcaf861cf87238775e4a61
diff --git a/recipes/granule/granule_1.4.0.bb b/recipes/granule/granule_1.4.0.bb
new file mode 100644
index 0000000000..109a3b4c97
--- /dev/null
+++ b/recipes/granule/granule_1.4.0.bb
@@ -0,0 +1,4 @@
+require granule.inc
+
+MINVER = "7"
+S = "${WORKDIR}/${P}-${MINVER}"
-- 
cgit v1.2.3


From fe80a43e570761e2b5788fdc886bae24bb673c7b Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 14:53:05 +0200
Subject: granule: drop 1.2.4 * do_configure does not find the new libassa it
 seems.   1.4.0 works -> drop rather than spend time debugging

---
 recipes/granule/granule_1.2.4.bb | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 recipes/granule/granule_1.2.4.bb

diff --git a/recipes/granule/granule_1.2.4.bb b/recipes/granule/granule_1.2.4.bb
deleted file mode 100644
index 17120b49a3..0000000000
--- a/recipes/granule/granule_1.2.4.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require granule.inc
-
-MINVER = "1"
-- 
cgit v1.2.3