merge of 6b9aad33efbe7d42956463905d36b5d886340224

     and c9370fe0b51a1422478e89483290e5776597d26c

16 files changed, 50 insertions, 19 deletions

diff --git a/packages/keylaunch/files/akita/.mtn2git_empty b/packages/keylaunch/files/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/files/akita/.mtn2git_empty
diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc
new file mode 100644
index 0000000000..e0b729a508
--- /dev/null
+++ b/packages/keylaunch/files/akita/keylaunchrc
@@ -0,0 +1,6 @@
+key=....F9:-:gpe-calendar
+key=....F10:-:gpe-contacts
+key=....F13:-:sylpheed
+key=....F12:-:gpe-mini-browser
+key=...*F18:-:display-brightness.sh down
+key=...*F19:-:display-brightness.sh up
diff --git a/packages/keylaunch/files/borzoi/.mtn2git_empty b/packages/keylaunch/files/borzoi/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/files/borzoi/.mtn2git_empty
diff --git a/packages/keylaunch/files/borzoi/keylaunchrc b/packages/keylaunch/files/borzoi/keylaunchrc
new file mode 100644
index 0000000000..e0b729a508
--- /dev/null
+++ b/packages/keylaunch/files/borzoi/keylaunchrc
@@ -0,0 +1,6 @@
+key=....F9:-:gpe-calendar
+key=....F10:-:gpe-contacts
+key=....F13:-:sylpheed
+key=....F12:-:gpe-mini-browser
+key=...*F18:-:display-brightness.sh down
+key=...*F19:-:display-brightness.sh up
diff --git a/packages/keylaunch/files/c7x0/.mtn2git_empty b/packages/keylaunch/files/c7x0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/files/c7x0/.mtn2git_empty
diff --git a/packages/keylaunch/files/c7x0/keylaunchrc b/packages/keylaunch/files/c7x0/keylaunchrc
new file mode 100644
index 0000000000..e0b729a508
--- /dev/null
+++ b/packages/keylaunch/files/c7x0/keylaunchrc
@@ -0,0 +1,6 @@
+key=....F9:-:gpe-calendar
+key=....F10:-:gpe-contacts
+key=....F13:-:sylpheed
+key=....F12:-:gpe-mini-browser
+key=...*F18:-:display-brightness.sh down
+key=...*F19:-:display-brightness.sh up
diff --git a/packages/keylaunch/files/corgie/.mtn2git_empty b/packages/keylaunch/files/corgie/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/files/corgie/.mtn2git_empty
diff --git a/packages/keylaunch/files/corgie/keylaunchrc b/packages/keylaunch/files/corgie/keylaunchrc
new file mode 100644
index 0000000000..e0b729a508
--- /dev/null
+++ b/packages/keylaunch/files/corgie/keylaunchrc
@@ -0,0 +1,6 @@
+key=....F9:-:gpe-calendar
+key=....F10:-:gpe-contacts
+key=....F13:-:sylpheed
+key=....F12:-:gpe-mini-browser
+key=...*F18:-:display-brightness.sh down
+key=...*F19:-:display-brightness.sh up
diff --git a/packages/keylaunch/files/husky/.mtn2git_empty b/packages/keylaunch/files/husky/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/files/husky/.mtn2git_empty
diff --git a/packages/keylaunch/files/husky/keylaunchrc b/packages/keylaunch/files/husky/keylaunchrc
new file mode 100644
index 0000000000..e0b729a508
--- /dev/null
+++ b/packages/keylaunch/files/husky/keylaunchrc
@@ -0,0 +1,6 @@
+key=....F9:-:gpe-calendar
+key=....F10:-:gpe-contacts
+key=....F13:-:sylpheed
+key=....F12:-:gpe-mini-browser
+key=...*F18:-:display-brightness.sh down
+key=...*F19:-:display-brightness.sh up
diff --git a/packages/keylaunch/files/keylaunchrc b/packages/keylaunch/files/keylaunchrc
index ea81a99f18..0296db9dad 100644
--- a/packages/keylaunch/files/keylaunchrc
+++ b/packages/keylaunch/files/keylaunchrc
@@ -1,8 +1,8 @@
-key=???Pressed XF86AudioRecord:Record Memo:gpe-soundbite record --autogenerate-filename $HOME_VOLATILE
-key=???XF86Calendar:Calendar:gpe-calendar
-key=???telephone:Contacts:gpe-contacts
-key=???XF86Mail:Running programs:gpe-taskmanager
-key=???XF86Start:matchbox-remote -desktop
-key=???XF86PowerDown:apm --suspend
-key=???Held XF86PowerDown:bl toggle
-key=???Combine XF86Calendar XF86Start:gpe-keylock
+key=????Pressed XF86AudioRecord:gpe-soundbite record --autogenerate-filename $HOME_VOLATILE
+key=????Pressed XF86Calendar:gpe-calendar
+key=????Pressed telephone:gpe-contacts
+key=????Pressed XF86Mail:gpe-taskmanager
+key=????Pressed XF86Start:~matchbox-remote -desktop
+key=????Pressed XF86PowerDown:~apm --suspend
+key=????Held XF86PowerDown:~bl toggle
+key=????Combine XF86Calendar XF86Start:gpe-keylock
diff --git a/packages/keylaunch/files/makefile-fix.patch b/packages/keylaunch/files/makefile-fix.patch
deleted file mode 100644
index 52260bf4de..0000000000
--- a/packages/keylaunch/files/makefile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- keylaunch-2.0.7/Makefile.orig	2006-02-02 17:44:53.000000000 +0100
-+++ keylaunch-2.0.7/Makefile	2006-02-02 17:44:55.000000000 +0100
-@@ -28,7 +28,7 @@
- all: $(PROG) 
- 
- $(PROG): $(OBJS)
--	$(CC) $(OBJS) $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
- 
- install-program: all
- 	install -sD $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
diff --git a/packages/keylaunch/files/shepherd/.mtn2git_empty b/packages/keylaunch/files/shepherd/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/files/shepherd/.mtn2git_empty
diff --git a/packages/keylaunch/files/shepherd/keylaunchrc b/packages/keylaunch/files/shepherd/keylaunchrc
new file mode 100644
index 0000000000..e0b729a508
--- /dev/null
+++ b/packages/keylaunch/files/shepherd/keylaunchrc
@@ -0,0 +1,6 @@
+key=....F9:-:gpe-calendar
+key=....F10:-:gpe-contacts
+key=....F13:-:sylpheed
+key=....F12:-:gpe-mini-browser
+key=...*F18:-:display-brightness.sh down
+key=...*F19:-:display-brightness.sh up
diff --git a/packages/keylaunch/files/spitz/.mtn2git_empty b/packages/keylaunch/files/spitz/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/files/spitz/.mtn2git_empty
diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc
new file mode 100644
index 0000000000..e0b729a508
--- /dev/null
+++ b/packages/keylaunch/files/spitz/keylaunchrc
@@ -0,0 +1,6 @@
+key=....F9:-:gpe-calendar
+key=....F10:-:gpe-contacts
+key=....F13:-:sylpheed
+key=....F12:-:gpe-mini-browser
+key=...*F18:-:display-brightness.sh down
+key=...*F19:-:display-brightness.sh up