[oe-commits] org.oe.dev merge of '706cfac4c4f36e78c23b5d62cd653b2820091c04'

[oe commit]

merge of '706cfac4c4f36e78c23b5d62cd653b2820091c04'
     and 'c293cc4e6d77cae86deaaf6f134d6640daa2f04c'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 6ce5f26b9e3717a906b07e8edd9eb1f3d7867889
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6ce5f26b9e3717a906b07e8edd9eb1f3d7867889
Files:
1
packages/gtk-webcore/midori_0.0.3.bb
packages/e17/enna/locale-is-broken.patch
Diffs:

#
# mt diff -r706cfac4c4f36e78c23b5d62cd653b2820091c04 -r6ce5f26b9e3717a906b07e8edd9eb1f3d7867889
#
# 
# 
# add_file "packages/gtk-webcore/midori_0.0.3.bb"
#  content [348a9809fd18122ce67287221b19ca29e74da891]
# 
============================================================
--- packages/gtk-webcore/midori_0.0.3.bb	348a9809fd18122ce67287221b19ca29e74da891
+++ packages/gtk-webcore/midori_0.0.3.bb	348a9809fd18122ce67287221b19ca29e74da891
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "osb-jscore osb-nrcit osb-nrcore libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
+
+
+


#
# mt diff -rc293cc4e6d77cae86deaaf6f134d6640daa2f04c -r6ce5f26b9e3717a906b07e8edd9eb1f3d7867889
#
# 
# 
# add_file "packages/e17/enna/locale-is-broken.patch"
#  content [87f2af6e7dc92c864b1b0efeb993190772868c41]
# 
============================================================
--- packages/e17/enna/locale-is-broken.patch	87f2af6e7dc92c864b1b0efeb993190772868c41
+++ packages/e17/enna/locale-is-broken.patch	87f2af6e7dc92c864b1b0efeb993190772868c41
@@ -0,0 +1,13 @@
+Index: enna/Makefile.am
+===================================================================
+--- enna.orig/Makefile.am
++++ enna/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ## Created by Anjuta
+ 
+-SUBDIRS = src po data
++SUBDIRS = src data
+ 
+ EXTRA_DIST = config.rpath  $(ennadoc_DATA)
+