[oe-commits] org.oe.dev merge of '091511591b5d369f5f183c5300585f7f1b3ca830'
oe commit
openembedded-commits at lists.openembedded.org
Thu Dec 13 12:22:59 UTC 2007
merge of '091511591b5d369f5f183c5300585f7f1b3ca830'
and '91d52cdc54af4a2802967cfdab32c81d01922351'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: bd9716558226c1049f7159d28c7f245818a2471f
ViewMTN: http://monotone.openembedded.org/revision/info/bd9716558226c1049f7159d28c7f245818a2471f
Files:
1
classes/scons.bbclass
packages/gnome/gconf-dbus_svn.bb
packages/meta/meta-angstrom-2007.bb
packages/enca/enca_1.9.bb
packages/fbreader/fbreader_0.7.3d.bb
packages/fbreader/fbreader_0.7.4q.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
packages/lua/lua-gtk2_0.3.bb
Diffs:
#
# mt diff -r091511591b5d369f5f183c5300585f7f1b3ca830 -rbd9716558226c1049f7159d28c7f245818a2471f
#
#
#
# patch "classes/scons.bbclass"
# from [7daf072a8b69aecb7a353e129508b5e514b1b5f0]
# to [c546b54256dc44ccc4500ce748fb77c6d7efdcbd]
#
# patch "packages/gnome/gconf-dbus_svn.bb"
# from [cfb0cd440b4736752691aef4cc9761eb15e6a9e4]
# to [17c69da4bd130d92af8af24b002ef34409149a33]
#
============================================================
--- classes/scons.bbclass 7daf072a8b69aecb7a353e129508b5e514b1b5f0
+++ classes/scons.bbclass c546b54256dc44ccc4500ce748fb77c6d7efdcbd
@@ -6,6 +6,7 @@ scons_do_install() {
}
scons_do_install() {
+ install -d ${D}${prefix}
${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \
oefatal "scons install execution failed."
}
============================================================
--- packages/gnome/gconf-dbus_svn.bb cfb0cd440b4736752691aef4cc9761eb15e6a9e4
+++ packages/gnome/gconf-dbus_svn.bb 17c69da4bd130d92af8af24b002ef34409149a33
@@ -7,7 +7,7 @@ PV = "2.16.0+svnr${SRCREV}"
RPROVIDES_${PN}-dev = "gconf-dev"
PV = "2.16.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
file://69gconfd-dbus"
@@ -19,6 +19,7 @@ FILES_${PN}-dbg += " ${libdir}/GConf-dbu
FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
#
# mt diff -r91d52cdc54af4a2802967cfdab32c81d01922351 -rbd9716558226c1049f7159d28c7f245818a2471f
#
#
#
# add_file "packages/meta/meta-angstrom-2007.bb"
# content [4bfd1a85218210707ef5559a74494f4a8159a2e6]
#
# patch "packages/enca/enca_1.9.bb"
# from [7815a20c38ea4d3a4b163268f1afc426eb36fbbe]
# to [12cf67dc83f652c02eab5abef8445e1d981b41ab]
#
# patch "packages/fbreader/fbreader_0.7.3d.bb"
# from [aab2e6e0b1fd44ae8961388d9eb632ca132d9d9c]
# to [34b11aba6a01b2904f78acd8ce7ad7c3befa6385]
#
# patch "packages/fbreader/fbreader_0.7.4q.bb"
# from [3071750398f41c84ca376433b0dd88d50e80577c]
# to [44451b9b9caf082b52726f201197b9f344126ada]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [d21eeca9a1bb496e84541d55957587838aaa33e9]
# to [44fe07852ed8432ebe5f55988cb384231d8b214a]
#
# patch "packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb"
# from [9781b60290a0df053d4514a522caa2b65fba46e7]
# to [837a617f042a71fda1b806d153ad3ddf07156a19]
#
# patch "packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb"
# from [a29d8bc3586b86df7583d9ab0091bfff380bd07d]
# to [d18fee8247c479d929f51640542c12d4827b584c]
#
# patch "packages/lua/lua-gtk2_0.3.bb"
# from [c9dfa04bfadacb293d77536191d5d47951a938fa]
# to [ce285cb56e4d70c5f08d7a58733d767cc735e58e]
#
============================================================
--- packages/meta/meta-angstrom-2007.bb 4bfd1a85218210707ef5559a74494f4a8159a2e6
+++ packages/meta/meta-angstrom-2007.bb 4bfd1a85218210707ef5559a74494f4a8159a2e6
@@ -0,0 +1,32 @@
+# Meta file to inform the autobuilder which packages to build for the feeds
+# Any changes should be discussed first on the angstrom-distro-devel mailinglist
+
+# Try to keep it alphabetically sorted please
+
+inherit meta
+
+RDEPENDS = ""
+
+# Basic tools
+RDEPENDS += " \
+ task-proper-tools \
+ screen \
+ "
+
+# Browsers know to work on all archs
+RDEPENDS += " \
+ gpe-mini-browser \
+ midori \
+ minimo \
+ openmoko-browser2 \
+ webkit-gtklauncher \
+ "
+
+# Webservers
+RDEPENDS += " \
+ apache2 \
+ boa \
+ cherokee \
+ lighttpd \
+ thttpd \
+ "
============================================================
--- packages/enca/enca_1.9.bb 7815a20c38ea4d3a4b163268f1afc426eb36fbbe
+++ packages/enca/enca_1.9.bb 12cf67dc83f652c02eab5abef8445e1d981b41ab
@@ -1,7 +1,7 @@ DESCRIPTION = "Enca is an Extremely Naiv
DESCRIPTION = "Enca is an Extremely Naive Charset Analyser"
-LICENSE = "GPL2"
SECTION = "libs"
PRIORITY = "optional"
+LICENSE = "GPLv2"
HOMEPAGE = "http://trific.ath.cx/software/enca/"
PR = "r2"
============================================================
--- packages/fbreader/fbreader_0.7.3d.bb aab2e6e0b1fd44ae8961388d9eb632ca132d9d9c
+++ packages/fbreader/fbreader_0.7.3d.bb 34b11aba6a01b2904f78acd8ce7ad7c3befa6385
@@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook read
DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
HOMEPAGE = "http://only.mawhrin.net/fbreader/"
SECTION = "x11/utils"
PRIORITY = "optional"
============================================================
--- packages/fbreader/fbreader_0.7.4q.bb 3071750398f41c84ca376433b0dd88d50e80577c
+++ packages/fbreader/fbreader_0.7.4q.bb 44451b9b9caf082b52726f201197b9f344126ada
@@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook read
DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
HOMEPAGE = "http://only.mawhrin.net/fbreader/"
SECTION = "x11/utils"
PRIORITY = "optional"
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb d21eeca9a1bb496e84541d55957587838aaa33e9
+++ packages/fbreader/fbreader_0.8.2a.bb 44fe07852ed8432ebe5f55988cb384231d8b214a
@@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook read
DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
HOMEPAGE = "http://only.mawhrin.net/fbreader/"
SECTION = "x11/utils"
PRIORITY = "optional"
============================================================
--- packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb 9781b60290a0df053d4514a522caa2b65fba46e7
+++ packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb 837a617f042a71fda1b806d153ad3ddf07156a19
@@ -1,6 +1,6 @@ DESCRIPTION = "Clearlooks theme engine f
SECTION = "x11/base"
DESCRIPTION = "Clearlooks theme engine for GTK"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
DEPENDS = "gtk+"
PR = "r1"
============================================================
--- packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb a29d8bc3586b86df7583d9ab0091bfff380bd07d
+++ packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb d18fee8247c479d929f51640542c12d4827b584c
@@ -1,6 +1,6 @@ DESCRIPTION = "Industrial theme engine f
SECTION = "x11/base"
DESCRIPTION = "Industrial theme engine for GTK"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
DEPENDS = "gtk+"
SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \
============================================================
--- packages/lua/lua-gtk2_0.3.bb c9dfa04bfadacb293d77536191d5d47951a938fa
+++ packages/lua/lua-gtk2_0.3.bb ce285cb56e4d70c5f08d7a58733d767cc735e58e
@@ -1,9 +1,9 @@ DESCRIPTION = "GTK bindings for LUA"
DESCRIPTION = "GTK bindings for LUA"
-LICENSE = "GPL2"
+SECTION = "libs"
PRIORITY = "optional"
+LICENSE = "GPLv2"
DEPENDS = "gtk+ lua-native perl-native readline libffi"
RDEPENDS = "lua"
-SECTION = "libs"
inherit gpe
More information about the Openembedded-commits
mailing list