1 files changed, 18 insertions, 2 deletions

diff --git a/mkipks b/mkipks
index d4e4b38..3fbf160 100755
--- a/mkipks
+++ b/mkipks
@@ -1,132 +1,148 @@
 #!/bin/sh
 
-[ -z "$QTE_VERSION" ] && QTE_VERSION=2.3.4
-[ -z "$QTE_BASEVERSION" ] && QTE_BASEVERSION=2.3.4
+if [ -z "$QTE_BASEVERSION" ]
+then
+    if [ -e $QTDIR/include/qglobal.h ]
+    then
+        QTE_BASEVERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION'|grep -v STR|sed -e 's,#define QT_VERSION\t*,,;' -e 's,.*\([0-9]\)\([0-9]\)\([0-9]\).*,\1.\2.\3,;'`
+    else
+        QTE_BASEVERSION=2.3.4
+    fi
+fi
+if [ -z "$QTE_VERSION" ]
+then
+    if [ -e $QTDIR/include/qglobal.h ]
+    then
+        QTE_VERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION_STR'|sed -e 's,#define QT_VERSION_STR\t*,,;' -e 's,.*"\([^"]*\)".*,\1,;'`
+    else
+        QTE_VERSION=2.3.4
+    fi
+fi
 [ -z "$QTE_REVISION" ] && QTE_REVISION=3
 DEB_VERSION=2.0
 
 # Have to do this here, since CVS can't store symlinks
 
 mkdir -p $OPIEDIR/etc/rcS.d
 ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash
 
 VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
 SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h)
 if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
 then
     [ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)"
     SUB_VERSION=$VERSION_CVS
 else
     VERSION_CVS=""
 fi
 
 QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT
 
 ARCH=arm
 STRIP=arm-linux-strip
 STRIP_FILES="*ARM*not stripped"
 
 TDIR=/tmp/ipk$$
 DATADIR=$TDIR
 CTRLDIR=$TDIR/CONTROL
 
 IMAGEDIR=
 VERB=
 LIST=
 RPM=
 
 while [ $# -ne 0 ]
 do
     case "$1" in
      -v)
         VERB=1
         echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS"
     ;; -l)
         LIST=1
     ;; -i)
         shift
         IMAGEDIR=$1
         DATADIR=$IMAGEDIR
         mkdir -p $IMAGEDIR
     ;; -classic)
         classicopts=-c
     ;; -rpm)
         if [ "$OPIEDIR" != "/opt/Qtopia" ]
         then
             echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
             sleep 1
             #exit 1
         fi
         RPM=1
     ;; -arch)
         shift
         ARCH=$1
         STRIP=
         STRIP_FILES=
     ;; /*)
         FILES="$FILES $1"
     ;; *)
         FILES="$FILES $PWD/$1"
     esac
     shift
 done
 
 if [ -z "$FILES" ]
 then
     FILES=`find $OPIEDIR -name "*.control" -print`
 fi
 
 RDIR=$PWD
 ORIGDIR=`pwd`
 cd $OPIEDIR
 
 for i in $FILES
 do
     rm -rf $TDIR
 
     mkdir -p $DATADIR
     mkdir -p $CTRLDIR
 
     packagename=${i##*/}; packagename=${packagename%.control}
     version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"')
     depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"')
     files=$(eval echo $(sed -n -e "s/^Files://p" $i))
     arch=$(eval echo $(sed -n -e "s/^Arch://p" $i))
     section=$(sed -n -e "s/^Section: *//p" $i)
     provides=$(sed -n -e "s/^Provides: *//p" $i)
     conflicts=$(sed -n -e "s/^Conflicts: *//p" $i)
     license=$(sed -n -e "s/^License: *//p" $i)
     summary=$(sed -n -e "s/^Description: *//p" $i)
     package=${packagename}_${version}_$ARCH
     ERROR=
     if [ -z "$files" ]
     then
         mkdir -p $DATADIR/usr/share/doc/$packagename
     else
         for f in $files
         do
             if [ -d $f ]
             then
                 ffiles=$(find $f -type f -o -type b -o -type c -o -type l)
             else
                 ffiles=$f
             fi
             for ff in $ffiles
             do
                 case $ff in
                     */CVS/*)
                     continue
                         ;;*~)
                     continue
                         ;;*.control)
                     continue
                 ;; $QTDIR/*)
                     BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/})
                 ;; etc/*.d/*)
                     BASE=$(dirname /$ff)
                 ;; root/*)
                     BASE=$(dirname ${ff#root})
                 ;; lib/*)
                     BASE=$(dirname /opt/QtPalmtop/$ff)