summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make2
-rwxr-xr-xmkipks2
2 files changed, 2 insertions, 2 deletions
diff --git a/Vars.make b/Vars.make
index b1cdb28..82421e5 100644
--- a/Vars.make
+++ b/Vars.make
@@ -31,25 +31,25 @@ endif
31export QPE_VERSION 31export QPE_VERSION
32 32
33SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 33SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
34ifeq ($(VERSION_CVS),) 34ifeq ($(VERSION_CVS),)
35 VERSION_CVS:=$(shell date +%Y%m%d) 35 VERSION_CVS:=$(shell date +%Y%m%d)
36endif 36endif
37ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 37ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
38 SUB_VERSION:=$(VERSION_CVS) 38 SUB_VERSION:=$(VERSION_CVS)
39endif 39endif
40export SUB_VERSION 40export SUB_VERSION
41 41
42ifeq ($(QTE_REVISION),) 42ifeq ($(QTE_REVISION),)
43 QTE_REVISION=4 43 QTE_REVISION=5
44endif 44endif
45export QTE_REVISION 45export QTE_REVISION
46 46
47export DEB_VERSION=2.0 47export DEB_VERSION=2.0
48 48
49ifeq ($(QTE_BASEVERSION),) 49ifeq ($(QTE_BASEVERSION),)
50 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 50 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
51 QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') 51 QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
52 else 52 else
53 QTE_BASEVERSION=2.3.5 53 QTE_BASEVERSION=2.3.5
54 endif 54 endif
55endif 55endif
diff --git a/mkipks b/mkipks
index 53ef8f5..ec39dcb 100755
--- a/mkipks
+++ b/mkipks
@@ -9,25 +9,25 @@ then
9 QTE_BASEVERSION=2.3.4 9 QTE_BASEVERSION=2.3.4
10 fi 10 fi
11fi 11fi
12if [ -z "$QTE_VERSION" ] 12if [ -z "$QTE_VERSION" ]
13then 13then
14 if [ -e $QTDIR/include/qglobal.h ] 14 if [ -e $QTDIR/include/qglobal.h ]
15 then 15 then
16 QTE_VERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION_STR'|sed -e 's,#define QT_VERSION_STR\t*,,;' -e 's,.*"\([^"]*\)".*,\1,;'` 16 QTE_VERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION_STR'|sed -e 's,#define QT_VERSION_STR\t*,,;' -e 's,.*"\([^"]*\)".*,\1,;'`
17 else 17 else
18 QTE_VERSION=2.3.4 18 QTE_VERSION=2.3.4
19 fi 19 fi
20fi 20fi
21[ -z "$QTE_REVISION" ] && QTE_REVISION=4 21[ -z "$QTE_REVISION" ] && QTE_REVISION=5
22DEB_VERSION=2.0 22DEB_VERSION=2.0
23 23
24# Have to do this here, since CVS can't store symlinks 24# Have to do this here, since CVS can't store symlinks
25 25
26mkdir -p $OPIEDIR/etc/rcS.d 26mkdir -p $OPIEDIR/etc/rcS.d
27ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash 27ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash
28 28
29VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) 29VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
30VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) 30VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
31VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) 31VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
32SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h) 32SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h)
33if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h 33if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h