Merge lp:~sergiusens/frame/update into lp:frame

[Sergio Schvezov]

Merging in trunk

Unmerged revisions

112. By Sergio Schvezov on 2013-03-22

Merging current branch into phablet series.

111. By Sergio Schvezov on 2013-03-22

Merging current trunk

[ Stephen M. Webb ]
* frame FTBFS out of source tree (LP: #1152741)
[ Ubuntu daily release ]
* Automatic snapshot from revision 119
* Automatic snapshot from revision 117
[ Daniel d'Andrada ]
* Relicense under (L)GPL version 3 *only* (no +)
* new: frame_accept_touch() and frame_reject_touch()
[ Automatic PS uploader ]
* Automatic snapshot from revision 115
* Automatic snapshot from revision 110
* Automatic snapshot from revision 108

110. By Ricardo Salveti on 2012-11-30

Bump for auto CI/land.

Approved by Sergio Schvezov, PS Jenkins bot.

109. By Daniel d'Andrada on 2012-11-29

debian: Build without X11 support or dependencies. No tools package. For phablet

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-12 06:52:59 +0000
+++ debian/changelog	2013-03-22 17:35:35 +0000
@@ -1,3 +1,9 @@
+frame (2.5.0daily13.03.12-0ubuntu1phablet1) quantal; urgency=low
+
+  * Merging current branch into phablet series.
+
+ -- Sergio Schvezov <[e-mail]>  Fri, 22 Mar 2013 13:25:22 -0300
+
 frame (2.5.0daily13.03.12-0ubuntu1) raring; urgency=low
 
   [ Stephen M. Webb ]
@@ -25,6 +31,18 @@
 
  -- Automatic PS uploader <[e-mail]>  Fri, 07 Dec 2012 06:37:44 +0000
 
+frame (2.4.4phablet2) quantal; urgency=low
+
+  * Bump for auto CI/land
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Thu, 29 Nov 2012 19:16:28 -0200
+
+frame (2.4.4phablet1) quantal; urgency=low
+
+  * Build without X11 support or dependencies. No tools package.
+
+ -- Daniel d'Andrada <[e-mail]>  Thu, 29 Nov 2012 13:56:37 -0200
+
 frame (2.4.4daily12.12.04-0ubuntu1) raring; urgency=low
 
   * Automatic snapshot from revision 110
 
=== modified file 'debian/control'
--- debian/control	2012-11-22 22:16:27 +0000
+++ debian/control	2013-03-22 17:35:35 +0000
@@ -1,15 +1,12 @@
 Source: frame
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Developers <[e-mail]>
+Maintainer: Daniel d'Andrada <[e-mail]>
 Build-Depends: asciidoc,
                debhelper (>= 9),
                dh-autoreconf,
                docbook-xsl,
-               libx11-dev,
-               libxi-dev (>= 2:1.5.99.2),
                pkg-config,
-               xserver-xorg-dev,
                xsltproc,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/frame
@@ -25,8 +22,7 @@
          ${shlibs:Depends},
 Description: Touch Frame Library
  This library handles the buildup and synchronization of a set of
- simultaneous touches. The library is input agnostic, with bindings
- for mtdev, frame and XI2.1.
+ simultaneous touches. The library is input agnostic.
 
 Package: libframe-dev
 Section: libdevel
@@ -38,23 +34,6 @@
 Conflicts: libutouch-frame-dev
 Description: Touch Frame Library - dev files
  This library handles the buildup and synchronization of a set of
- simultaneous touches. The library is input agnostic, with bindings
- for mtdev, frame and XI2.1.
+ simultaneous touches. The library is input agnostic.
  .
  This package contains files that are needed to build applications.
-
-Package: frame-tools
-Section: libdevel
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libframe6 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Replaces: utouch-frame-tools
-Conflicts: utouch-frame-tools
-Description: Touch Frame Library - test tools
- This library handles the buildup and synchronization of a set of
- simultaneous touches. The library is input agnostic, with bindings
- for mtdev, frame and XI2.1.
- .
- This package provides some test tools for the frame library.
 
=== removed file 'debian/frame-tools.install'
--- debian/frame-tools.install	2012-11-22 22:16:27 +0000
+++ debian/frame-tools.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/bin/*
-usr/share/man/*
 
=== modified file 'debian/libframe6.symbols'
--- debian/libframe6.symbols	2012-12-04 18:46:01 +0000
+++ debian/libframe6.symbols	2013-03-22 17:35:35 +0000
@@ -87,12 +87,3 @@
  frame_touch_get_value@FRAME_2.2 2.2.4
  frame_touch_get_window_x@FRAME_2.2 2.2.4
  frame_touch_get_window_y@FRAME_2.2 2.2.4
- frame_x11_accept_touch@FRAME_2.2 2.2.4
- frame_x11_create_touch_id@FRAME_2.2 2.2.4
- frame_x11_create_window_id@FRAME_2.2 2.2.4
- frame_x11_delete@FRAME_2.2 2.2.4
- frame_x11_get_touch_id@FRAME_2.2 2.2.4
- frame_x11_get_window_id@FRAME_2.2 2.2.4
- frame_x11_new@FRAME_2.2 2.2.4
- frame_x11_process_event@FRAME_2.2 2.2.4
- frame_x11_reject_touch@FRAME_2.2 2.2.4
 
=== modified file 'debian/rules'
--- debian/rules	2012-11-23 16:39:12 +0000
+++ debian/rules	2013-03-22 17:35:35 +0000
@@ -6,3 +6,8 @@
 
 override_dh_install:
 	dh_install --fail-missing -X.la -X.a
+
+# We cannot risk bringing in X11 dependencies, thus make it explicit instead
+# of autodetecting it.
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-x11