summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--Vars.make2
-rw-r--r--library/version.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 198bd80..000856b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
1 2004-??-??The Opie Team <opie@handhelds.org> 1 2004-??-??The Opie Team <opie@handhelds.org>
2 2
3 * Added namespace usage in libopie2 and everywhere (zecke,alwin)
3 * Enabled the possibility to pass command line arguments to applications (mickeyl) 4 * Enabled the possibility to pass command line arguments to applications (mickeyl)
4 * Added an about applet showing some credits and information about Opie (mickeyl) 5 * Added an about applet showing some credits and information about Opie (mickeyl)
5 * Added benchmarking functionality to sysinfo (mickeyl) 6 * Added benchmarking functionality to sysinfo (mickeyl)
6 * Added applet and configuration application for switching hardware keyboard layouts (alwin) 7 * Added applet and configuration application for switching hardware keyboard layouts (alwin)
7 * Ported applications from libopie1 to libopie2* (drw,ar,alwin) 8 * Ported applications from libopie1 to libopie2* (drw,ar,alwin)
8 * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe) 9 * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
9 * Clean-up of package information in control files (drw) 10 * Clean-up of package information in control files (drw)
10 * Repaired mediummount which was broken since integrating the quicklauncher (alwin) 11 * Repaired mediummount which was broken since integrating the quicklauncher (alwin)
diff --git a/Vars.make b/Vars.make
index a58801e..ea8fb51 100644
--- a/Vars.make
+++ b/Vars.make
@@ -43,17 +43,17 @@ export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
43 43
44ifeq ($(QPE_VERSION),) 44ifeq ($(QPE_VERSION),)
45 VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) 45 VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
46 VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) 46 VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
47 VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) 47 VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h))
48 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) 48 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
49 49
50 ifeq ($(QPE_VERSION),..) 50 ifeq ($(QPE_VERSION),..)
51 QPE_VERSION=1.1.0 51 QPE_VERSION=1.1.2
52 endif 52 endif
53endif 53endif
54export QPE_VERSION 54export QPE_VERSION
55 55
56SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 56SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
57ifeq ($(VERSION_CVS),) 57ifeq ($(VERSION_CVS),)
58 VERSION_CVS:=$(shell date +%Y%m%d) 58 VERSION_CVS:=$(shell date +%Y%m%d)
59endif 59endif
diff --git a/library/version.h b/library/version.h
index 64d59b6..2590dad 100644
--- a/library/version.h
+++ b/library/version.h
@@ -1,3 +1,3 @@
1#define QPE_VENDOR "Project Opie" 1#define QPE_VENDOR "Project Opie"
2#define QPE_VERSION "1.1.1-snapshot" 2#define QPE_VERSION "1.1.2-snapshot"
3#define SUB_VERSION "" 3#define SUB_VERSION ""