From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Mon, 23 May 2005 09:40:11 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~14119
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bba72b98ee6d482560929303f4657d445a4034d;p=openembedded.git

Merge bk://oe-devel.bkbits.net/openembedded
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/23 11:07:51+02:00 void!koen
handhelds-sa-2.6_cvs.bb, qte_2.3.10.bb:  jornada720 -> jornada7xx
devices, tslib.sh, ts.conf: mvdir jornada720 -> jornada7xx

BKrev: 4291a4fbPDUJDIhG1h3Kgngj65gA8Q
---

diff --git a/packages/initscripts/initscripts-1.0/jornada720/devices b/packages/initscripts/initscripts-1.0/jornada7xx/devices
similarity index 100%
rename from packages/initscripts/initscripts-1.0/jornada720/devices
rename to packages/initscripts/initscripts-1.0/jornada7xx/devices
diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb
index b038a75cc8..3e2c9637bf 100644
--- a/packages/linux/handhelds-sa-2.6_cvs.bb
+++ b/packages/linux/handhelds-sa-2.6_cvs.bb
@@ -15,7 +15,7 @@ inherit kernel
 #
 PAKCAGE_ARCH = "ipaqsa"
 PACKAGE_ARCH_jornada56x = "jornada56x"
-PACKAGE_ARCH_jornada720 = "jornada720"
+PACKAGE_ARCH_jornada7xx = "jornada7xx"
 PACKAGE_ARCH_simpad     = "simpad"
 
 do_configure() {
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index b853413def..72237754cc 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -36,7 +36,7 @@ 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 file://kernel-keymap-CXK.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 file://ipaq_sound_fix.patch;patch=1 "
+SRC_URI_append_jornada7xx       = "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 \
@@ -80,7 +80,7 @@ EXTRA_DEFINES_h3600     	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_h3900 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_jornada56x	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_jornada6xx	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_jornada720	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_jornada7xx	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_simpad		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
 EXTRA_DEFINES_c7x0		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
diff --git a/packages/tslib/tslib/jornada720/ts.conf b/packages/tslib/tslib/jornada7xx/ts.conf
similarity index 100%
rename from packages/tslib/tslib/jornada720/ts.conf
rename to packages/tslib/tslib/jornada7xx/ts.conf
diff --git a/packages/tslib/tslib/jornada720/tslib.sh b/packages/tslib/tslib/jornada7xx/tslib.sh
similarity index 100%
rename from packages/tslib/tslib/jornada720/tslib.sh
rename to packages/tslib/tslib/jornada7xx/tslib.sh