Ubuntu
mtdev package

Merge lp:~logan/ubuntu/utopic/mtdev/1.1.5-1ubuntu1 into lp:ubuntu/utopic/mtdev

  1. Utopic (14.10)
  2. 1.1.5-1ubuntu1
  3. Merge into utopic
Proposed by Logan Rosen
Status: Merged
Merged at revision: 14
Proposed branch: lp:~logan/ubuntu/utopic/mtdev/1.1.5-1ubuntu1
Merge into: lp:ubuntu/utopic/mtdev
Diff against target: 289 lines (+72/-23)
11 files modified
ChangeLog (+33/-0)
Makefile.in (+3/-2)
aclocal.m4 (+3/-3)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+15/-0)
debian/control (+1/-1)
src/Makefile.am (+1/-1)
src/Makefile.in (+2/-2)
test/Makefile.am (+1/-1)
test/Makefile.in (+2/-2)
To merge this branch: bzr merge lp:~logan/ubuntu/utopic/mtdev/1.1.5-1ubuntu1
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+220545@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

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 2013-09-24 08:25:26 +0000
3+++ ChangeLog 2014-05-22 02:14:13 +0000
4@@ -1,3 +1,36 @@
5+commit 4381b78fea54de0e775bf54952b2f95e5a06c57d
6+Author: Henrik Rydberg <rydberg@euromail.se>
7+Date: Fri Feb 28 19:57:15 2014 +0100
8+
9+ Release mtdev-1.1.5
10+
11+ Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
12+
13+commit 88840fe45b49464642181007c5a6df1bc951bade
14+Author: Colin Walters <walters@verbum.org>
15+Date: Thu Feb 27 08:03:35 2014 -0500
16+
17+ build: Fix srcdir != builddir from git
18+
19+ Make it possible to build the source out-of-tree. The gnome-continuous
20+ build system does this by default.
21+
22+ Signed-off-by: Colin Walters <walters@verbum.org>
23+ [rydberg@euromail.se: Resolve merge conflict]
24+ Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
25+
26+commit 6d698f6dba4a024b5f3ccac2876465c60f780478
27+Author: Ross Burton <ross.burton@intel.com>
28+Date: Fri Nov 15 23:41:29 2013 +0000
29+
30+ test: fix out-of-tree builds
31+
32+ Some tests do #include relative to the top-level, so add top_srcdir to the
33+ include path as otherwise out-of-tree builds can't find the files.
34+
35+ Signed-off-by: Ross Burton <ross.burton@intel.com>
36+ Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
37+
38 commit 25070dda4b1aaaf402db621d10fc901b82d78377
39 Author: Henrik Rydberg <rydberg@euromail.se>
40 Date: Sat Aug 3 22:01:06 2013 +0200
41
42=== modified file 'Makefile.in'
43--- Makefile.in 2013-09-24 08:25:26 +0000
44+++ Makefile.in 2014-05-22 02:14:13 +0000
45@@ -1,4 +1,4 @@
46-# Makefile.in generated by automake 1.14 from Makefile.am.
47+# Makefile.in generated by automake 1.14.1 from Makefile.am.
48 # @configure_input@
49
50 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
51@@ -674,9 +674,10 @@
52 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
53 && am__cwd=`pwd` \
54 && $(am__cd) $(distdir)/_build \
55- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
56+ && ../configure \
57 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
58 $(DISTCHECK_CONFIGURE_FLAGS) \
59+ --srcdir=.. --prefix="$$dc_install_base" \
60 && $(MAKE) $(AM_MAKEFLAGS) \
61 && $(MAKE) $(AM_MAKEFLAGS) dvi \
62 && $(MAKE) $(AM_MAKEFLAGS) check \
63
64=== modified file 'aclocal.m4'
65--- aclocal.m4 2013-09-24 08:25:26 +0000
66+++ aclocal.m4 2014-05-22 02:14:13 +0000
67@@ -1,4 +1,4 @@
68-# generated automatically by aclocal 1.14 -*- Autoconf -*-
69+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
70
71 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
72
73@@ -8622,7 +8622,7 @@
74 [am__api_version='1.14'
75 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
76 dnl require some minimum version. Point them to the right macro.
77-m4_if([$1], [1.14], [],
78+m4_if([$1], [1.14.1], [],
79 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
80 ])
81
82@@ -8638,7 +8638,7 @@
83 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
84 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
85 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
86-[AM_AUTOMAKE_VERSION([1.14])dnl
87+[AM_AUTOMAKE_VERSION([1.14.1])dnl
88 m4_ifndef([AC_AUTOCONF_VERSION],
89 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
90 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
91
92=== modified file 'configure'
93--- configure 2013-09-24 08:25:26 +0000
94+++ configure 2014-05-22 02:14:13 +0000
95@@ -1,6 +1,6 @@
96 #! /bin/sh
97 # Guess values for system-dependent variables and create Makefiles.
98-# Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.4.
99+# Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.5.
100 #
101 #
102 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
103@@ -587,8 +587,8 @@
104 # Identity of this package.
105 PACKAGE_NAME='Multitouch Protocol Translation Library'
106 PACKAGE_TARNAME='mtdev'
107-PACKAGE_VERSION='1.1.4'
108-PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.4'
109+PACKAGE_VERSION='1.1.5'
110+PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.5'
111 PACKAGE_BUGREPORT=''
112 PACKAGE_URL=''
113
114@@ -1308,7 +1308,7 @@
115 # Omit some internal or obsolete options to make the list less imposing.
116 # This message is too long to be a string in the A/UX 3.1 sh.
117 cat <<_ACEOF
118-\`configure' configures Multitouch Protocol Translation Library 1.1.4 to adapt to many kinds of systems.
119+\`configure' configures Multitouch Protocol Translation Library 1.1.5 to adapt to many kinds of systems.
120
121 Usage: $0 [OPTION]... [VAR=VALUE]...
122
123@@ -1378,7 +1378,7 @@
124
125 if test -n "$ac_init_help"; then
126 case $ac_init_help in
127- short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.4:";;
128+ short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.5:";;
129 esac
130 cat <<\_ACEOF
131
132@@ -1483,7 +1483,7 @@
133 test -n "$ac_init_help" && exit $ac_status
134 if $ac_init_version; then
135 cat <<\_ACEOF
136-Multitouch Protocol Translation Library configure 1.1.4
137+Multitouch Protocol Translation Library configure 1.1.5
138 generated by GNU Autoconf 2.69
139
140 Copyright (C) 2012 Free Software Foundation, Inc.
141@@ -1761,7 +1761,7 @@
142 This file contains any messages produced by compilers while
143 running configure, to aid debugging if configure makes a mistake.
144
145-It was created by Multitouch Protocol Translation Library $as_me 1.1.4, which was
146+It was created by Multitouch Protocol Translation Library $as_me 1.1.5, which was
147 generated by GNU Autoconf 2.69. Invocation command line was
148
149 $ $0 $@
150@@ -2629,7 +2629,7 @@
151
152 # Define the identity of the package.
153 PACKAGE='mtdev'
154- VERSION='1.1.4'
155+ VERSION='1.1.5'
156
157
158 cat >>confdefs.h <<_ACEOF
159@@ -12648,7 +12648,7 @@
160 # report actual input values of CONFIG_FILES etc. instead of their
161 # values after options handling.
162 ac_log="
163-This file was extended by Multitouch Protocol Translation Library $as_me 1.1.4, which was
164+This file was extended by Multitouch Protocol Translation Library $as_me 1.1.5, which was
165 generated by GNU Autoconf 2.69. Invocation command line was
166
167 CONFIG_FILES = $CONFIG_FILES
168@@ -12714,7 +12714,7 @@
169 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
170 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
171 ac_cs_version="\\
172-Multitouch Protocol Translation Library config.status 1.1.4
173+Multitouch Protocol Translation Library config.status 1.1.5
174 configured by $0, generated by GNU Autoconf 2.69,
175 with options \\"\$ac_cs_config\\"
176
177
178=== modified file 'configure.ac'
179--- configure.ac 2013-09-24 08:25:26 +0000
180+++ configure.ac 2014-05-22 02:14:13 +0000
181@@ -1,7 +1,7 @@
182 # Initialize Autoconf
183 AC_PREREQ([2.60])
184 AC_INIT([Multitouch Protocol Translation Library],
185- [1.1.4],
186+ [1.1.5],
187 [],
188 [mtdev])
189 AC_CONFIG_SRCDIR([Makefile.am])
190
191=== modified file 'debian/changelog'
192--- debian/changelog 2013-10-26 18:16:52 +0000
193+++ debian/changelog 2014-05-22 02:14:13 +0000
194@@ -1,3 +1,18 @@
195+mtdev (1.1.5-1ubuntu1) utopic; urgency=medium
196+
197+ * Merge from Debian unstable. Remaining chanages:
198+ - debian/libmtdev1.links: Install apport hook links.
199+
200+ -- Logan Rosen <logan@ubuntu.com> Wed, 21 May 2014 22:11:19 -0400
201+
202+mtdev (1.1.5-1) unstable; urgency=medium
203+
204+ * New upstream release.
205+ * Update debian/control.
206+ Update Standards-Version to 3.9.5.
207+
208+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Wed, 02 Apr 2014 19:46:36 +0900
209+
210 mtdev (1.1.4-1ubuntu1) trusty; urgency=low
211
212 * Merge from Debian unstable. Remaining changes:
213
214=== modified file 'debian/control'
215--- debian/control 2013-05-20 21:16:05 +0000
216+++ debian/control 2014-05-22 02:14:13 +0000
217@@ -9,7 +9,7 @@
218 quilt,
219 dpkg-dev (>= 1.14.17),
220 dh-autoreconf (>= 7)
221-Standards-Version: 3.9.4
222+Standards-Version: 3.9.5
223 Homepage: http://bitmath.org/code/mtdev/
224 Vcs-Git: git://anonscm.debian.org/collab-maint/mtdev.git
225 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mtdev.git
226
227=== modified file 'src/Makefile.am'
228--- src/Makefile.am 2013-09-24 08:25:26 +0000
229+++ src/Makefile.am 2014-05-22 02:14:13 +0000
230@@ -18,7 +18,7 @@
231
232 AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI
233
234-AM_CPPFLAGS = -I$(top_srcdir)/include/
235+AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(srcdir)
236
237 libmtdevincludedir = $(includedir)
238 libmtdevinclude_HEADERS = \
239
240=== modified file 'src/Makefile.in'
241--- src/Makefile.in 2013-09-24 08:25:26 +0000
242+++ src/Makefile.in 2014-05-22 02:14:13 +0000
243@@ -1,4 +1,4 @@
244-# Makefile.in generated by automake 1.14 from Makefile.am.
245+# Makefile.in generated by automake 1.14.1 from Makefile.am.
246 # @configure_input@
247
248 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
249@@ -325,7 +325,7 @@
250 match_four.c
251
252 AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI
253-AM_CPPFLAGS = -I$(top_srcdir)/include/
254+AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(srcdir)
255 libmtdevincludedir = $(includedir)
256 libmtdevinclude_HEADERS = \
257 $(top_srcdir)/include/mtdev-mapping.h \
258
259=== modified file 'test/Makefile.am'
260--- test/Makefile.am 2013-09-24 08:25:26 +0000
261+++ test/Makefile.am 2014-05-22 02:14:13 +0000
262@@ -1,7 +1,7 @@
263 noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel
264 bin_PROGRAMS = mtdev-test
265
266-AM_CPPFLAGS=-I$(top_srcdir)/include/
267+AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include/
268
269 mtdev_mapgen_SOURCES = mtdev-mapgen.c
270
271
272=== modified file 'test/Makefile.in'
273--- test/Makefile.in 2013-09-24 08:25:26 +0000
274+++ test/Makefile.in 2014-05-22 02:14:13 +0000
275@@ -1,4 +1,4 @@
276-# Makefile.in generated by automake 1.14 from Makefile.am.
277+# Makefile.in generated by automake 1.14.1 from Makefile.am.
278 # @configure_input@
279
280 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
281@@ -298,7 +298,7 @@
282 top_build_prefix = @top_build_prefix@
283 top_builddir = @top_builddir@
284 top_srcdir = @top_srcdir@
285-AM_CPPFLAGS = -I$(top_srcdir)/include/
286+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/
287 mtdev_mapgen_SOURCES = mtdev-mapgen.c
288 mtdev_matching_SOURCES = mtdev-matching.c
289 mtdev_matching_LDFLAGS = -L$(top_builddir)/src/.libs/ -lmtdev

Subscribers

People subscribed via source and target branches

to all changes: