-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | Vars.make | 2 | ||||
-rw-r--r-- | library/version.h | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,18 +1,19 @@ | |||
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) |
11 | * Improved big-screen support (zecke,ar) | 12 | * Improved big-screen support (zecke,ar) |
12 | * Improved multikeyboard support, added keyboard layout switching applet (mouse) | 13 | * Improved multikeyboard support, added keyboard layout switching applet (mouse) |
13 | * Added a new mail client based on libetpan (harlekin,alwin,jgf) | 14 | * Added a new mail client based on libetpan (harlekin,alwin,jgf) |
14 | * Added new package manager - opie-packagemanager (drw) | 15 | * Added new package manager - opie-packagemanager (drw) |
15 | * Improved light-n-power for C7x0 (mickeyl) | 16 | * Improved light-n-power for C7x0 (mickeyl) |
16 | * Added automatic rotation support for C7x0 (treke) | 17 | * Added automatic rotation support for C7x0 (treke) |
17 | * Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl) | 18 | * Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl) |
18 | * Added scanning the wireless network neighbourhood to networksettings (mickeyl) | 19 | * Added scanning the wireless network neighbourhood to networksettings (mickeyl) |
@@ -35,33 +35,33 @@ ifdef CONFIG_TARGET_YOPY | |||
35 | PLATFORM=yopy-linux | 35 | PLATFORM=yopy-linux |
36 | endif | 36 | endif |
37 | ifdef CONFIG_TARGET_MACOSX | 37 | ifdef CONFIG_TARGET_MACOSX |
38 | PLATFORM=macx-darwin | 38 | PLATFORM=macx-darwin |
39 | endif | 39 | endif |
40 | 40 | ||
41 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 41 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
42 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 42 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
43 | 43 | ||
44 | ifeq ($(QPE_VERSION),) | 44 | ifeq ($(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 |
53 | endif | 53 | endif |
54 | export QPE_VERSION | 54 | export QPE_VERSION |
55 | 55 | ||
56 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) | 56 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
57 | ifeq ($(VERSION_CVS),) | 57 | ifeq ($(VERSION_CVS),) |
58 | VERSION_CVS:=$(shell date +%Y%m%d) | 58 | VERSION_CVS:=$(shell date +%Y%m%d) |
59 | endif | 59 | endif |
60 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) | 60 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
61 | SUB_VERSION:=$(VERSION_CVS) | 61 | SUB_VERSION:=$(VERSION_CVS) |
62 | endif | 62 | endif |
63 | export SUB_VERSION | 63 | export SUB_VERSION |
64 | 64 | ||
65 | ifneq ($(strip $(SUB_VERSION)),) | 65 | ifneq ($(strip $(SUB_VERSION)),) |
66 | EXTRAVERSION=-$(SUB_VERSION) | 66 | EXTRAVERSION=-$(SUB_VERSION) |
67 | endif | 67 | endif |
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 "" |