hal: Branch 'origin' - 6 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Sat Aug 4 01:21:39 PDT 2007
Makefile.am | 53 ++++++++++-------------
VERSION | 2
fdi/information/10freedesktop/30-keymap-acer.fdi | 2
fdi/information/10freedesktop/30-keymap-misc.fdi | 17 +++++--
4 files changed, 40 insertions(+), 34 deletions(-)
New commits:
diff-tree 3044be7d86fcee550a385cef8a7df4cfc169c349 (from d63ebab620b690f42b385beaf2731398924f1bf7)
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jul 30 12:58:28 2007 +0100
correct the keymap mapping for touchpad disable
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 490a917..0e2afbe 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -16,7 +16,7 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MICRO-STAR">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="INFINITY">
- <append key="input.keymap.data" type="strlist">e064:prog1</append> <!-- Fn-F3 Touchpad disable -->
+ <append key="input.keymap.data" type="strlist">e064:f22</append> <!-- Fn-F3 Touchpad disable -->
<append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F4 Brightness down -->
<append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F5 Brightness up -->
<append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7 Volume down -->
diff-tree d63ebab620b690f42b385beaf2731398924f1bf7 (from 35f05aeb5c50e1e6402975af23330b8f49894fdf)
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jul 30 12:54:07 2007 +0100
add keymap for Medion 9580-F
I attached yet another hal-info keymap patch, this time for an old
Medion 9580-F laptop. Please merge!
(I figured it might be a better idea to send this patch directly to
you instead of the ML, to lower the signal-to-noise ratio on the ML a
bit)
Oh, and the patch also updates the comments of my older MSI S270
keymap xml fragment.
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 63d4f4b..490a917 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -42,15 +42,24 @@
<append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12 Sleep -->
<append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
<append key="input.keymap.data" type="strlist">e032:www</append> <!-- www button -->
- <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- wlan -->
- <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
- <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search -->
+ <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- satellite dish: wlan -->
+ <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish: bluetooth -->
+ <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search button -->
<append key="input.keymap.data" type="strlist">e071:unknown</append> <!-- plug -->
<append key="input.keymap.data" type="strlist">e072:unknown</append> <!-- unplug -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.vendor" string="MEDIONNB">
+ <match key="/org/freedesktop/Hal/devices/computer:system.product" prefix="A555">
+ <append key="input.keymap.data" type="strlist">67:email</append> <!-- envelope button -->
+ <append key="input.keymap.data" type="strlist">63:www</append> <!-- N button -->
+ <append key="input.keymap.data" type="strlist">66:prog1</append> <!-- link 1 button -->
+ <append key="input.keymap.data" type="strlist">69:prog2</append> <!-- link 2 button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
</match>
diff-tree 35f05aeb5c50e1e6402975af23330b8f49894fdf (from parents)
Merge: 3b1bc1b6227a9fcd5765c16acace9e7d4a05929d 2e76cfa58597ac1e2a95274b4ae1b64a48990c45
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jul 26 13:43:22 2007 +0100
Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal-info
diff-tree 3b1bc1b6227a9fcd5765c16acace9e7d4a05929d (from cb12cd0dee336221f3fcf538e6ba23900ac68080)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jul 26 13:42:58 2007 +0100
fix a typo in the Acer Aspire 3030 DMI matching
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 54e0988..dc66181 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -77,7 +77,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<!-- Aspire 3030 and Aspire 5030 are identical -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3020">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3030">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
<append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
diff-tree 2e76cfa58597ac1e2a95274b4ae1b64a48990c45 (from 6cf9709202f9428bbf3c547c505ab0a9cd8402b3)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Jul 25 15:51:14 2007 -0400
Released hal-info 20070725
diff --git a/VERSION b/VERSION
index c8a28da..8874039 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-echo AL_INFO_VERSION
+20070725
diff-tree 6cf9709202f9428bbf3c547c505ab0a9cd8402b3 (from cb12cd0dee336221f3fcf538e6ba23900ac68080)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Jul 25 15:48:55 2007 -0400
update release script
diff --git a/Makefile.am b/Makefile.am
index aba7b17..299d207 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,37 +32,34 @@ clean-local :
rm -f *~
release:
+ @echo "-----------------------------------------------------------------"
+ @echo "First check that all your changes are committed and pushed to"
+ @echo "the remote master repository."
@echo ""
- @echo "Check that all your changes are committed and pushed to"
- @echo "the remote master repository. Then run 'make release-real'."
- @echo ""
-
-MAIL=/usr/sbin/sendmail
+ @echo "Then run 'make release-real' for instructions on how to make a release."
+ @echo "-----------------------------------------------------------------"
release-real:
- @make check
- @date +%Y%m%d > VERSION
- @rm -rf autom4te.cache
- @autoreconf
- @make dist
- @scp hal-info-`cat VERSION`.tar.gz david at people.freedesktop.org:public_html/dist
- @git-commit -m "version `cat VERSION`" VERSION
- @git-push
- @git-tag -m "version `cat VERSION`" -s HAL_INFO_`cat VERSION`
- @git-push --tags
-
-# @echo "From: $(GIT_AUTHOR_NAME) <$(GIT_AUTHOR_EMAIL)>" > .release-mail
-# @echo "To: hal at lists.freedesktop.org" >> .release-mail
-# @echo "Subject: hal-info `cat VERSION` release" >> .release-mail
-# @echo "X-Mailer: hal-info release script" >> .release-mail
-# @echo "" >> .release-mail
-# @echo "There's a new hal-info `cat VERSION` release available. Download from" >> .release-mail
-# @echo "" >> .release-mail
-# @echo " http://people.freedesktop.org/~david/dist/hal-info-`cat VERSION`.tar.gz" >> .release-mail
-# @echo "" >> .release-mail
-# @echo "." >> .release-mail
-# @echo "" >> .release-mail
-# @cat .release-mail | $(MAIL) davidz at redhat.com hal at lists.freedesktop.org
+ @echo "-----------------------------------------------------------------"
+ @echo "Run the commands below, one by one"
+ @echo "-----------------------------------------------------------------"
+ @echo "-----------------------------------------------------------------"
+ @echo "export HAL_INFO_VERSION=`date +%Y%m%d`"
+ @echo "make check"
+ @echo "echo \$$HAL_INFO_VERSION > VERSION"
+ @echo "rm -rf autom4te.cache"
+ @echo "autoreconf"
+ @echo "make dist"
+ @echo "scp hal-info-\$$HAL_INFO_VERSION.tar.gz hal.freedesktop.org:/srv/hal.freedesktop.org/www/releases"
+ @echo "git-commit -m \"Released hal-info \$$HAL_INFO_VERSION\" VERSION"
+ @echo "git-push"
+ @echo "git-tag -m \"Released hal-info \$$HAL_INFO_VERSION\" -s HAL_INFO_\$$HAL_INFO_VERSION"
+ @echo "git-push --tags"
+ @echo "-----------------------------------------------------------------"
+ @echo "-----------------------------------------------------------------"
+ @echo ""
+ @echo "Please send a note to hal at lists.freedesktop.org about this release."
+ @echo "-----------------------------------------------------------------"
diff --git a/VERSION b/VERSION
index 3e2957c..c8a28da 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20070618
+echo AL_INFO_VERSION
More information about the hal-commit
mailing list