[oe-commits] org.oe.dev merge of '1d05bbd701cd09434dbcc309dc00e37c3f1e2b54'

rwhitby commit openembedded-commits at lists.openembedded.org
Thu Jun 21 17:43:50 UTC 2007


merge of '1d05bbd701cd09434dbcc309dc00e37c3f1e2b54'
     and 'b13acb8162da7643f4bf14ef3ed160979530a72f'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 9fbb7d1ceaba35be921b769ec7d9551c6629d61c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9fbb7d1ceaba35be921b769ec7d9551c6629d61c
Files:
1
packages/gpsd/gpsd_2.32.bb
packages/gpsd/gpsd_2.33.bb
packages/linux/a780-kernel_2.6.bb
packages/linux/e680-kernel_2.6.bb
packages/efl/etk_20060418.bb
packages/efl/etk_0.1.0.003.bb
packages/flumotion
packages/flumotion/files
packages/gpe-shield/files
packages/simh
packages/simh/files
packages/fbgrab/fbgrab-viewer-native_1.0.bb
packages/flumotion/files/no-check-for-python-stuff.patch
packages/flumotion/files/python-path.patch
packages/flumotion/flumotion_0.4.1.bb
packages/gpe-shield/files/uncrypt-startup-error.patch
packages/iproute2/iproute2_2.6.20.bb
packages/libmatchbox/files/16bppfixes-2.patch
packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb
packages/simh/files/makefile.patch
packages/simh/simh_3.7-1.bb
packages/xorg-xserver/xserver-kdrive-1.2.0/kdrive-imageon.patch
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
conf/checksums.ini
conf/distro/angstrom-2007.1.conf
conf/machine/magician.conf
packages/gnome/gnome-cups-manager_0.31.bb
packages/gpe-session-scripts/files/angstrom/matchbox-session
packages/gpe-session-scripts/files/matchbox-session
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/gpe-shield/gpe-shield_0.9.bb
packages/gpsd/gpsd.inc
packages/gpsd/gpsd_2.34.bb
packages/initscripts/initscripts-1.0/ramdisk
packages/initscripts/initscripts_1.0.bb
packages/iproute2/iproute2.inc
packages/iproute2/iproute2_2.6.16.bb
packages/iproute2/iproute2_2.6.18.bb
packages/kanjipad/kanjipad.inc
packages/libmatchbox/libmatchbox_1.9.bb
packages/libxosd/libxosd_svn.bb
packages/linux/LAB-kernel_2.6.13-hh2.bb
packages/linux/LAB-kernel_cvs.bb
packages/linux/linux-2.6.20/at91sam9263ek/defconfig
packages/linux/linux-h1940_2.6.11-bk1-h1940.bb
packages/linux/linux-h1940_2.6.14-h1940.bb
packages/linux/linux-h1940_2.6.17-h1940.bb
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux_2.6.20.bb
packages/python/python-gst_0.10.7.bb
packages/python/python-pygobject_2.12.2.bb
packages/python/python-pygtk2_2.10.3.bb
packages/udev/files/init
packages/udev/udev-092/init
packages/udev/udev-097/init
packages/udev/udev-100/init
packages/udev/udev_092.bb
packages/udev/udev_097.bb
packages/udev/udev_100.bb
packages/uim/uim.inc
packages/uim/uim_1.3.1.bb
packages/xorg-app/mkfontdir-native_1.0.3.bb
packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
packages/xorg-app/mkfontdir_1.0.3.bb
packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
packages/zope/zope_3.3.1.bb
Diffs:

#
# mt diff -r1d05bbd701cd09434dbcc309dc00e37c3f1e2b54 -r9fbb7d1ceaba35be921b769ec7d9551c6629d61c
#
# 
# no changes
# 


#
# mt diff -rb13acb8162da7643f4bf14ef3ed160979530a72f -r9fbb7d1ceaba35be921b769ec7d9551c6629d61c
#
# 
# 
# delete "packages/gpsd/gpsd_2.32.bb"
# 
# delete "packages/gpsd/gpsd_2.33.bb"
# 
# delete "packages/linux/a780-kernel_2.6.bb"
# 
# delete "packages/linux/e680-kernel_2.6.bb"
# 
# rename "packages/efl/etk_20060418.bb"
#     to "packages/efl/etk_0.1.0.003.bb"
# 
# add_dir "packages/flumotion"
# 
# add_dir "packages/flumotion/files"
# 
# add_dir "packages/gpe-shield/files"
# 
# add_dir "packages/simh"
# 
# add_dir "packages/simh/files"
# 
# add_file "packages/fbgrab/fbgrab-viewer-native_1.0.bb"
#  content [41865507448f3931099b63aa00c62422c47e7005]
# 
# add_file "packages/flumotion/files/no-check-for-python-stuff.patch"
#  content [5dfdb0b91e2af78134cf08c837662a23ed1331e7]
# 
# add_file "packages/flumotion/files/python-path.patch"
#  content [a5175a8645f591de1724bed3939cce5f12254f2a]
# 
# add_file "packages/flumotion/flumotion_0.4.1.bb"
#  content [de39275bba6b575a7c2fc7d53f27aa915be67474]
# 
# add_file "packages/gpe-shield/files/uncrypt-startup-error.patch"
#  content [a050a5c5c18c24a9b855ab08278ec923636d39c4]
# 
# add_file "packages/iproute2/iproute2_2.6.20.bb"
#  content [1645f0e483e54de590c831fb8a46a0c999c4b0c9]
# 
# add_file "packages/libmatchbox/files/16bppfixes-2.patch"
#  content [d7378d946ef90dce6dc13493cf850dfa482a930f]
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb"
#  content [252b9c26ddd2fda4271f4352999ce0facbfece99]
# 
# add_file "packages/simh/files/makefile.patch"
#  content [f699d4ef5c7ec9aa5379ae740b595c6591be1094]
# 
# add_file "packages/simh/simh_3.7-1.bb"
#  content [6b15c20dd7bc523793024c8a37446199bd4a531b]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.2.0/kdrive-imageon.patch"
#  content [a4aa3d492e612c59eb6e523a074dbdc47a4f6589]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
#  content [9dccb60e157f1a3ff2540d6f5389735882719979]
# 
# patch "conf/checksums.ini"
#  from [255d3b753a0f7e1c1a6cafc516b333c3e88c6cff]
#    to [4f0c47942c3102a1f29aa4c7290526c9c7c177fd]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [bc28aea5426c79046af0efa6378df777792ba21d]
#    to [c5284f5ebbac726ad1a23c0f97b67403c1e52ffe]
# 
# patch "conf/machine/magician.conf"
#  from [1e6db625d80308d8ec214a2e0718181b432ffee0]
#    to [a7fb4b2e2e543b31b162a08be84244bfdd3486c0]
# 
# patch "packages/efl/etk_0.1.0.003.bb"
#  from [87426a2762978a15f41f4ba64bd4011bd9a1cb01]
#    to [3247bfa8df510452c7dd337e4db7f8e881c2c01e]
# 
# patch "packages/gnome/gnome-cups-manager_0.31.bb"
#  from [a914bd28b0baf0b1a76b7802af38a8be4070b6d5]
#    to [c596ed1a614d1e6314106c7cbdc326f6f8e9e236]
# 
# patch "packages/gpe-session-scripts/files/angstrom/matchbox-session"
#  from [fa1348d4ea89a915dacc8f8dfbacbbe163463894]
#    to [5f2775906eeda8b22303d2452c158ba979a9595d]
# 
# patch "packages/gpe-session-scripts/files/matchbox-session"
#  from [87b7e3d1525d163eb005a999ec81257ee9f613f7]
#    to [5c0f9302bc62e8b8612888f54ec5d2c9300d75ab]
# 
# patch "packages/gpe-session-scripts/gpe-session-scripts_0.67.bb"
#  from [1fb474eada53d5e8a4c4fcd539a0708916752c46]
#    to [66c3ab86d2f892000aaad0732b969b1749d60985]
# 
# patch "packages/gpe-shield/gpe-shield_0.9.bb"
#  from [650032d88b1fa6a9dc541e15114725f58107255e]
#    to [1aa423dad8082bb2c4f8de8dbc32dceb463bf0d5]
# 
# patch "packages/gpsd/gpsd.inc"
#  from [153c2ab0f047d46cd9c2e412374dfb9917e6e37b]
#    to [c7649330848449ec225ab3ce08675938bf8692a5]
# 
# patch "packages/gpsd/gpsd_2.34.bb"
#  from [e7423c783c6edfa634685a22f2821e44fa28c764]
#    to [bc6d9fe5bade30c42fe008d3bb1b9059e9aa40e0]
# 
# patch "packages/initscripts/initscripts-1.0/ramdisk"
#  from [f9244581e0af75108c46f816dafd01320c6eee5d]
#    to [fbb1bccbf28266c6060d6871639e30062e0f73d0]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [50e5a2313f1bf7c0308b574f46bdddd919f59aaf]
#    to [d1337b7efc5158feab278f23b35fb9d91519c2ca]
# 
# patch "packages/iproute2/iproute2.inc"
#  from [68be970b353b426e113ae7d56d0a5ef1cb1910f4]
#    to [8ced56f6a6b7b1b35bc1eac1f631ae11a91617e0]
# 
# patch "packages/iproute2/iproute2_2.6.16.bb"
#  from [72733c7641b9bf180ce67d8fabe5b2aa228e515d]
#    to [d7129a2d48dca39c3cf69ba3382297249a83b45e]
# 
# patch "packages/iproute2/iproute2_2.6.18.bb"
#  from [ec20043c564decd8baffc6e1df45acb436574067]
#    to [ed105c98db7cbc002aa5185aac193dd86b7f6b89]
# 
# patch "packages/kanjipad/kanjipad.inc"
#  from [865d795f79ee3533a4cc6741ff3b68565d667a70]
#    to [292424101df16156ecb6082e50d8c5b64e8944ef]
# 
# patch "packages/libmatchbox/libmatchbox_1.9.bb"
#  from [e9fe020b3c32e98763535fe274c50311177deb8e]
#    to [365c3dda341f2c4325bd84ab2891014107edcd0a]
# 
# patch "packages/libxosd/libxosd_svn.bb"
#  from [f213f343e3a233f08a138922f6f73975c1b8474e]
#    to [a4c0d1f79f10ad941aad14baa96a24ce4a54f563]
# 
# patch "packages/linux/LAB-kernel_2.6.13-hh2.bb"
#  from [7deb2ad885fe756015ac323959fec92dc7a778fd]
#    to [21b2c94a538b886075cdc74ca6cbd4087628ced1]
# 
# patch "packages/linux/LAB-kernel_cvs.bb"
#  from [8e3505b3794e207d9b975e0eed86f0c570836ecc]
#    to [85c1fa63bcdd31dc57b94a7a4cd03e467fa9a727]
# 
# patch "packages/linux/linux-2.6.20/at91sam9263ek/defconfig"
#  from [2adb6d48f81a9ed50f1f8451bcd8468675bcce99]
#    to [aca35121befe2fe44f16a513d91196f944159b7b]
# 
# patch "packages/linux/linux-h1940_2.6.11-bk1-h1940.bb"
#  from [a8f806f36ec91d3f850e8ce3591c5176509d7548]
#    to [150f822b26cbde16756f83c9950c27ec1a04d9e3]
# 
# patch "packages/linux/linux-h1940_2.6.14-h1940.bb"
#  from [0422fe06a272c3fe1da0c08987258162b92be644]
#    to [708e26d474291261a1d60653e58061853fd97716]
# 
# patch "packages/linux/linux-h1940_2.6.17-h1940.bb"
#  from [0104d2f5c2e0e93b4d2e32815656059bffeb16f2]
#    to [4840f35fdabc622cb060fe5a587034ed049eab17]
# 
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
#  from [dad630926b5dbcc22884de2927dffa9b9aa5e921]
#    to [7f423e90fa17b40e0b64c55f3fa003334d1a26af]
# 
# patch "packages/linux/linux_2.6.20.bb"
#  from [a3a2e19e0b862f594bec0ab5197bfdcb54269f40]
#    to [fb2419e782660a25634a9dc67f3e3e531da22326]
# 
# patch "packages/python/python-gst_0.10.7.bb"
#  from [e533e39909a739ef843c00c1c244aaf27670136f]
#    to [349aeef02c287750f80c428d64464559f51c37be]
# 
# patch "packages/python/python-pygobject_2.12.2.bb"
#  from [20091717bf90c3bd85fa4efaf169f4c5fa3b6d7f]
#    to [2608f9e9a904319912666247a24388fb2c10d258]
# 
# patch "packages/python/python-pygtk2_2.10.3.bb"
#  from [b5ee6bdf4f73b022bcfa413c7f9ec6a7e5027c43]
#    to [df57ad29e38f903a43bce73e072dab39d5b4c052]
# 
# patch "packages/udev/files/init"
#  from [f28589ba13562efd15184c15f8664cac486c6c4a]
#    to [0eaf02554e92a27efee8e176c35b8eee809a1ca6]
# 
# patch "packages/udev/udev-092/init"
#  from [54466ceaaabcdac815f2c7862996544ef9b2dc19]
#    to [109a0d50fdcbfc1bd8277ba6a8099efe39a135bc]
# 
# patch "packages/udev/udev-097/init"
#  from [6b909ce1f686b73d7df86e399360055ee1ae3862]
#    to [999cce42a7fe3f683e975df81d8b450187c4e8f3]
# 
# patch "packages/udev/udev-100/init"
#  from [6b909ce1f686b73d7df86e399360055ee1ae3862]
#    to [999cce42a7fe3f683e975df81d8b450187c4e8f3]
# 
# patch "packages/udev/udev_092.bb"
#  from [8e01342dd864804403f542f123a7344ada82c258]
#    to [a4b112038d53214ff29eb19b0a49cd3300db87e9]
# 
# patch "packages/udev/udev_097.bb"
#  from [1168153d781a2ab645fabf9f8fc83e95382e9209]
#    to [1670066b56c71bc70cf150d20bcd3c01c94180c3]
# 
# patch "packages/udev/udev_100.bb"
#  from [b5f9492d4c5c38454bcb4035511b25b037bdff5b]
#    to [052ad350b235989b24d5180ae1d34444ec6f5b93]
# 
# patch "packages/uim/uim.inc"
#  from [cb9a5cb86d26c6dc291adb25171e4e4d2c69af93]
#    to [14e1f43be243a5721dd3aaa3f1be157b79c1042e]
# 
# patch "packages/uim/uim_1.3.1.bb"
#  from [0f0119e18e96c4e5ea7e19dcfcd665bb5f424b30]
#    to [cfce7a7adade1d1cc8e2c68fe3036c4d32c99f1f]
# 
# patch "packages/xorg-app/mkfontdir-native_1.0.3.bb"
#  from [1aded3f9087c6678c60e99dc4cdd11339334e74d]
#    to [404c1c59a37da0063a5ffe979efa4efe022c43f8]
# 
# patch "packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb"
#  from [3db206a91dcceb8f8489265ef442029970fccdc2]
#    to [b3877477cdd2329c4177a423e92b8555ded30423]
# 
# patch "packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb"
#  from [a6f117a38efff519a99d7ac6ea81ac03cdc4e5ba]
#    to [4a137376a10fde2a9b48558add2ad895dd1baff0]
# 
# patch "packages/xorg-app/mkfontdir_1.0.3.bb"
#  from [69acb453b326a341063843ac11d81cda3880b971]
#    to [a4321e89da7de3da8eb599ad2190a71088788b42]
# 
# patch "packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb"
#  from [4d69407ff7d23cc50f4701d8fa5f2d5ef548f6a4]
#    to [7b251470b3c7e57783ff7aaa5418f18403a44994]
# 
# patch "packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb"
#  from [4d69407ff7d23cc50f4701d8fa5f2d5ef548f6a4]
#    to [7b251470b3c7e57783ff7aaa5418f18403a44994]
# 
# patch "packages/zope/zope_3.3.1.bb"
#  from [76e578bec4263108a7140a36df255eb9a816b9db]
#    to [fe2c4e4ec1e64ae8e73c9d12fc1d47e972968891]
# 
============================================================
--- packages/fbgrab/fbgrab-viewer-native_1.0.bb	41865507448f3931099b63aa00c62422c47e7005
+++ packages/fbgrab/fbgrab-viewer-native_1.0.bb	41865507448f3931099b63aa00c62422c47e7005
@@ -0,0 +1,31 @@
+DESCRIPTION = "Viewer for a network enabled fbgrab"
+HOMEPAGE = "http://svn.openezx.org/trunk/src/userspace/fbgrab/"
+LICENSE = "GPL"
+SECTION = "console/network"
+DEPENDS = "libpng-native"
+PV = "0.0+svn${SRCDATE}"
+PR = "r30"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=fbgrab;proto=http"
+S = "${WORKDIR}/fbgrab"
+
+inherit native
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} -g -Wall -lpng -lX11 -o fbgrab-viewer fbgrab-viewer.c
+}
+
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0755 fbgrab-viewer ${DEPLOY_DIR_IMAGE}/fbgrab-viewer
+}
+
+do_stage() {
+    :
+}
+
+do_install() {
+    :
+}
+
+addtask deploy before do_install after do_compile
============================================================
--- packages/flumotion/files/no-check-for-python-stuff.patch	5dfdb0b91e2af78134cf08c837662a23ed1331e7
+++ packages/flumotion/files/no-check-for-python-stuff.patch	5dfdb0b91e2af78134cf08c837662a23ed1331e7
@@ -0,0 +1,68 @@
+Index: flumotion-0.4.1/configure.ac
+===================================================================
+--- flumotion-0.4.1.orig/configure.ac	2007-03-05 17:16:48.121264330 +0100
++++ flumotion-0.4.1/configure.ac	2007-03-05 17:20:40.343837320 +0100
+@@ -73,13 +73,6 @@
+   AC_MSG_ERROR([PyGTK 2.5.2 contains known bugs, please install other version])
+ fi
+ 
+-if test "x$DISPLAY" != "x"; then
+-  AS_PYTHON_IMPORT([gtk.glade],,
+-                   AC_MSG_ERROR([You need to have python libglade bindings installed]))
+-else
+-  AC_MSG_NOTICE([Not trying to import gtk.glade because DISPLAY is unset])
+-fi
+-
+ if test $GST_010_SUPPORTED = "no"; then
+   AC_MSG_ERROR([No appropriate version of PyGTK installed. Correct the above
+ errors and try again.])
+@@ -94,16 +87,6 @@
+       [AC_MSG_RESULT([$PYGST_010_PKG_ERRORS])
+        GST_010_SUPPORTED=no])
+ 
+-  if test $GST_010_SUPPORTED = "yes"; then
+-    saved_PYTHONPATH=$PYTHONPATH
+-    export PYTHONPATH=$PYGST_010_DIR:$PYTHONPATH
+-    AS_PYTHON_IMPORT([gst],,
+-                     [AC_MSG_NOTICE([Unable to import gst-python 0.10 -- check your PYTHONPATH?])
+-                      GST_010_SUPPORTED=no],
+-                     [import pygst; pygst.require('0.10')],
+-                     [assert gst.pygst_version[[1]] == 10 or (gst.pygst_version[[1]] == 9 and gst.pygst_version[[2]] >= 7)])
+-
+-  fi
+ fi
+ 
+ if test $GST_010_SUPPORTED = "no"; then
+@@ -158,32 +141,7 @@
+ AC_CHECK_PROG(PYCHECKER, pychecker, yes, no)
+ AM_CONDITIONAL(HAVE_PYCHECKER, test "x$PYCHECKER" = "xyes")
+ 
+-dnl check for Twisted
+-AS_PYTHON_IMPORT(twisted,
+-  [
+-  AC_MSG_CHECKING(for Twisted >= 2.0.1)
+-  prog="
+-import sys
+-import twisted.copyright
+-minver = '2.0.1'
+-if twisted.copyright.version < minver:
+-    sys.exit(1)
+-sys.exit(0)
+-"
+-  if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+-  then
+-    AC_MSG_RESULT(found)
+-  else
+-    AC_MSG_RESULT(too old)
+-    AC_MSG_ERROR([You need at least version 2.0.1 of Twisted])
+-  fi
+-  ]
+-  ,
+-  AC_MSG_ERROR([You need at least version 2.0.1 of Twisted])
+-)
+ 
+-TWISTED_MODULE([twisted.names])
+-TWISTED_MODULE([twisted.web])
+ 
+ AC_CONFIG_FILES([env], [chmod +x env])
+ AC_CONFIG_FILES([bin/flumotion], [chmod +x bin/flumotion])
============================================================
--- packages/flumotion/files/python-path.patch	a5175a8645f591de1724bed3939cce5f12254f2a
+++ packages/flumotion/files/python-path.patch	a5175a8645f591de1724bed3939cce5f12254f2a
@@ -0,0 +1,25 @@
+Index: flumotion-0.3.1/common/as-python.m4
+===================================================================
+--- flumotion-0.3.1.orig/common/as-python.m4	2007-03-02 15:26:46.704717964 +0100
++++ flumotion-0.3.1/common/as-python.m4	2007-03-02 15:27:28.601326374 +0100
+@@ -199,6 +199,12 @@
+   AC_MSG_CHECKING(for headers required to compile python extensions)
+ 
+   dnl deduce PYTHON_INCLUDES
++
++  AC_ARG_WITH(python-includes,
++  	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
++  if test x$py_exec_prefix != x; then
++  PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++  else
+   py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+   py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+   PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+@@ -206,6 +212,7 @@
+   if test "$py_prefix" != "$py_exec_prefix"; then
+     PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+   fi
++  fi
+   AC_SUBST(PYTHON_INCLUDES)
+ 
+   dnl check if the headers exist:
============================================================
--- packages/flumotion/flumotion_0.4.1.bb	de39275bba6b575a7c2fc7d53f27aa915be67474
+++ packages/flumotion/flumotion_0.4.1.bb	de39275bba6b575a7c2fc7d53f27aa915be67474
@@ -0,0 +1,35 @@
+DESCRIPTION = "Fluendo Streaming Server"
+LICENSE = "GPL"
+DEPENDS = "gstreamer python-gst twisted python-pygtk2"
+RDEPENDS = " python-compression python-fcntl  python-pygobject python-pickle python-netclient python-datetime python-crypt python-twisted-core python-twisted-web python-lang python-zopeinterface  python-textutils python-core python-gst python-misc"
+RDEPENDS_${PN}-gui = "${PN} python-pygtk2"
+PR = "r6"
+
+SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
+           file://python-path.patch;patch=1 \
+	   file://no-check-for-python-stuff.patch;patch=1"
+
+inherit autotools distutils-base pkgconfig
+
+export EPYDOC = "no"
+
+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 =+ "${PN}-dbg flumotion-gui"
+
+FILES_${PN}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*"
+FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion"
+FILES_${PN}-dev += "${libdir}/pkgconfig"
+FILES_${PN}-gui = "${bindir}/flumotion-admin ${bindir}/flumotion-tester \
+                   ${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/manager \
+                   ${libdir}/flumotion/python/flumotion/ui \
+                   ${libdir}/flumotion/python/flumotion/wizard \
+                   ${datadir}/pixmaps ${datadir}/flumotion ${datadir}/applications"
============================================================
--- packages/gpe-shield/files/uncrypt-startup-error.patch	a050a5c5c18c24a9b855ab08278ec923636d39c4
+++ packages/gpe-shield/files/uncrypt-startup-error.patch	a050a5c5c18c24a9b855ab08278ec923636d39c4
@@ -0,0 +1,13 @@
+diff -ur gpe-shield-0.9.org/interface.c gpe-shield-0.9/interface.c
+--- gpe-shield-0.9.org/interface.c	2006-02-04 23:53:45.000000000 +0000
++++ gpe-shield-0.9/interface.c	2007-06-18 01:50:02.000000000 +0000
+@@ -569,7 +569,8 @@
+ {
+ 	if (cmd == CMD_NO_IPTABLES)
+ 		show_message(GTK_MESSAGE_WARNING, _("This system does not " \
+-	                                        "support firewalling or you"\
++	                      %s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list