removed appskey / added button-settings

3 files changed, 5 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 15c9b5f..cfeff86 100644
--- a/Makefile
+++ b/Makefile
@@ -54,10 +54,10 @@ 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
diff --git a/def-configs/opie b/def-configs/opie
index 830fede..2d67db0 100644
--- a/def-configs/opie
+++ b/def-configs/opie
@@ -81,5 +81,4 @@ CONFIG_MEDIUMMOUNT=y
 CONFIG_LANGUAGE=y
 CONFIG_BACKUP=y
-CONFIG_APPSKEY=y
 CONFIG_APPEARANCE2=y
 
@@ -216,4 +215,5 @@ CONFIG_LIGHT-AND-POWER=y
 CONFIG_LAUNCHER-SETTINGS=y
 CONFIG_CITYTIME=y
+CONFIG_BUTTON-SETTINGS=y
 
 #
diff --git a/packages b/packages
index 07c327f..715d254 100644
--- a/packages
+++ b/packages
@@ -1,3 +1,4 @@
         #CONFIG_APPLET  noncore/net/opietooth/appletapplet.pro
+        #CONFIG_APPSKEY         noncore/settings/appskeyappskey.pro
         #CONFIG_BINARY  noncore/tools/calc2/binarybinary.pro
         #CONFIG_BLUE-PIN        noncore/net/opietooth/blue-pinblue-pin.pro
@@ -45,5 +46,4 @@ CONFIG_ADDRESSBOOK	core/pim/addressbook	addressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
-        CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
@@ -52,4 +52,5 @@ CONFIG_BATTERYAPPLET-IPAQ	core/applets/batteryapplet-ipaq	batteryapplet-ipaq.pro
         CONFIG_BEND     noncore/mail/bendbend.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
+        CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro