frame

Merge lp:~oif-packaging/frame/ubuntu.v1.1.1 into lp:frame/ubuntu

  1. ubuntu.v1.1.1
  2. Merge into ubuntu
Proposed by Henrik Rydberg
Status: Merged
Merged at revision: 20
Proposed branch: lp:~oif-packaging/frame/ubuntu.v1.1.1
Merge into: lp:frame/ubuntu
Diff against target: 195 lines (+45/-15)
7 files modified
ChangeLog (+20/-0)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+7/-0)
src/frame-mtdev.c (+3/-0)
tools/utouch-frame-test-mtdev.1 (+2/-2)
tools/utouch-frame-test-xi2.1 (+2/-2)
To merge this branch: bzr merge lp:~oif-packaging/frame/ubuntu.v1.1.1
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve
Review via email: mp+51142@code.launchpad.net

Description of the change

New release for LP: #724051

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-02-23 11:44:27 +0000
3+++ ChangeLog 2011-02-24 15:07:22 +0000
4@@ -1,5 +1,25 @@
5 ------------------------------------------------------------
6+revno: 26
7+tags: v1.1.1
8+committer: Henrik Rydberg <rydberg@bitmath.org>
9+branch nick: trunk
10+timestamp: Thu 2011-02-24 15:48:20 +0100
11+message:
12+ Release v1.1.1
13+------------------------------------------------------------
14+revno: 25
15+committer: Henrik Rydberg <rydberg@bitmath.org>
16+branch nick: trunk
17+timestamp: Thu 2011-02-24 15:47:40 +0100
18+message:
19+ Do not accept non-mt devices until emulation is in place
20+
21+ The current code accepts multi-finger non-mt devices such as
22+ older synaptics trackpads, which breaks things since emulation
23+ of these devices is not in place. Fixed with this patch.
24+------------------------------------------------------------
25 revno: 24
26+tags: v1.1.0
27 committer: Henrik Rydberg <rydberg@bitmath.org>
28 branch nick: trunk
29 timestamp: Wed 2011-02-23 12:37:53 +0100
30
31=== modified file 'configure'
32--- configure 2011-02-23 11:44:57 +0000
33+++ configure 2011-02-24 15:07:22 +0000
34@@ -1,6 +1,6 @@
35 #! /bin/sh
36 # Guess values for system-dependent variables and create Makefiles.
37-# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.1.0.
38+# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.1.1.
39 #
40 #
41 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
42@@ -698,8 +698,8 @@
43 # Identity of this package.
44 PACKAGE_NAME='Touch Frame Library'
45 PACKAGE_TARNAME='utouch-frame'
46-PACKAGE_VERSION='1.1.0'
47-PACKAGE_STRING='Touch Frame Library 1.1.0'
48+PACKAGE_VERSION='1.1.1'
49+PACKAGE_STRING='Touch Frame Library 1.1.1'
50 PACKAGE_BUGREPORT=''
51 PACKAGE_URL=''
52
53@@ -1440,7 +1440,7 @@
54 # Omit some internal or obsolete options to make the list less imposing.
55 # This message is too long to be a string in the A/UX 3.1 sh.
56 cat <<_ACEOF
57-\`configure' configures Touch Frame Library 1.1.0 to adapt to many kinds of systems.
58+\`configure' configures Touch Frame Library 1.1.1 to adapt to many kinds of systems.
59
60 Usage: $0 [OPTION]... [VAR=VALUE]...
61
62@@ -1510,7 +1510,7 @@
63
64 if test -n "$ac_init_help"; then
65 case $ac_init_help in
66- short | recursive ) echo "Configuration of Touch Frame Library 1.1.0:";;
67+ short | recursive ) echo "Configuration of Touch Frame Library 1.1.1:";;
68 esac
69 cat <<\_ACEOF
70
71@@ -1626,7 +1626,7 @@
72 test -n "$ac_init_help" && exit $ac_status
73 if $ac_init_version; then
74 cat <<\_ACEOF
75-Touch Frame Library configure 1.1.0
76+Touch Frame Library configure 1.1.1
77 generated by GNU Autoconf 2.67
78
79 Copyright (C) 2010 Free Software Foundation, Inc.
80@@ -1904,7 +1904,7 @@
81 This file contains any messages produced by compilers while
82 running configure, to aid debugging if configure makes a mistake.
83
84-It was created by Touch Frame Library $as_me 1.1.0, which was
85+It was created by Touch Frame Library $as_me 1.1.1, which was
86 generated by GNU Autoconf 2.67. Invocation command line was
87
88 $ $0 $@
89@@ -2724,7 +2724,7 @@
90
91 # Define the identity of the package.
92 PACKAGE='utouch-frame'
93- VERSION='1.1.0'
94+ VERSION='1.1.1'
95
96
97 cat >>confdefs.h <<_ACEOF
98@@ -12062,7 +12062,7 @@
99 # report actual input values of CONFIG_FILES etc. instead of their
100 # values after options handling.
101 ac_log="
102-This file was extended by Touch Frame Library $as_me 1.1.0, which was
103+This file was extended by Touch Frame Library $as_me 1.1.1, which was
104 generated by GNU Autoconf 2.67. Invocation command line was
105
106 CONFIG_FILES = $CONFIG_FILES
107@@ -12128,7 +12128,7 @@
108 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
109 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
110 ac_cs_version="\\
111-Touch Frame Library config.status 1.1.0
112+Touch Frame Library config.status 1.1.1
113 configured by $0, generated by GNU Autoconf 2.67,
114 with options \\"\$ac_cs_config\\"
115
116
117=== modified file 'configure.ac'
118--- configure.ac 2011-02-23 11:44:57 +0000
119+++ configure.ac 2011-02-24 15:07:22 +0000
120@@ -1,7 +1,7 @@
121 # Initialize Autoconf
122 AC_PREREQ([2.60])
123 AC_INIT([Touch Frame Library],
124- [1.1.0],
125+ [1.1.1],
126 [],
127 [utouch-frame])
128 AC_CONFIG_SRCDIR([Makefile.am])
129
130=== modified file 'debian/changelog'
131--- debian/changelog 2011-02-23 17:00:04 +0000
132+++ debian/changelog 2011-02-24 15:07:22 +0000
133@@ -1,3 +1,10 @@
134+utouch-frame (1.1.1-0ubuntu1) UNRELEASED; urgency=low
135+
136+ * New upstream release.
137+ * Fixing semi-mt entanglement (LP: #724051)
138+
139+ -- Henrik Rydberg <rydberg@bitmath.org> Thu, 24 Feb 2011 16:02:44 +0100
140+
141 utouch-frame (1.1.0-0ubuntu1) natty; urgency=low
142
143 * New upstream release (LP: #723763)
144
145=== modified file 'src/frame-mtdev.c'
146--- src/frame-mtdev.c 2011-02-23 10:25:28 +0000
147+++ src/frame-mtdev.c 2011-02-24 15:07:22 +0000
148@@ -47,6 +47,9 @@
149 evemu_has_event(dev, EV_ABS, ABS_MT_POSITION_Y))
150 return 1;
151
152+ /* do not support multi-finger non-mt for now */
153+ return 0;
154+
155 return evemu_has_event(dev, EV_ABS, ABS_X) &&
156 evemu_has_event(dev, EV_ABS, ABS_Y) &&
157 evemu_has_event(dev, EV_KEY, BTN_TOUCH) &&
158
159=== modified file 'tools/utouch-frame-test-mtdev.1'
160--- tools/utouch-frame-test-mtdev.1 2011-02-23 10:25:28 +0000
161+++ tools/utouch-frame-test-mtdev.1 2011-02-24 15:07:22 +0000
162@@ -2,12 +2,12 @@
163 .\" Title: utouch-frame-test-mtdev
164 .\" Author: [see the "AUTHOR" section]
165 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
166-.\" Date: 02/23/2011
167+.\" Date: 02/24/2011
168 .\" Manual: \ \&
169 .\" Source: \ \&
170 .\" Language: English
171 .\"
172-.TH "UTOUCH\-FRAME\-TEST\" "1" "02/23/2011" "\ \&" "\ \&"
173+.TH "UTOUCH\-FRAME\-TEST\" "1" "02/24/2011" "\ \&" "\ \&"
174 .\" -----------------------------------------------------------------
175 .\" * Define some portability stuff
176 .\" -----------------------------------------------------------------
177
178=== modified file 'tools/utouch-frame-test-xi2.1'
179--- tools/utouch-frame-test-xi2.1 2011-02-23 10:25:28 +0000
180+++ tools/utouch-frame-test-xi2.1 2011-02-24 15:07:22 +0000
181@@ -2,12 +2,12 @@
182 .\" Title: utouch-frame-test-xi2
183 .\" Author: [see the "AUTHOR" section]
184 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
185-.\" Date: 02/23/2011
186+.\" Date: 02/24/2011
187 .\" Manual: \ \&
188 .\" Source: \ \&
189 .\" Language: English
190 .\"
191-.TH "UTOUCH\-FRAME\-TEST\" "1" "02/23/2011" "\ \&" "\ \&"
192+.TH "UTOUCH\-FRAME\-TEST\" "1" "02/24/2011" "\ \&" "\ \&"
193 .\" -----------------------------------------------------------------
194 .\" * Define some portability stuff
195 .\" -----------------------------------------------------------------

Subscribers

People subscribed via source and target branches

to all changes: