diff options
| -rw-r--r-- | opie-networksettings/opie-networksettings_cvs.oe | 10 | ||||
| -rw-r--r-- | opie-taskbar/opie-taskbar/beagle/locale.conf | 0 | ||||
| -rw-r--r-- | opie-taskbar/opie-taskbar/locale.conf | 0 | ||||
| -rw-r--r-- | opie-taskbar/opie-taskbar/opie | 4 | ||||
| -rw-r--r-- | opie-taskbar/opie-taskbar_cvs.oe | 6 |
5 files changed, 17 insertions, 3 deletions
diff --git a/opie-networksettings/opie-networksettings_cvs.oe b/opie-networksettings/opie-networksettings_cvs.oe index 955747c7ad..7eeb6b44b0 100644 --- a/opie-networksettings/opie-networksettings_cvs.oe +++ b/opie-networksettings/opie-networksettings_cvs.oe @@ -5,13 +5,14 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin" PV = "1.1.6-${CVSDATE}" -PR = "r1" +PR = "r2" APPNAME = "networksettings" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/networksettings \ cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \ - cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps" + cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \ + cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/root" S = "${WORKDIR}/${APPNAME}" @@ -20,6 +21,7 @@ inherit opie EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}" do_install() { + install -d ${D}/${bindir}/ install -d ${D}/${palmtopdir}/pics/${APPNAME}/ install -d ${D}/${palmtopdir}/pics/Network/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/ @@ -31,9 +33,13 @@ do_install() { do install lib$plugin.so ${D}/${palmtopdir}/plugins/networksettings/ done + + # install changedns script + install -m 0644 ${WORKDIR}/root/usr/bin/changedns ${D}${bindir}/ } PACKAGES =+ "opie-networksettings-pppplugin opie-networksettings-wlanplugin" +FILES_${PN} += " ${bindir}/changedns " FILES_opie-networksettings-pppplugin = "${palmtopdir}/plugins/networksettings/libkppp.so" FILES_opie-networksettings-wlanplugin = "${palmtopdir}/plugins/networksettings/libwlan.so" diff --git a/opie-taskbar/opie-taskbar/beagle/locale.conf b/opie-taskbar/opie-taskbar/beagle/locale.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/opie-taskbar/opie-taskbar/beagle/locale.conf diff --git a/opie-taskbar/opie-taskbar/locale.conf b/opie-taskbar/opie-taskbar/locale.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/opie-taskbar/opie-taskbar/locale.conf diff --git a/opie-taskbar/opie-taskbar/opie b/opie-taskbar/opie-taskbar/opie index 91bdff1901..e12ec6bf15 100644 --- a/opie-taskbar/opie-taskbar/opie +++ b/opie-taskbar/opie-taskbar/opie @@ -43,6 +43,10 @@ if [ ! -e "$HOME/Settings/qpe.conf" ] ; then cat $OPIEDIR/etc/skel/qpe.conf >$HOME/Settings/qpe.conf fi +if [ ! -e "$HOME/Settings/locale.conf" -a -e "$OPIEDIR/etc/skel/locale.conf" ] ; then + cat $OPIEDIR/etc/skel/locale.conf >$HOME/Settings/locale.conf +fi + case $1 in 'start') /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe index e43388faee..876a9ef91c 100644 --- a/opie-taskbar/opie-taskbar_cvs.oe +++ b/opie-taskbar/opie-taskbar_cvs.oe @@ -18,7 +18,8 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/cal file://server.pro \ file://opie-reorgfiles \ file://opie \ - file://qpe.conf" + file://qpe.conf \ + file://locale.conf " S = "${WORKDIR}/launcher" @@ -91,6 +92,9 @@ do_install() { install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/ + if [ -s ${WORKDIR}/locale.conf ]; then + install -m 0644 ${WORKDIR}/locale.conf ${D}/${palmtopdir}/etc/skel/ + fi } # These two should be installed only on devices with keyboard |