summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
-rw-r--r--def-configs/opie2
-rw-r--r--packages3
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 15c9b5f..cfeff86 100644
--- a/Makefile
+++ b/Makefile
@@ -52,14 +52,14 @@ COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
COREMULTIMEDIA = core/multimedia/opieplayer
CORESETTINGS = core/settings/light-and-power core/settings/security \
noncore/settings/netsystemtime core/settings/citytime \
- core/settings/launcher
+ core/settings/launcher core/settings/button
NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \
noncore/settings/appearance2 noncore/settings/sound \
noncore/settings/mediummount \
- noncore/settings/tabmanager noncore/settings/appskey \
+ noncore/settings/tabmanager \
noncore/settings/sshkeys noncore/settings/usermanager \
noncore/settings/backup
NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
diff --git a/def-configs/opie b/def-configs/opie
index 830fede..2d67db0 100644
--- a/def-configs/opie
+++ b/def-configs/opie
@@ -79,9 +79,8 @@ CONFIG_ROTATION=y
CONFIG_NETSYSTEMTIME=y
CONFIG_MEDIUMMOUNT=y
CONFIG_LANGUAGE=y
CONFIG_BACKUP=y
-CONFIG_APPSKEY=y
CONFIG_APPEARANCE2=y
#
# appearance
@@ -214,8 +213,9 @@ CONFIG_FREETYPE=y
CONFIG_SECURITY=y
CONFIG_LIGHT-AND-POWER=y
CONFIG_LAUNCHER-SETTINGS=y
CONFIG_CITYTIME=y
+CONFIG_BUTTON-SETTINGS=y
#
# pim
#
diff --git a/packages b/packages
index 07c327f..715d254 100644
--- a/packages
+++ b/packages
@@ -1,5 +1,6 @@
#CONFIG_APPLET noncore/net/opietooth/applet applet.pro
+#CONFIG_APPSKEY noncore/settings/appskey appskey.pro
#CONFIG_BINARY noncore/tools/calc2/binary binary.pro
#CONFIG_BLUE-PIN noncore/net/opietooth/blue-pin blue-pin.pro
#CONFIG_CALC2 noncore/tools/calc2 calc2.pro
#CONFIG_CALIBRATE core/apps/calibrate calibrate.pro
@@ -43,15 +44,15 @@ CONFIG_OCOPSERVER x11/ipc/server ocopserver.pro
#CONFIG_WLANSETUP noncore/unsupported/wlansetup wlansetup.pro
CONFIG_ADDRESSBOOK core/pim/addressbook addressbook.pro
CONFIG_ADVANCEDFM noncore/apps/advancedfm advancedfm.pro
CONFIG_APPEARANCE2 noncore/settings/appearance2 appearance2.pro
-CONFIG_APPSKEY noncore/settings/appskey appskey.pro
CONFIG_AQPKG noncore/apps/aqpkg aqpkg.pro
CONFIG_BACKUP noncore/settings/backup backup.pro
CONFIG_BATTERYAPPLET core/applets/batteryapplet batteryapplet.pro
CONFIG_BATTERYAPPLET-IPAQ core/applets/batteryapplet-ipaq batteryapplet-ipaq.pro
CONFIG_BEND noncore/mail/bend bend.pro
CONFIG_BOUNCE noncore/games/bounce bounce.pro
+CONFIG_BUTTON-SETTINGS core/settings/button button.pro
CONFIG_BUZZWORD noncore/games/buzzword buzzword.pro
CONFIG_CALCULATOR noncore/tools/calculator calculator.pro
CONFIG_CARDMON core/applets/cardmon cardmon.pro
CONFIG_CHECKBOOK noncore/apps/checkbook checkbook.pro