[oe-commits] org.oe.dev merge of '66d9cc1155353a9e1d178f4143dd89f86fc64dcb'

[hrw commit]

merge of '66d9cc1155353a9e1d178f4143dd89f86fc64dcb'
     and 'dfcef904001ea652ac525bfc9b2f775f88de1d70'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a4b7f96be34f975866fbd431e728219423d4b376
ViewMTN: http://monotone.openembedded.org/revision/info/a4b7f96be34f975866fbd431e728219423d4b376
Files:
1
packages/flumotion/flumotion_0.4.1.bb
packages/openttd/openttd_0.6.0-beta4.bb
packages/openttd/openttd_0.6.0.bb
classes/autotools.bbclass
conf/checksums.ini
Diffs:

#
# mt diff -r66d9cc1155353a9e1d178f4143dd89f86fc64dcb -ra4b7f96be34f975866fbd431e728219423d4b376
#
#
#
# patch "packages/flumotion/flumotion_0.4.1.bb"
#  from [70c85428af57546952476b8d1a63581c1f51b43b]
#    to [888ee41205578b445b00295429cddc535e80a0f3]
#
============================================================
--- packages/flumotion/flumotion_0.4.1.bb	70c85428af57546952476b8d1a63581c1f51b43b
+++ packages/flumotion/flumotion_0.4.1.bb	888ee41205578b445b00295429cddc535e80a0f3
@@ -9,7 +9,7 @@ RDEPENDS_${PN}-gui = "${PN} python-pygtk
             python-lang python-zopeinterface  python-textutils \
             python-gst python-misc"
 RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
            file://python-path.patch;patch=1 \
@@ -21,12 +21,8 @@ EXTRA_OECONF += "--with-python-includes=
 
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
-#Yes, we know:
-#ERROR: flumotion-dbg is listed in PACKAGES mutliple times, this leads to packaging errors.
-#ERROR: Please fix the metadata/report this as bug to OE bugtracker.
+PACKAGES =+ "flumotion-gui"
 
-PACKAGES =+ "${PN}-dbg flumotion-gui"
-
 FILES_${PN}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*"
 FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion"
 FILES_${PN}-dev += "${libdir}/pkgconfig"
@@ -34,7 +30,11 @@ FILES_${PN}-gui = "${bindir}/flumotion-a
                    ${libdir}/flumotion/python/flumotion/admin/gtk \
                    ${libdir}/flumotion/python/flumotion/component/*/admin_gtk* \
                    ${libdir}/flumotion/python/flumotion/component/*/*/admin_gtk* \
-                   ${libdir}/flumotion/python/flumotion/extern \
+                   ${libdir}/flumotion/python/flumotion/extern/*.py* \
+                   ${libdir}/flumotion/python/flumotion/extern/fdpass/*.py* \
+                   ${libdir}/flumotion/python/flumotion/extern/fdpass/fdpass.so \
+                   ${libdir}/flumotion/python/flumotion/extern/pytrayicon/*.py* \
+                   ${libdir}/flumotion/python/flumotion/extern/pytrayicon/pytrayicon.so \
                    ${libdir}/flumotion/python/flumotion/manager \
                    ${libdir}/flumotion/python/flumotion/ui \
                    ${libdir}/flumotion/python/flumotion/wizard \


#
# mt diff -rdfcef904001ea652ac525bfc9b2f775f88de1d70 -ra4b7f96be34f975866fbd431e728219423d4b376
#
#
#
# delete "packages/openttd/openttd_0.6.0-beta4.bb"
# 
# add_file "packages/openttd/openttd_0.6.0.bb"
#  content [9f2f06623392c97741dbe3c66bc3950b4462ecd0]
# 
# patch "classes/autotools.bbclass"
#  from [aca69d07902b5d16cc3be9cc17ba2089144114e5]
#    to [9a1f7d12a63cbf1e66e09baeb4353d43d849f4fa]
# 
# patch "conf/checksums.ini"
#  from [d56bc810ab61b67ed3f8810f504ed68e4e4c3a7d]
#    to [638739f66d6d9eca9fb02ee10e690f951d175bdf]
#
============================================================
--- packages/openttd/openttd_0.6.0.bb	9f2f06623392c97741dbe3c66bc3950b4462ecd0
+++ packages/openttd/openttd_0.6.0.bb	9f2f06623392c97741dbe3c66bc3950b4462ecd0
@@ -0,0 +1,8 @@
+require openttd.inc 
+
+PR = "r0"
+
+SRC_URI += "file://openttd_0.6.0-buildfix.patch;patch=1"
+
+
+
============================================================
--- classes/autotools.bbclass	aca69d07902b5d16cc3be9cc17ba2089144114e5
+++ classes/autotools.bbclass	9a1f7d12a63cbf1e66e09baeb4353d43d849f4fa
@@ -211,8 +211,7 @@ autotools_stage_all() {
 		else
 			# Otherwise libtool wasn't used, and lib/ can be copied
 			# directly.
-			echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}"
-			cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+      autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
 		fi
 	
 	fi
============================================================
--- conf/checksums.ini	d56bc810ab61b67ed3f8810f504ed68e4e4c3a7d
+++ conf/checksums.ini	638739f66d6d9eca9fb02ee10e690f951d175bdf
@@ -8690,6 +8690,10 @@ sha256=56e844da580761ddbb580683fc455a8d9
 md5=ddd9790c86b7ccc68f60761704cbcf81
 sha256=56e844da580761ddbb580683fc455a8d9eb3179df631568c26b7188d1ff16363
 
+[http://downloads.sourceforge.net/openttd/openttd-0.6.0-source.tar.gz]
+md5=dcf63687c73ff56887049fedaf6c6019
+sha256=39955ae5355299ac99f97093d01e66403516275dcac0f575bf1f3d0c67c17999
+
 [http://downloads.sourceforge.net/openvpn/openvpn-1.5.0.tar.gz]
 md5=55d7ce958bb2ccf3d3204d1350c27179
 sha256=d34d0a1a29de12cbb4fc6f8d80eced7b674ee3574e3df3d678fb0467283f7826