Fix ChangeLog: the short touchpad timeout and the g-c-c blocker commits got mixed up.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 6d9e49b065fec79d4e7ef8fe5b83baeda74f2fe4..b4c70fbd49dd9ee31106eb8639891dfa9b39cbbb 100644 (file)
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,13 +1,13 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.98 2011/11/28 18:18:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.99 2011/11/28 18:27:18 tetromino Exp $
 
   28 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gnome-settings-daemon-2.32.1-r2.ebuild, gnome-settings-daemon-3.2.2.ebuild:
+  gnome-settings-daemon-2.32.1-r2.ebuild:
   Add blocker on >=gnome-control-center-2.91.90 due to 50-accessibility.xml
   file collision (bug #392283, thanks to Sebastian Pipping for reporting).
 
-  24 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  28 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-settings-daemon-3.2.2.ebuild:
   Follow Ubuntu's example and make short touchpad timeout the default. 2
   seconds really is far too long for comfort.

diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index f30dbadfbb7a3620c06f2edefe1af669d4ccb51b..206d01e51c4b90a3108506534ebc811749d6f89a 100644 (file)
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -18,12 +18,12 @@ DIST gnome-settings-daemon-3.2.2.tar.xz 1417364 RMD160 89b5fe84d337fb241a26f658e
 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3945 RMD160 7b1a2738bfb1f3aa93beb2dd491d7a9d6baa4c85 SHA1 00d4145ea4860302867b95ee084214eb63461117 SHA256 bc133cd3e553fdda97e52479efdf29a100ae5941e8c39fb11bd36161af993c05
 EBUILD gnome-settings-daemon-3.2.1.ebuild 3995 RMD160 286e899fe4310424c20637730b473ba901716c77 SHA1 f13d080d1cb856436451970edb3debeb2bc92c4f SHA256 5df33b8a8835fb48acac5d40d4522f5b6684ae7690e1f241c61b0458bb0a0968
 EBUILD gnome-settings-daemon-3.2.2.ebuild 3883 RMD160 1a869ae34e0e0c90270180bd812d499334bf0ca5 SHA1 0d8ee66f897be99a27f623d489426162dab375fa SHA256 400f6d0b3c20e3e328b8b3871fbed93a1c850cc30ef49a6f4c8473dd4a044862
-MISC ChangeLog 19476 RMD160 2fea53e02a37222286618560728413c44d700aee SHA1 a4070a4a5a1b168d2063eb546e7d189973233d02 SHA256 4a3fe5c60d4e9d2cb7d09888d3769ea64b0efc5e6a5aeb7f9feff0ebe93408a8
+MISC ChangeLog 19440 RMD160 1ded3d5531722371649e9cca4f16541be5e6d745 SHA1 e4e9a26a2b14271fba06c4829077d4edc7ad54ff SHA256 84b26b56d3fbc513afc288ce85e8baf33acef5841213a725f6c063a05bac5748
 MISC metadata.xml 507 RMD160 da190ee6888fff3a8db0629c5c45ebd2235bf3fe SHA1 f7e7d8aa01ccdb946e6f7055992ac7f1da807815 SHA256 095c7487bf2ebadd2b70038c9f65724c2c4c6860a5b0da0096264e50a4e36480
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7T0HgACgkQdjK8w9WeBnBNtgD/VSITsMi/NsAukECK2ekTZ09U
-CPHoJuyCMDYg0wMkOxYA/RYRWrTyAf/v500flZlxO8UCMhlehNShc5LgDtvnkQfe
-=s2sj
+iF4EAREIAAYFAk7T0osACgkQdjK8w9WeBnD/6AD/R3v87HXyB0DV7MXCtQ95SPAV
+FkvjAbn8j1xPXLsuQNkA/1jCEkFKEgAKZJmX0GHFN2fJTmvuu0u9SNZIULYD5mut
+=PD2H
 -----END PGP SIGNATURE-----