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

[Henrik Rydberg]

New release for LP: #724051

[Chase Douglas (chasedouglas)]

Looks good.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-02-23 11:44:27 +0000
+++ ChangeLog	2011-02-24 15:07:22 +0000
@@ -1,5 +1,25 @@
 ------------------------------------------------------------
+revno: 26
+tags: v1.1.1
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Thu 2011-02-24 15:48:20 +0100
+message:
+  Release v1.1.1
+------------------------------------------------------------
+revno: 25
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Thu 2011-02-24 15:47:40 +0100
+message:
+  Do not accept non-mt devices until emulation is in place
+  
+  The current code accepts multi-finger non-mt devices such as
+  older synaptics trackpads, which breaks things since emulation
+  of these devices is not in place. Fixed with this patch.
+------------------------------------------------------------
 revno: 24
+tags: v1.1.0
 committer: Henrik Rydberg <[e-mail]>
 branch nick: trunk
 timestamp: Wed 2011-02-23 12:37:53 +0100
 
=== modified file 'configure'
--- configure	2011-02-23 11:44:57 +0000
+++ configure	2011-02-24 15:07:22 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.1.0.
+# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.1.1.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='Touch Frame Library'
 PACKAGE_TARNAME='utouch-frame'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='Touch Frame Library 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='Touch Frame Library 1.1.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1440,7 +1440,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Touch Frame Library 1.1.0 to adapt to many kinds of systems.
+\`configure' configures Touch Frame Library 1.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1510,7 +1510,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Touch Frame Library 1.1.0:";;
+     short | recursive ) echo "Configuration of Touch Frame Library 1.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1626,7 +1626,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Touch Frame Library configure 1.1.0
+Touch Frame Library configure 1.1.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1904,7 +1904,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Touch Frame Library $as_me 1.1.0, which was
+It was created by Touch Frame Library $as_me 1.1.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2724,7 +2724,7 @@
 
 # Define the identity of the package.
  PACKAGE='utouch-frame'
- VERSION='1.1.0'
+ VERSION='1.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12062,7 +12062,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Touch Frame Library $as_me 1.1.0, which was
+This file was extended by Touch Frame Library $as_me 1.1.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12128,7 +12128,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Touch Frame Library config.status 1.1.0
+Touch Frame Library config.status 1.1.1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-02-23 11:44:57 +0000
+++ configure.ac	2011-02-24 15:07:22 +0000
@@ -1,7 +1,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Touch Frame Library],
-        [1.1.0],
+        [1.1.1],
         [],
         [utouch-frame])
 AC_CONFIG_SRCDIR([Makefile.am])
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-02-23 17:00:04 +0000
+++ debian/changelog	2011-02-24 15:07:22 +0000
@@ -1,3 +1,10 @@
+utouch-frame (1.1.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Fixing semi-mt entanglement (LP: #724051)
+
+ -- Henrik Rydberg <[e-mail]>  Thu, 24 Feb 2011 16:02:44 +0100
+
 utouch-frame (1.1.0-0ubuntu1) natty; urgency=low
 
   * New upstream release (LP: #723763)
 
=== modified file 'src/frame-mtdev.c'
--- src/frame-mtdev.c	2011-02-23 10:25:28 +0000
+++ src/frame-mtdev.c	2011-02-24 15:07:22 +0000
@@ -47,6 +47,9 @@
 	    evemu_has_event(dev, EV_ABS, ABS_MT_POSITION_Y))
 		return 1;
 
+	/* do not support multi-finger non-mt for now */
+	return 0;
+
 	return evemu_has_event(dev, EV_ABS, ABS_X) &&
 		evemu_has_event(dev, EV_ABS, ABS_Y) &&
 		evemu_has_event(dev, EV_KEY, BTN_TOUCH) &&
 
=== modified file 'tools/utouch-frame-test-mtdev.1'
--- tools/utouch-frame-test-mtdev.1	2011-02-23 10:25:28 +0000
+++ tools/utouch-frame-test-mtdev.1	2011-02-24 15:07:22 +0000
@@ -2,12 +2,12 @@
 .\"     Title: utouch-frame-test-mtdev
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 02/23/2011
+.\"      Date: 02/24/2011
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "UTOUCH\-FRAME\-TEST\" "1" "02/23/2011" "\ \&" "\ \&"
+.TH "UTOUCH\-FRAME\-TEST\" "1" "02/24/2011" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'tools/utouch-frame-test-xi2.1'
--- tools/utouch-frame-test-xi2.1	2011-02-23 10:25:28 +0000
+++ tools/utouch-frame-test-xi2.1	2011-02-24 15:07:22 +0000
@@ -2,12 +2,12 @@
 .\"     Title: utouch-frame-test-xi2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 02/23/2011
+.\"      Date: 02/24/2011
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "UTOUCH\-FRAME\-TEST\" "1" "02/23/2011" "\ \&" "\ \&"
+.TH "UTOUCH\-FRAME\-TEST\" "1" "02/24/2011" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------