3 files changed, 64 insertions, 67 deletions

diff --git a/qt/control/qte-fonts-common.control b/qt/control/qte-fonts-common.control
index 403aa88..b378e02 100644
--- a/qt/control/qte-fonts-common.control
+++ b/qt/control/qte-fonts-common.control
@@ -1,8 +1,8 @@
 Package: qte-fonts-common
-Files: $QTDIR/bin/update-qtfontdir
+Files: $OPIEDIR/root/usr/sbin/update-qtfontdir
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1:$QTE_VERSION-$QTE_REVISION
+Version: 1:$QTE_VERSION-$QTE_REVISION-1
 Description: Qt/Embedded font common files
diff --git a/qt/qte234-for-opie091-fontdir.patch b/qt/qte234-for-opie091-fontdir.patch
deleted file mode 100644
index 3b3daf4..0000000
--- a/qt/qte234-for-opie091-fontdir.patch
+++ b/dev/null
@@ -1,65 +0,0 @@
-        --- /dev/null2003-01-17 15:37:44.000000000 -0600
-        +++ bin/update-qtfontdir2003-04-22 00:37:07.000000000 -0500
-@@ -0,0 +1,62 @@
-+#!/bin/sh
-+
-+usage()
-+{
-+    echo "usage: $0 [font directory, defaults to QTDIR/lib/fonts]"
-+    exit 1
-+}
-+
-+setVar()
-+{
-+    eval "$1='$2'"
-+}
-+
-+getVar()
-+{
-+    eval "echo \$$1"
-+}
-+
-+handleQPF()
-+{
-+    base=`basename $1`
-+    family=`echo $base|cut -d_ -f1`
-+    pt=`echo $base|cut -d_ -f2`
-+    weight=`echo $base|cut -d_ -f3|sed -e 's,i$,,'`
-+    if (echo $base|cut -d_ -f3|grep -q 'i$'); then
-+        italic="y"
-+    else
-+        italic="n"
-+    fi
-+    echo "$family $base.qpf QPF $italic $weight $pt u"
-+}
-+
-+if [ -z "$1" ]; then
-+    if [ -n "$QTDIR" ]; then
-+        fontdir=$QTDIR/lib/fonts
-+    else
-+        fontdir=/opt/QtPalmtop/lib/fonts
-+    fi
-+else
-+    fontdir=$1
-+fi
-+    
-+if ! [ -d $fontdir ]; then
-+    echo Error: $fontdir not a directory
-+    exit 1
-+fi
-+
-+if [ -e $fontdir/fontdir ]; then
-+    cat $fontdir/fontdir | grep -v '\.qpf' > $fontdir/fontdir.new
-+fi
-+
-+(
-+    for file in `ls $fontdir/*.qpf|sed -e's,\.qpf$,,; s,_t[^_]*$,,;'|sort -u`; do
-+        handleQPF $file
-+    done
-+) >> $fontdir/fontdir.new
-+
-+mv $fontdir/fontdir.new $fontdir/fontdir
-+
-+exit 0
-+
-+# vim:ai:et:sts=4:sw=4:tw=0:
diff --git a/root/usr/sbin/update-qtfontdir b/root/usr/sbin/update-qtfontdir
new file mode 100755
index 0000000..6df7b50
--- a/dev/null
+++ b/root/usr/sbin/update-qtfontdir
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+usage()
+{
+    echo "usage: $0 [font directory, defaults to QTDIR/lib/fonts]"
+    exit 1
+}
+
+setVar()
+{
+    eval "$1='$2'"
+}
+
+getVar()
+{
+    eval "echo \$$1"
+}
+
+handleQPF()
+{
+    base=`basename $1`
+    family=`echo $base|cut -d_ -f1`
+    pt=`echo $base|cut -d_ -f2`
+    weight=`echo $base|cut -d_ -f3|sed -e 's,i$,,'`
+    if (echo $base|cut -d_ -f3|grep -q 'i$'); then
+        italic="y"
+    else
+        italic="n"
+    fi
+    echo "$family $base.qpf QPF $italic $weight $pt u"
+}
+
+if [ -z "$1" ]; then
+    if [ -n "$QTDIR" ]; then
+        fontdir=$QTDIR/lib/fonts
+    else
+        fontdir=/opt/QtPalmtop/lib/fonts
+    fi
+else
+    fontdir=$1
+fi
+    
+if ! [ -d $fontdir ]; then
+    echo Error: $fontdir not a directory
+    exit 1
+fi
+
+if [ -e $fontdir/fontdir ]; then
+    cat $fontdir/fontdir | grep -v '\.qpf' > $fontdir/fontdir.new
+fi
+
+(
+    for file in `ls $fontdir/*.qpf|sed -e's,\.qpf$,,; s,_t[^_]*$,,;'|sort -u`; do
+        handleQPF $file
+    done
+) >> $fontdir/fontdir.new
+
+mv $fontdir/fontdir.new $fontdir/fontdir
+
+exit 0
+
+# vim:ai:et:sts=4:sw=4:tw=0: