[Pkg-xfce-commits] r5357 - in desktop/trunk/xfce4-settings/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Apr 11 09:24:16 UTC 2011
Author: corsac
Date: 2011-04-11 09:24:14 +0000 (Mon, 11 Apr 2011)
New Revision: 5357
Added:
desktop/trunk/xfce4-settings/debian/patches/01_fix-sticky-slow-bounce-mouse-keys-expiration.patch
desktop/trunk/xfce4-settings/debian/patches/series
Modified:
desktop/trunk/xfce4-settings/debian/changelog
desktop/trunk/xfce4-settings/debian/rules
Log:
* debian/patches:
- 01_fix-sticky-slow-bounce-mouse-keys-expiration added, backported from
master. closes: #614939
* debian/rules:
- add quilt files to POTFILES.skip and remove them at clean time.
Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog 2011-04-11 08:03:57 UTC (rev 5356)
+++ desktop/trunk/xfce4-settings/debian/changelog 2011-04-11 09:24:14 UTC (rev 5357)
@@ -3,8 +3,13 @@
* Upload to unstable.
* debian/control:
- drop Emanuele and Simon from uploaders, thanks to them.
+ * debian/patches:
+ - 01_fix-sticky-slow-bounce-mouse-keys-expiration added, backported from
+ master. closes: #614939
+ * debian/rules:
+ - add quilt files to POTFILES.skip and remove them at clean time.
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 01 Apr 2011 08:39:11 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 11 Apr 2011 11:18:53 +0200
xfce4-settings (4.8.1-2) experimental; urgency=low
Added: desktop/trunk/xfce4-settings/debian/patches/01_fix-sticky-slow-bounce-mouse-keys-expiration.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/01_fix-sticky-slow-bounce-mouse-keys-expiration.patch (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/01_fix-sticky-slow-bounce-mouse-keys-expiration.patch 2011-04-11 09:24:14 UTC (rev 5357)
@@ -0,0 +1,90 @@
+diff --git a/xfce4-settings-helper/accessibility.c b/xfce4-settings-helper/accessibility.c
+index b21d3d4..a53c93c 100644
+--- a/xfce4-settings-helper/accessibility.c
++++ b/xfce4-settings-helper/accessibility.c
+@@ -192,6 +192,13 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper *helper,
+ /* we always change this, so add it to the mask */
+ SET_FLAG (mask, XkbControlsEnabledMask);
+
++ /* if setting sticky keys, we set expiration too */
++ if (HAS_FLAG (mask, XkbStickyKeysMask) ||
++ HAS_FLAG (mask, XkbSlowKeysMask) ||
++ HAS_FLAG (mask, XkbBounceKeysMask) ||
++ HAS_FLAG (mask, XkbMouseKeysMask))
++ SET_FLAG (mask, XkbAccessXTimeoutMask);
++
+ /* add the mouse keys values mask if needed */
+ if (HAS_FLAG (mask, XkbMouseKeysMask))
+ SET_FLAG (mask, XkbMouseKeysAccelMask);
+@@ -205,6 +212,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper *helper,
+ if (xfconf_channel_get_bool (helper->channel, "/StickyKeys", FALSE))
+ {
+ SET_FLAG (xkb->ctrls->enabled_ctrls, XkbStickyKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbStickyKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbStickyKeysMask);
+
+ if (xfconf_channel_get_bool (helper->channel, "/StickyKeys/LatchToLock", FALSE))
+ SET_FLAG (xkb->ctrls->ax_options, XkbAX_LatchToLockMask);
+@@ -219,6 +228,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper *helper,
+ else
+ {
+ UNSET_FLAG (xkb->ctrls->enabled_ctrls, XkbStickyKeysMask);
++ SET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbStickyKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbStickyKeysMask);
+ }
+ }
+
+@@ -228,6 +239,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper *helper,
+ if (xfconf_channel_get_bool (helper->channel, "/SlowKeys", FALSE))
+ {
+ SET_FLAG (xkb->ctrls->enabled_ctrls, XkbSlowKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbSlowKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbSlowKeysMask);
+
+ delay = xfconf_channel_get_int (helper->channel, "/SlowKeys/Delay", 100);
+ xkb->ctrls->slow_keys_delay = CLAMP (delay, 1, G_MAXUSHORT);
+@@ -235,6 +248,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper *helper,
+ else
+ {
+ UNSET_FLAG (xkb->ctrls->enabled_ctrls, XkbSlowKeysMask);
++ SET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbSlowKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbSlowKeysMask);
+ }
+ }
+
+@@ -244,6 +259,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper *helper,
+ if (xfconf_channel_get_bool (helper->channel, "/BounceKeys", FALSE))
+ {
+ SET_FLAG (xkb->ctrls->enabled_ctrls, XkbBounceKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbBounceKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbBounceKeysMask);
+
+ delay = xfconf_channel_get_int (helper->channel, "/BounceKeys/Delay", 100);
+ xkb->ctrls->debounce_delay = CLAMP (delay, 1, G_MAXUSHORT);
+@@ -251,6 +268,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper *helper,
+ else
+ {
+ UNSET_FLAG (xkb->ctrls->enabled_ctrls, XkbBounceKeysMask);
++ SET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbBounceKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbBounceKeysMask);
+ }
+ }
+
+@@ -260,6 +279,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper *helper,
+ if (xfconf_channel_get_bool (helper->channel, "/MouseKeys", FALSE))
+ {
+ SET_FLAG (xkb->ctrls->enabled_ctrls, XkbMouseKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbMouseKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbMouseKeysMask);
+
+ /* get values */
+ delay = xfconf_channel_get_int (helper->channel, "/MouseKeys/Delay", 160);
+@@ -288,6 +309,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper *helper,
+ else
+ {
+ UNSET_FLAG (xkb->ctrls->enabled_ctrls, XkbMouseKeysMask);
++ SET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbMouseKeysMask);
++ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbMouseKeysMask);
+ UNSET_FLAG (mask, XkbMouseKeysAccelMask);
+ }
+ }
Added: desktop/trunk/xfce4-settings/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/series (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/series 2011-04-11 09:24:14 UTC (rev 5357)
@@ -0,0 +1 @@
+01_fix-sticky-slow-bounce-mouse-keys-expiration.patch
Modified: desktop/trunk/xfce4-settings/debian/rules
===================================================================
--- desktop/trunk/xfce4-settings/debian/rules 2011-04-11 08:03:57 UTC (rev 5356)
+++ desktop/trunk/xfce4-settings/debian/rules 2011-04-11 09:24:14 UTC (rev 5357)
@@ -9,12 +9,16 @@
export CFLAGS LDFLAGS
-
override_dh_auto_configure:
+ find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
dh_auto_configure -- --enable-libnotify --enable-xcursor \
--enable-libxklavier --enable-xsettings-daemon --enable-sound-settings\
--enable-pluggable-dialogs
+override_dh_auto_clean:
+ rm -f po/POTFILES.skip
+ dh_auto_clean
+
override_dh_installman:
dh_installman debian/*.1
More information about the Pkg-xfce-commits
mailing list