[system-setup-keyboard: 3/3] Merge branch 'f14'
Peter Hutterer
whot at fedoraproject.org
Sun Jan 16 22:06:15 UTC 2011
commit 547c65b97d34771555f89b2f280dea37f2f712b3
Merge: 4085ba6 a35ddf4
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon Jan 17 08:02:45 2011 +1000
Merge branch 'f14'
Conflicts:
system-setup-keyboard.spec
system-setup-keyboard.spec | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --cc system-setup-keyboard.spec
index 1c40539,26589d8..39d6e87
--- a/system-setup-keyboard.spec
+++ b/system-setup-keyboard.spec
@@@ -1,6 -1,6 +1,6 @@@
Name: system-setup-keyboard
Version: 0.8.6
- Release: 2%{?dist}
-Release: 2%{?dist}.1
++Release: 3%{?dist}
Summary: xorg.conf keyboard layout callout
Group: Applications/System
@@@ -79,9 -76,12 +79,18 @@@ f
%doc COPYING
%changelog
++* Mon Jan 17 2011 Peter Hutterer <peter.hutterer at redhat.com> 0.8.6-3
++- Pull in two changes from F14 branch
++
+* Mon Jan 17 2011 Peter Hutterer <peter.hutterer at redhat.com> 0.8.6-2
+- Fix man page permissions
+
+ * Tue Oct 05 2010 jkeating - 0.8.6-2.1
+ - Rebuilt for gcc bug 634757
+
+ * Tue Sep 14 2010 Bill Nottingham <notting at redhat.com> 0.8.6-2
+ - Flip requires from systemd to the correct systemd-units
+
* Sat Aug 28 2010 Adel Gadllah <adel.gadllah at gmail.com> 0.8.6-1
- 0.8.6 release - systemd support
More information about the scm-commits
mailing list