hal: Branch 'origin' - 8 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Thu Apr 26 14:43:26 PDT 2007
Makefile.am | 36 +++++++++++++
VERSION | 1
configure.in | 2
fdi/information/10freedesktop/10-usb-music-players.fdi | 11 +++
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 3 +
5 files changed, 51 insertions(+), 2 deletions(-)
New commits:
diff-tree e11ed0bdd989ef1eb3c806ccb2b617bdd2d7af7c (from f6353ab6a4a0ba0d98af192d044bf7c47bebaac9)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Apr 25 18:32:27 2007 -0400
some more release script refinement
diff --git a/Makefile.am b/Makefile.am
index c9bb98d..9f2facb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,8 +47,9 @@ release-real:
@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-tag -s HAL_INFO_`cat 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
diff-tree f6353ab6a4a0ba0d98af192d044bf7c47bebaac9 (from 59f0b020f8ca4bbca76aa68a1b5d3306f9a6e484)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Apr 25 18:27:06 2007 -0400
version 20070425
diff --git a/VERSION b/VERSION
index a2b98ed..2a1e6b6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20070402
+20070425
diff-tree 59f0b020f8ca4bbca76aa68a1b5d3306f9a6e484 (from 524fa507c4efdccfe434f21493aed1093d0ec4d8)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Apr 25 18:26:40 2007 -0400
set back VERSION file to 20070402
diff --git a/Makefile.am b/Makefile.am
index 8e43aef..c9bb98d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ release-real:
@autoreconf
@make dist
@scp hal-info-`cat VERSION`.tar.gz david at people.freedesktop.org:public_html/dist
- @git-commit -m "version `cat VERSION`" -a
+ @git-commit -m "version `cat VERSION`" VERSION
@git-tag -s HAL_INFO_`cat VERSION`
@git-push
@echo "From: $(GIT_AUTHOR_NAME) <$(GIT_AUTHOR_EMAIL)>" > .release-mail
diff --git a/VERSION b/VERSION
index 2a1e6b6..a2b98ed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20070425
+20070402
diff-tree 524fa507c4efdccfe434f21493aed1093d0ec4d8 (from 705e742e1ba26471e2829a16c3a248e0572145c8)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Apr 25 18:24:24 2007 -0400
some changes to the release script
diff --git a/Makefile.am b/Makefile.am
index c9bb98d..8e43aef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ release-real:
@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-commit -m "version `cat VERSION`" -a
@git-tag -s HAL_INFO_`cat VERSION`
@git-push
@echo "From: $(GIT_AUTHOR_NAME) <$(GIT_AUTHOR_EMAIL)>" > .release-mail
diff-tree 705e742e1ba26471e2829a16c3a248e0572145c8 (from f0c5a0ad6976d5936e6fac75df40f90c6cc48bd5)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Apr 25 18:22:07 2007 -0400
add VERSION file
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..2a1e6b6
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+20070425
diff-tree f0c5a0ad6976d5936e6fac75df40f90c6cc48bd5 (from 80c59eb128d8cab66d780aef6e0757369ca607cd)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Apr 25 18:20:38 2007 -0400
add a 'release' target to automate releases
diff --git a/Makefile.am b/Makefile.am
index 93537ff..c9bb98d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,3 +30,38 @@ EXTRA_DIST = HACKING ChangeLog
clean-local :
rm -f *~
+
+release:
+ @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
+
+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-tag -s HAL_INFO_`cat VERSION`
+ @git-push
+ @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
+
+
+
+
diff --git a/configure.in b/configure.in
index f444fdb..452dabd 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT(hal-info, 20070402, david at fubar.dk)
+AC_INIT(hal-info, esyscmd([tr -d '\n' < VERSION]), hal at lists.freedesktop.org)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
diff-tree 80c59eb128d8cab66d780aef6e0757369ca607cd (from 29de0a30e5c8bae35055953894ce6a4c16674b53)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Apr 25 16:55:57 2007 -0400
add "requires eject" quirks for Nokia N60/N70
Maybe these need to move to another file; maybe these are really music
players...
This is from
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=234845
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index bbca407..7ac70aa 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -87,7 +87,8 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
</match>
-
+
+ <!-- Nokia -->
<match key="@storage.originating_device:usb.vendor_id" int="0x421">
<!-- Nokia 770 -->
<match key="@storage.originating_device:usb.product_id" int="0x431">
@@ -105,6 +106,14 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
</match>
+ <!-- Nokia E60 -->
+ <match key="@storage.physical_device:usb.product_id" int="0x0434">
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
+ <!-- Nokia E70 -->
+ <match key="@storage.physical_device:usb.product_id" int="0x0433">
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
</match>
<!-- SONICblue -->
diff-tree 29de0a30e5c8bae35055953894ce6a4c16674b53 (from a109a73038ee5b153f69d9d3fdce06668e77b6e6)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Apr 25 16:32:51 2007 -0400
add quirks for Lenovo X60
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=237849
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 180b698..2dac02e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -11,6 +11,9 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" prefix="63664DU">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
<!-- T60p -->
<match key="system.hardware.product" prefix="1706">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
More information about the hal-commit
mailing list