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,31 +1,32 @@
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)
19 20
20 2003-11-29The Opie Team <opie@handhelds.org> 21 2003-11-29The Opie Team <opie@handhelds.org>
21 22
22 * Released as Version 1.0.3 23 * Released as Version 1.0.3
23 * Improved i18n (various contributors) 24 * Improved i18n (various contributors)
24 * Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin) 25 * Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin)
25 * Made the Documents Tab optional (mickeyl) 26 * Made the Documents Tab optional (mickeyl)
26 * Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken) 27 * Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken)
27 28
28 2003-08-04The Opie Team <opie@handhelds.org> 29 2003-08-04The Opie Team <opie@handhelds.org>
29 30
30 * Released as Version 1.0.0 31 * Released as Version 1.0.0
31 * Including a PPP module for easy dial up (tille,harlekin,zecke) 32 * Including a PPP module for easy dial up (tille,harlekin,zecke)
diff --git a/Vars.make b/Vars.make
index a58801e..ea8fb51 100644
--- a/Vars.make
+++ b/Vars.make
@@ -3,97 +3,97 @@ $(error QTDIR not set)
3endif 3endif
4 4
5prefix=/opt/QtPalmtop 5prefix=/opt/QtPalmtop
6 6
7ifeq ($(OPIEDIR),) 7ifeq ($(OPIEDIR),)
8 export OPIEDIR:=$(TOPDIR) 8 export OPIEDIR:=$(TOPDIR)
9endif 9endif
10ifeq ($(IPK_DIR),) 10ifeq ($(IPK_DIR),)
11 export IPK_DIR:=$(OPIEDIR) 11 export IPK_DIR:=$(OPIEDIR)
12endif 12endif
13 13
14ifneq ($(wildcard $(TOPDIR)/.config),) 14ifneq ($(wildcard $(TOPDIR)/.config),)
15 include $(TOPDIR)/.config 15 include $(TOPDIR)/.config
16endif 16endif
17 17
18ifdef CONFIG_TARGET_X86 18ifdef CONFIG_TARGET_X86
19 PLATFORM=x86-linux 19 PLATFORM=x86-linux
20endif 20endif
21ifdef CONFIG_TARGET_SHARP 21ifdef CONFIG_TARGET_SHARP
22 PLATFORM=sharp-linux 22 PLATFORM=sharp-linux
23endif 23endif
24ifdef CONFIG_TARGET_IPAQ 24ifdef CONFIG_TARGET_IPAQ
25 PLATFORM=ipaq-linux 25 PLATFORM=ipaq-linux
26endif 26endif
27ifdef CONFIG_TARGET_RAMSES 27ifdef CONFIG_TARGET_RAMSES
28 PLATFORM=ramses-linux 28 PLATFORM=ramses-linux
29endif 29endif
30ifdef CONFIG_TARGET_SIMPAD 30ifdef CONFIG_TARGET_SIMPAD
31 PLATFORM=simpad-linux 31 PLATFORM=simpad-linux
32endif 32endif
33 33
34ifdef CONFIG_TARGET_YOPY 34ifdef CONFIG_TARGET_YOPY
35 PLATFORM=yopy-linux 35 PLATFORM=yopy-linux
36endif 36endif
37ifdef CONFIG_TARGET_MACOSX 37ifdef CONFIG_TARGET_MACOSX
38 PLATFORM=macx-darwin 38 PLATFORM=macx-darwin
39endif 39endif
40 40
41export QMAKE:=$(OPIEDIR)/qmake/qmake 41export QMAKE:=$(OPIEDIR)/qmake/qmake
42export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 42export 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
60ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 60ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
61 SUB_VERSION:=$(VERSION_CVS) 61 SUB_VERSION:=$(VERSION_CVS)
62endif 62endif
63export SUB_VERSION 63export SUB_VERSION
64 64
65ifneq ($(strip $(SUB_VERSION)),) 65ifneq ($(strip $(SUB_VERSION)),)
66EXTRAVERSION=-$(SUB_VERSION) 66EXTRAVERSION=-$(SUB_VERSION)
67endif 67endif
68 68
69ifeq ($(QTE_REVISION),) 69ifeq ($(QTE_REVISION),)
70 QTE_REVISION=6 70 QTE_REVISION=6
71endif 71endif
72export QTE_REVISION 72export QTE_REVISION
73 73
74export DEB_VERSION=2.0 74export DEB_VERSION=2.0
75 75
76ifeq ($(QTE_BASEVERSION),) 76ifeq ($(QTE_BASEVERSION),)
77 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 77 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
78 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/;') 78 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/;')
79 else 79 else
80 QTE_BASEVERSION=2.3.7 80 QTE_BASEVERSION=2.3.7
81 endif 81 endif
82endif 82endif
83export QTE_BASEVERSION 83export QTE_BASEVERSION
84 84
85ifeq ($(QTE_VERSION),) 85ifeq ($(QTE_VERSION),)
86 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 86 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
87 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') 87 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
88 else 88 else
89 QTE_VERSION=2.3.7 89 QTE_VERSION=2.3.7
90 endif 90 endif
91endif 91endif
92export QTE_VERSION 92export QTE_VERSION
93 93
94export PATH:=$(OPIEDIR)/scripts:$(PATH) 94export PATH:=$(OPIEDIR)/scripts:$(PATH)
95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
96 96
97ifdef CONFIG_OPTIMIZATIONS 97ifdef CONFIG_OPTIMIZATIONS
98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
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 ""