diff -u xserver-xorg-input-synaptics-1.1.2/debian/control xserver-xorg-input-synaptics-1.1.2/debian/control --- xserver-xorg-input-synaptics-1.1.2/debian/control +++ xserver-xorg-input-synaptics-1.1.2/debian/control @@ -1,7 +1,8 @@ Source: xserver-xorg-input-synaptics Section: x11 Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian X Strike Force Uploaders: Mattia Dongili Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, x11proto-core-dev, xserver-xorg-dev (>= 2:1.5.99.901), pkg-config, quilt, automake, libtool, xutils-dev Standards-Version: 3.8.1 diff -u xserver-xorg-input-synaptics-1.1.2/debian/changelog xserver-xorg-input-synaptics-1.1.2/debian/changelog --- xserver-xorg-input-synaptics-1.1.2/debian/changelog +++ xserver-xorg-input-synaptics-1.1.2/debian/changelog @@ -1,3 +1,20 @@ +xserver-xorg-input-synaptics (1.1.2-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, Remaining changes: + - Restore the Ubuntu patch series. (LP: #378391) + - 103_enable_cornertapping.patch: Enable right/middle clicks by + tapping in the bottom- and top-right corners. + - 104_always_enable_tapping.patch: Enable tapping regardless of the + presence of physical buttons. + - 105_correct_multifinger_click.patch: Swap the right/middle clicks + generated by multi-finger tapping. + - 106_always_enable_vert_edge_scroll.patch: Enable vertical edge + tapping by default even if we enable two-finger scrolling as well. + - 110_remove_bound_auto_adjust.patch: Don't auto-adjust to bounds of + the hardware scroll area. + + -- Robert Hooker (Sarvatt) Sun, 28 Jun 2009 18:13:52 -0400 + xserver-xorg-input-synaptics (1.1.2-1) unstable; urgency=low [ Mattia Dongili ] diff -u xserver-xorg-input-synaptics-1.1.2/debian/patches/series xserver-xorg-input-synaptics-1.1.2/debian/patches/series --- xserver-xorg-input-synaptics-1.1.2/debian/patches/series +++ xserver-xorg-input-synaptics-1.1.2/debian/patches/series @@ -2,0 +3,5 @@ +103_enable_cornertapping.patch +104_always_enable_tapping.patch +105_correct_multifinger_click.patch +106_always_enable_vert_edge_scroll.patch +110_remove_bound_auto_adjust.patch only in patch2: unchanged: --- xserver-xorg-input-synaptics-1.1.2.orig/debian/patches/104_always_enable_tapping.patch +++ xserver-xorg-input-synaptics-1.1.2/debian/patches/104_always_enable_tapping.patch @@ -0,0 +1,19 @@ +Index: xserver-xorg-input-synaptics/src/synaptics.c +=================================================================== +--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-01-26 09:52:14.000000000 +0200 ++++ xserver-xorg-input-synaptics/src/synaptics.c 2009-01-26 09:52:27.000000000 +0200 +@@ -403,10 +403,10 @@ + palmMinWidth = 10; + } + +- /* Enable tap if we don't have a phys left button */ +- tapButton1 = priv->has_left ? 0 : 1; +- tapButton2 = priv->has_left ? 0 : 3; +- tapButton3 = priv->has_left ? 0 : 2; ++ /* Enable tap */ ++ tapButton1 = 1; ++ tapButton2 = 2; ++ tapButton3 = 3; + + /* Enable multifinger-click if we don't have right/middle button, + otherwise clickFinger is always button 1. */ only in patch2: unchanged: --- xserver-xorg-input-synaptics-1.1.2.orig/debian/patches/103_enable_cornertapping.patch +++ xserver-xorg-input-synaptics-1.1.2/debian/patches/103_enable_cornertapping.patch @@ -0,0 +1,15 @@ +Index: xfree86-driver-synaptics-0.99.3/src/synaptics.c +=================================================================== +--- xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c 2008-12-15 00:33:15.000000000 +0100 ++++ xfree86-driver-synaptics-0.99.3/src/synaptics.c 2009-01-24 15:48:29.000000000 +0100 +@@ -464,8 +464,8 @@ + pars->guestmouse_off = xf86SetBoolOption(opts, "GuestMouseOff", FALSE); + pars->locked_drags = xf86SetBoolOption(opts, "LockedDrags", FALSE); + pars->locked_drag_time = xf86SetIntOption(opts, "LockedDragTimeout", 5000); +- pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 0); +- pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 0); ++ pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 2); ++ pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 3); + pars->tap_action[LT_TAP] = xf86SetIntOption(opts, "LTCornerButton", 0); + pars->tap_action[LB_TAP] = xf86SetIntOption(opts, "LBCornerButton", 0); + pars->tap_action[F1_TAP] = xf86SetIntOption(opts, "TapButton1", tapButton1); only in patch2: unchanged: --- xserver-xorg-input-synaptics-1.1.2.orig/debian/patches/106_always_enable_vert_edge_scroll.patch +++ xserver-xorg-input-synaptics-1.1.2/debian/patches/106_always_enable_vert_edge_scroll.patch @@ -0,0 +1,15 @@ +Index: xserver-xorg-input-synaptics/src/synaptics.c +=================================================================== +--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-01-26 09:52:44.000000000 +0200 ++++ xserver-xorg-input-synaptics/src/synaptics.c 2009-01-26 09:52:48.000000000 +0200 +@@ -413,8 +413,8 @@ + clickFinger2 = 2; + clickFinger3 = 3; + +- /* Enable vert edge scroll if we can't detect doubletap */ +- vertEdgeScroll = priv->has_double ? FALSE : TRUE; ++ /* Enable vert edge scroll */ ++ vertEdgeScroll = TRUE; + horizEdgeScroll = FALSE; + + /* Enable twofinger scroll if we can detect doubletap */ only in patch2: unchanged: --- xserver-xorg-input-synaptics-1.1.2.orig/debian/patches/110_remove_bound_auto_adjust.patch +++ xserver-xorg-input-synaptics-1.1.2/debian/patches/110_remove_bound_auto_adjust.patch @@ -0,0 +1,20 @@ +Index: xserver-xorg-input-synaptics/src/synaptics.c +=================================================================== +diff -Nur xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c xfree86-driver-synaptics-0.99.3/src/synaptics.c +--- xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c 2008-12-15 00:33:15.000000000 +0100 ++++ xfree86-driver-synaptics-0.99.3/src/synaptics.c 2009-03-26 16:58:30.000000000 +0100 +@@ -441,11 +441,11 @@ + pars->scroll_dist_vert = xf86SetIntOption(opts, "VertScrollDelta", horizScrollDelta); + pars->scroll_dist_horiz = xf86SetIntOption(opts, "HorizScrollDelta", vertScrollDelta); + pars->scroll_edge_vert = xf86SetBoolOption(opts, "VertEdgeScroll", vertEdgeScroll); +- if (xf86CheckIfOptionUsedByName(opts, "RightEdge")) { ++ /*if (xf86CheckIfOptionUsedByName(opts, "RightEdge")) {*/ + pars->special_scroll_area_right = FALSE; +- } else { ++ /*} else { + pars->special_scroll_area_right = xf86SetBoolOption(opts, "SpecialScrollAreaRight", TRUE); +- } ++ }*/ + pars->scroll_edge_horiz = xf86SetBoolOption(opts, "HorizEdgeScroll", horizEdgeScroll); + pars->scroll_edge_corner = xf86SetBoolOption(opts, "CornerCoasting", FALSE); + pars->scroll_twofinger_vert = xf86SetBoolOption(opts, "VertTwoFingerScroll", vertTwoFingerScroll); only in patch2: unchanged: --- xserver-xorg-input-synaptics-1.1.2.orig/debian/patches/105_correct_multifinger_click.patch +++ xserver-xorg-input-synaptics-1.1.2/debian/patches/105_correct_multifinger_click.patch @@ -0,0 +1,14 @@ +diff -Nur xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c xfree86-driver-synaptics-0.99.3/src/synaptics.c +--- xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c 2008-12-15 00:33:15.000000000 +0100 ++++ xfree86-driver-synaptics-0.99.3/src/synaptics.c 2009-01-31 18:40:37.000000000 +0100 +@@ -411,8 +411,8 @@ + /* Enable multifinger-click if we don't have right/middle button, + otherwise clickFinger is always button 1. */ + clickFinger1 = 1; +- clickFinger2 = priv->has_right ? 1 : 3; +- clickFinger3 = priv->has_middle ? 1 : 2; ++ clickFinger2 = priv->has_right ? 1 : 2; ++ clickFinger3 = priv->has_middle ? 1 : 3; + + /* Enable vert edge scroll if we can't detect doubletap */ + vertEdgeScroll = priv->has_double ? FALSE : TRUE;