[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg: Changes to 'ubuntu'



 debian/changelog     |    8 ++++----
 debian/local/dexconf |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1e793f0f84e55ab4ed12d561048a567709b87d69
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Thu Apr 10 15:08:03 2008 +0300

    dexconf: Add CorePointer to the default mouse section
    
    otherwise the server defaults are used. (LP: #197337)

diff --git a/debian/changelog b/debian/changelog
index 700c8f9..22cdba7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.3+10ubuntu8) hardy; urgency=low
+
+  * dexconf: Add CorePointer to the default mouse section, otherwise
+    the server defaults are used. (LP: #197337)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 10 Apr 2008 14:54:29 +0300
+
 xorg (1:7.3+10ubuntu7) hardy; urgency=low
 
   * dexconf, failsafeDexconf: Default to using vmmouse, which is able to
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 9e7ddce..c9a3ae8 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -226,6 +226,7 @@ cat >&4 <<SECTION
 Section "InputDevice"
 	Identifier	"Configured Mouse"
 	Driver		"vmmouse"
+	Option		"CorePointer"
 SECTION
 if [ -n "$DO_EMULATE3BUTTONS" ]; then
   printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >&4

commit 32f3124f6c3b118e83351bbe694e0df18a7c226d
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Thu Apr 10 14:52:26 2008 +0300

    Revert "dexconf: Add mouse InputDevice to ServerLayout"
    
    This reverts commit 804d5aa240e39e954fd7d00f2fe6b579ef89926d.
    
    Unnecessary, will add CorePointer to dexconf which is enough.

diff --git a/debian/changelog b/debian/changelog
index 4c567c4..700c8f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-xorg (1:7.3+10ubuntu8) UNRELEASED; urgency=low
-
-  * dexconf: Add mouse InputDevice to ServerLayout, otherwise the server
-    defaults are used.
-
- -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 25 Mar 2008 11:41:17 +0200
-
 xorg (1:7.3+10ubuntu7) hardy; urgency=low
 
   * dexconf, failsafeDexconf: Default to using vmmouse, which is able to
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 1e2d9ff..9e7ddce 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -327,7 +327,6 @@ cat >&4 <<SECTION
 Section "ServerLayout"
 	Identifier	"Default Layout"
 	Screen		"Default Screen"
-	InputDevice	"Configured Mouse"
 SECTION
 if [ -n "$LAPTOP" ]; then
   printf "\tInputDevice\t\"Synaptics Touchpad\"\n" >&4


Reply to: