| author | kergoth <kergoth> | 2003-04-23 02:31:50 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-04-23 02:31:50 (UTC) |
| commit | 27af46124e121bcd87b690f9fd5a28e5766b647f (patch) (side-by-side diff) | |
| tree | 690e9fec0d2fe216ee629c0c699e513e1d5a3758 | |
| parent | 43b2c74f7d32ce9c744e4d79e62a92e0181604c3 (diff) | |
| download | opie-27af46124e121bcd87b690f9fd5a28e5766b647f.zip opie-27af46124e121bcd87b690f9fd5a28e5766b647f.tar.gz opie-27af46124e121bcd87b690f9fd5a28e5766b647f.tar.bz2 | |
Increment qt revision per font split, to ensure upgrades occur.
| -rw-r--r-- | Vars.make | 2 | ||||
| -rwxr-xr-x | mkipks | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -31,25 +31,25 @@ endif export QPE_VERSION SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) ifeq ($(VERSION_CVS),) VERSION_CVS:=$(shell date +%Y%m%d) endif ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) SUB_VERSION:=$(VERSION_CVS) endif export SUB_VERSION ifeq ($(QTE_REVISION),) - QTE_REVISION=4 + QTE_REVISION=5 endif export QTE_REVISION export DEB_VERSION=2.0 ifeq ($(QTE_BASEVERSION),) ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 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/;') else QTE_BASEVERSION=2.3.5 endif endif @@ -9,25 +9,25 @@ then 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=4 +[ -z "$QTE_REVISION" ] && QTE_REVISION=5 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 |