From f389dd4e3d5ceacb15b5c0b751a618d7586d6c31 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sun, 26 Jan 2003 19:46:41 +0000
Subject: Rather hackish, but necessary, bits.  mkipks now parses the qglobal header from $QTDIR to obtain both the base qt version and the full version string, thereby letting me use ipkg depends to Depends: libqt2-emb (>= 2.3.4-beta4).

---
diff --git a/mkipks b/mkipks
index d4e4b38..3fbf160 100755
--- a/mkipks
+++ b/mkipks
@@ -1,7 +1,23 @@
 #!/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
 
diff --git a/qt/libqt2-emb-fonts.control b/qt/libqt2-emb-fonts.control
index f4b9260..8c0d98a 100644
--- a/qt/libqt2-emb-fonts.control
+++ b/qt/libqt2-emb-fonts.control
@@ -5,5 +5,5 @@ Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: libqt2-emb
 Replaces: qt-embedded-rotation
-Version: $QTE_VERSION-$QTE_REVISION.1
+Version: $QTE_VERSION-$QTE_REVISION
 Description: Qt/Embedded fonts - 0,90,180,270 rotation
diff --git a/qt/libqt2-emb.control b/qt/libqt2-emb.control
index 450450d..2f9d822 100644
--- a/qt/libqt2-emb.control
+++ b/qt/libqt2-emb.control
@@ -3,7 +3,7 @@ Priority: required
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QTE_VERSION-$QTE_REVISION.1
+Version: $QTE_VERSION-$QTE_REVISION
 Depends: libjpeg62, libpng3, zlib1g
 Provides: qt-embedded
 Replaces: qt-embedded
--
cgit v0.9.0.2