merge of '5ea326f3b26f2123d331eace3ce101ac2983534e'

     and 'fd22e946abe117169eb2505f30a12a2aa70f1a71'

12 files changed, 25 insertions, 21 deletions

diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
index 14f5313bcc..6f1ba31274 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
@@ -1,8 +1,8 @@
+require gpe-mini-browser.inc
+
 PR = "r0"
 
 SRC_URI      = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz"
-DESCRIPTION  = "A lightweight webbrowser for the GPE platform (Hildon UI)"
-LICENSE      = "GPL"
 DEPENDS      = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget"
 EXTRA_OECONF = "--enable-hildon"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb
index 14f5313bcc..5f3d1f4d1b 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb
@@ -1,8 +1,9 @@
+require gpe-mini-browser.inc
+
 PR = "r0"
 
 SRC_URI      = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz"
 DESCRIPTION  = "A lightweight webbrowser for the GPE platform (Hildon UI)"
-LICENSE      = "GPL"
 DEPENDS      = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget"
 EXTRA_OECONF = "--enable-hildon"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb
index 23d8939e9d..3069730fbb 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb
@@ -1,8 +1,9 @@
+require gpe-mini-browser.inc
+
 PR = "r0"
 
 SRC_URI      = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz"
 DESCRIPTION  = "A lightweight webbrowser for the GPE platform (Hildon UI)"
-LICENSE      = "GPL"
 DEPENDS      = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget"
 EXTRA_OECONF = "--enable-hildon"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser.inc b/packages/gpe-mini-browser/gpe-mini-browser.inc
new file mode 100644
index 0000000000..733654bebc
--- /dev/null
+++ b/packages/gpe-mini-browser/gpe-mini-browser.inc
@@ -0,0 +1,2 @@
+DESCRIPTION = "A lightweight webbrowser for the GPE platform"
+LICENSE = "GPL"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb
index 5430139677..faa6bca828 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb
@@ -1,3 +1,5 @@
+require gpe-mini-browser.inc
+
 PR = "r0"
 
 SRC_URI = "http://stag.mind.be/gpe-mini-browser-${PV}.tar.bz2"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb
index 82308e82a6..68d0fbfb98 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb
@@ -1,8 +1,8 @@
+require gpe-mini-browser.inc
+
 PR = "r0"
 
 SRC_URI = "http://handhelds.org/~philippe/gpe-mini-browser-${PV}.tar.bz2"
-DESCRIPTION = "A lightweight webbrowser for the GPE platform"
-LICENSE = "GPL"
 DEPENDS = "osb-nrcit"
 
 S = "${WORKDIR}/gpe-mini-browser"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
index 2745e5f8a9..06e910af53 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
@@ -1,8 +1,8 @@
+require gpe-mini-browser.inc
+
 PR = "r1"
 
 SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
-DESCRIPTION = "A lightweight webbrowser for the GPE platform"
-LICENSE = "GPL"
 DEPENDS = "osb-nrcit libgpewidget"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb
index ee41ff26c2..35cca41d18 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb
@@ -1,8 +1,8 @@
+require gpe-mini-browser.inc
+
 PR = "r1"
 
 SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
-DESCRIPTION = "A lightweight webbrowser for the GPE platform"
-LICENSE = "GPL"
 DEPENDS = "osb-nrcit sqlite libgpewidget"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb
index 4a09fb827d..99523c08f8 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb
@@ -1,6 +1,6 @@
+require gpe-mini-browser.inc
+
 SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
-DESCRIPTION = "A lightweight webbrowser for the GPE platform"
-LICENSE = "GPL"
 DEPENDS = "osb-nrcit sqlite libgpewidget"
 RRECOMMENDS =   "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb
index 4a09fb827d..99523c08f8 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb
@@ -1,6 +1,6 @@
+require gpe-mini-browser.inc
+
 SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
-DESCRIPTION = "A lightweight webbrowser for the GPE platform"
-LICENSE = "GPL"
 DEPENDS = "osb-nrcit sqlite libgpewidget"
 RRECOMMENDS =   "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
index 566b9820ba..225a12d4ae 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
@@ -1,9 +1,8 @@
+require gpe-mini-browser.inc
+
 SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.gz"
-DESCRIPTION = "A lightweight webbrowser for the GPE platform"
-LICENSE = "GPL"
 DEPENDS = "osb-nrcit sqlite libgpewidget"
-RRECOMMENDS =   "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
-
+RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
index 62b93667b8..dc5c022580 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
@@ -1,7 +1,6 @@
-DEFAULT_PREFERENCE = "-1"
+require gpe-mini-browser.inc
 
-DESCRIPTION = "A lightweight webbrowser for the GPE platform"
-LICENSE = "GPL"
+DEFAULT_PREFERENCE = "-1"
 
 DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"