Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/29 14:38:25+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/29 14:38:00+02:00 uni-frankfurt.de!mickeyl
apply the ipaq sound patch to qte also for the jornadas

BKrev: 42494cfanG8edxmu0V6zJz0lUMxKug

diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 346aa7d..3a8a28f 100644 (file)
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
           file://qpe.patch;patch=1 \
@@ -33,8 +33,8 @@ SRC_URI_append_spitz          = "file://kernel-keymap.patch;patch=1 file://kernel-keymap
 SRC_URI_append_akita            = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
 SRC_URI_append_tosa            = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_beagle          = "file://beagle.patch;patch=1 "
-SRC_URI_append_jornada720       = "file://kernel-keymap.patch;patch=1 "
-SRC_URI_append_jornada56x       = "file://kernel-keymap.patch;patch=1 "
+SRC_URI_append_jornada720       = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+SRC_URI_append_jornada56x       = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 SRC_URI_append_ramses           = "file://devfs.patch;patch=1 \
                                    file://ramses.patch;patch=1 \
                                    file://ramses-touchscreen.patch;patch=1 \