[oe-commits] org.oe.dev merge of '0fc25c0f2420f554e8c8acaff2236e25542cca15'

[Laibsch commit]

merge of '0fc25c0f2420f554e8c8acaff2236e25542cca15'
     and 'a9cd11891042f0feacf08c33d9bb44f0448e8346'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 382c98d284950be594f10e04d18677cb8c3a6785
ViewMTN: http://monotone.openembedded.org/revision/info/382c98d284950be594f10e04d18677cb8c3a6785
Files:
1
packages/gphoto2/libgphoto2_2.1.4.bb
packages/libgphoto2/libgphoto2_2.1.4.bb
packages/gphoto2/libgphoto2_2.1.5.bb
packages/libgphoto2/libgphoto2_2.1.5.bb
packages/gphoto2/libgphoto2_2.1.6.bb
packages/libgphoto2/libgphoto2_2.1.6.bb
packages/gphoto2/libgphoto2_2.4.0.bb
packages/libgphoto2/libgphoto2_2.4.0.bb
packages/libgphoto2
packages/avahi/mango-lassi_git.bb
Diffs:

#
# mt diff -r0fc25c0f2420f554e8c8acaff2236e25542cca15 -r382c98d284950be594f10e04d18677cb8c3a6785
#
#
#
# rename "packages/gphoto2/libgphoto2_2.1.4.bb"
#     to "packages/libgphoto2/libgphoto2_2.1.4.bb"
# 
# rename "packages/gphoto2/libgphoto2_2.1.5.bb"
#     to "packages/libgphoto2/libgphoto2_2.1.5.bb"
# 
# rename "packages/gphoto2/libgphoto2_2.1.6.bb"
#     to "packages/libgphoto2/libgphoto2_2.1.6.bb"
# 
# rename "packages/gphoto2/libgphoto2_2.4.0.bb"
#     to "packages/libgphoto2/libgphoto2_2.4.0.bb"
# 
# add_dir "packages/libgphoto2"
# 
# patch "packages/avahi/mango-lassi_git.bb"
#  from [3a59c1e0e88776b7c84accb2784335ec0f085416]
#    to [0642c42c300edc7e3350d2d49809a0a6ed6fa2e3]
#
============================================================
--- packages/avahi/mango-lassi_git.bb	3a59c1e0e88776b7c84accb2784335ec0f085416
+++ packages/avahi/mango-lassi_git.bb	0642c42c300edc7e3350d2d49809a0a6ed6fa2e3
@@ -1,17 +1,15 @@
-DESCRIPTION = "Input sharing, the avahi way"
+ESCRIPTION = "Input sharing, the avahi way"
 DEPENDS = "avahi-ui libglade libnotify"
 
-PV = "0.0+git${SRCDATE}"
+SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93"
+PV = "0.0+${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http"
 
+S = "${WORKDIR}/git"
 
-S = "${WORKDIR}/${PN}"
+inherit autotools
 
-do_compile_prepend() {
-        export CFLAGS="-Wall -Wextra -W -O0 -g -pipe -Wno-unused-parameter `pkg-config --cflags dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-ui avahi-glib avahi-client libnotify libglade-2.0` `pkg-config --libs dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-glib avahi-client avahi-ui libnotify libglade-2.0`"
-}
-
 do_install() {
         install -d ${D}${bindir}
 	install -m 755 mango-lassi ${D}${bindir}


#
# mt diff -ra9cd11891042f0feacf08c33d9bb44f0448e8346 -r382c98d284950be594f10e04d18677cb8c3a6785
#
#
# no changes
#