make passing in qte version for ipk creation easier

3 files changed, 4 insertions, 3 deletions

diff --git a/mkipks b/mkipks
index c39b66f..97f78c5 100755
--- a/mkipks
+++ b/mkipks
@@ -1,51 +1,52 @@
 #!/bin/sh
 
-QTE_VERSION=2.3.4
+[ -z "$QTE_VERSION" ] && QTE_VERSION=2.3.4
+[ -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)
diff --git a/qt/qt-embedded-rotation.control b/qt/qt-embedded-rotation.control
index 1ef627c..38b5ccc 100644
--- a/qt/qt-embedded-rotation.control
+++ b/qt/qt-embedded-rotation.control
@@ -1,11 +1,11 @@
 Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica_*_t*5* $QTDIR/lib/fonts/fixed_*_50.* $QTDIR/lib/fonts/fixed_*_t*5* $QTDIR/lib/fonts/micro_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smallsmooth_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* 
 Priority: optional
 Section: opie/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Depends: libjpeg62
-Version: $QTE_VERSION-4
+Version: $QTE_VERSION-$QTE_REVISION
 Description: Qt/Embedded 0,90,180 rotation fonts
  The iPAQ's "normal" orientation is 270-degree rotated.
  These fonts are the fonts for other angles.
diff --git a/qt/qt-embedded.control b/qt/qt-embedded.control
index 5d2932e..94579a4 100644
--- a/qt/qt-embedded.control
+++ b/qt/qt-embedded.control
@@ -1,10 +1,10 @@
 Files: $QTDIR/lib/libqte.so.$QTE_VERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2 $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_*t10* $QTDIR/lib/fonts/fixed_*t10* $QTDIR/lib/fonts/micro_*t10* $QTDIR/lib/fonts/smallsmooth_*t10* $QTDIR/lib/fonts/smoothtimes_{170,100}_50*t10*
 Priority: required
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QTE_VERSION-3
+Version: $QTE_VERSION-$QTE_REVISION
 Depends: libjpeg62, libpng3, zlib1g
 Description: Qt/Embedded environment
  A complete windowing system and GUI toolkit for handhelds.
  See "QPE" for applications.