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
=== modified file 'ChangeLog'
--- ChangeLog 2013-09-24 08:25:26 +0000
+++ ChangeLog 2014-05-22 02:14:13 +0000
@@ -1,3 +1,36 @@
1commit 4381b78fea54de0e775bf54952b2f95e5a06c57d
2Author: Henrik Rydberg <rydberg@euromail.se>
3Date: Fri Feb 28 19:57:15 2014 +0100
4
5 Release mtdev-1.1.5
6
7 Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
8
9commit 88840fe45b49464642181007c5a6df1bc951bade
10Author: Colin Walters <walters@verbum.org>
11Date: Thu Feb 27 08:03:35 2014 -0500
12
13 build: Fix srcdir != builddir from git
14
15 Make it possible to build the source out-of-tree. The gnome-continuous
16 build system does this by default.
17
18 Signed-off-by: Colin Walters <walters@verbum.org>
19 [rydberg@euromail.se: Resolve merge conflict]
20 Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
21
22commit 6d698f6dba4a024b5f3ccac2876465c60f780478
23Author: Ross Burton <ross.burton@intel.com>
24Date: Fri Nov 15 23:41:29 2013 +0000
25
26 test: fix out-of-tree builds
27
28 Some tests do #include relative to the top-level, so add top_srcdir to the
29 include path as otherwise out-of-tree builds can't find the files.
30
31 Signed-off-by: Ross Burton <ross.burton@intel.com>
32 Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
33
1commit 25070dda4b1aaaf402db621d10fc901b82d7837734commit 25070dda4b1aaaf402db621d10fc901b82d78377
2Author: Henrik Rydberg <rydberg@euromail.se>35Author: Henrik Rydberg <rydberg@euromail.se>
3Date: Sat Aug 3 22:01:06 2013 +020036Date: Sat Aug 3 22:01:06 2013 +0200
437
=== modified file 'Makefile.in'
--- Makefile.in 2013-09-24 08:25:26 +0000
+++ Makefile.in 2014-05-22 02:14:13 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.14 from Makefile.am.1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -674,9 +674,10 @@
674 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \674 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
675 && am__cwd=`pwd` \675 && am__cwd=`pwd` \
676 && $(am__cd) $(distdir)/_build \676 && $(am__cd) $(distdir)/_build \
677 && ../configure --srcdir=.. --prefix="$$dc_install_base" \677 && ../configure \
678 $(AM_DISTCHECK_CONFIGURE_FLAGS) \678 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
679 $(DISTCHECK_CONFIGURE_FLAGS) \679 $(DISTCHECK_CONFIGURE_FLAGS) \
680 --srcdir=.. --prefix="$$dc_install_base" \
680 && $(MAKE) $(AM_MAKEFLAGS) \681 && $(MAKE) $(AM_MAKEFLAGS) \
681 && $(MAKE) $(AM_MAKEFLAGS) dvi \682 && $(MAKE) $(AM_MAKEFLAGS) dvi \
682 && $(MAKE) $(AM_MAKEFLAGS) check \683 && $(MAKE) $(AM_MAKEFLAGS) check \
683684
=== modified file 'aclocal.m4'
--- aclocal.m4 2013-09-24 08:25:26 +0000
+++ aclocal.m4 2014-05-22 02:14:13 +0000
@@ -1,4 +1,4 @@
1# generated automatically by aclocal 1.14 -*- Autoconf -*-1# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
22
3# Copyright (C) 1996-2013 Free Software Foundation, Inc.3# Copyright (C) 1996-2013 Free Software Foundation, Inc.
44
@@ -8622,7 +8622,7 @@
8622[am__api_version='1.14'8622[am__api_version='1.14'
8623dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to8623dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
8624dnl require some minimum version. Point them to the right macro.8624dnl require some minimum version. Point them to the right macro.
8625m4_if([$1], [1.14], [],8625m4_if([$1], [1.14.1], [],
8626 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl8626 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
8627])8627])
86288628
@@ -8638,7 +8638,7 @@
8638# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.8638# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
8639# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.8639# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
8640AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],8640AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
8641[AM_AUTOMAKE_VERSION([1.14])dnl8641[AM_AUTOMAKE_VERSION([1.14.1])dnl
8642m4_ifndef([AC_AUTOCONF_VERSION],8642m4_ifndef([AC_AUTOCONF_VERSION],
8643 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl8643 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
8644_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])8644_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
86458645
=== modified file 'configure'
--- configure 2013-09-24 08:25:26 +0000
+++ configure 2014-05-22 02:14:13 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.4.3# Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.5.
4#4#
5#5#
6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
587# Identity of this package.587# Identity of this package.
588PACKAGE_NAME='Multitouch Protocol Translation Library'588PACKAGE_NAME='Multitouch Protocol Translation Library'
589PACKAGE_TARNAME='mtdev'589PACKAGE_TARNAME='mtdev'
590PACKAGE_VERSION='1.1.4'590PACKAGE_VERSION='1.1.5'
591PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.4'591PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.5'
592PACKAGE_BUGREPORT=''592PACKAGE_BUGREPORT=''
593PACKAGE_URL=''593PACKAGE_URL=''
594594
@@ -1308,7 +1308,7 @@
1308 # Omit some internal or obsolete options to make the list less imposing.1308 # Omit some internal or obsolete options to make the list less imposing.
1309 # This message is too long to be a string in the A/UX 3.1 sh.1309 # This message is too long to be a string in the A/UX 3.1 sh.
1310 cat <<_ACEOF1310 cat <<_ACEOF
1311\`configure' configures Multitouch Protocol Translation Library 1.1.4 to adapt to many kinds of systems.1311\`configure' configures Multitouch Protocol Translation Library 1.1.5 to adapt to many kinds of systems.
13121312
1313Usage: $0 [OPTION]... [VAR=VALUE]...1313Usage: $0 [OPTION]... [VAR=VALUE]...
13141314
@@ -1378,7 +1378,7 @@
13781378
1379if test -n "$ac_init_help"; then1379if test -n "$ac_init_help"; then
1380 case $ac_init_help in1380 case $ac_init_help in
1381 short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.4:";;1381 short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.5:";;
1382 esac1382 esac
1383 cat <<\_ACEOF1383 cat <<\_ACEOF
13841384
@@ -1483,7 +1483,7 @@
1483test -n "$ac_init_help" && exit $ac_status1483test -n "$ac_init_help" && exit $ac_status
1484if $ac_init_version; then1484if $ac_init_version; then
1485 cat <<\_ACEOF1485 cat <<\_ACEOF
1486Multitouch Protocol Translation Library configure 1.1.41486Multitouch Protocol Translation Library configure 1.1.5
1487generated by GNU Autoconf 2.691487generated by GNU Autoconf 2.69
14881488
1489Copyright (C) 2012 Free Software Foundation, Inc.1489Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1761,7 +1761,7 @@
1761This file contains any messages produced by compilers while1761This file contains any messages produced by compilers while
1762running configure, to aid debugging if configure makes a mistake.1762running configure, to aid debugging if configure makes a mistake.
17631763
1764It was created by Multitouch Protocol Translation Library $as_me 1.1.4, which was1764It was created by Multitouch Protocol Translation Library $as_me 1.1.5, which was
1765generated by GNU Autoconf 2.69. Invocation command line was1765generated by GNU Autoconf 2.69. Invocation command line was
17661766
1767 $ $0 $@1767 $ $0 $@
@@ -2629,7 +2629,7 @@
26292629
2630# Define the identity of the package.2630# Define the identity of the package.
2631 PACKAGE='mtdev'2631 PACKAGE='mtdev'
2632 VERSION='1.1.4'2632 VERSION='1.1.5'
26332633
26342634
2635cat >>confdefs.h <<_ACEOF2635cat >>confdefs.h <<_ACEOF
@@ -12648,7 +12648,7 @@
12648# report actual input values of CONFIG_FILES etc. instead of their12648# report actual input values of CONFIG_FILES etc. instead of their
12649# values after options handling.12649# values after options handling.
12650ac_log="12650ac_log="
12651This file was extended by Multitouch Protocol Translation Library $as_me 1.1.4, which was12651This file was extended by Multitouch Protocol Translation Library $as_me 1.1.5, which was
12652generated by GNU Autoconf 2.69. Invocation command line was12652generated by GNU Autoconf 2.69. Invocation command line was
1265312653
12654 CONFIG_FILES = $CONFIG_FILES12654 CONFIG_FILES = $CONFIG_FILES
@@ -12714,7 +12714,7 @@
12714cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=112714cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
12715ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"12715ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
12716ac_cs_version="\\12716ac_cs_version="\\
12717Multitouch Protocol Translation Library config.status 1.1.412717Multitouch Protocol Translation Library config.status 1.1.5
12718configured by $0, generated by GNU Autoconf 2.69,12718configured by $0, generated by GNU Autoconf 2.69,
12719 with options \\"\$ac_cs_config\\"12719 with options \\"\$ac_cs_config\\"
1272012720
1272112721
=== modified file 'configure.ac'
--- configure.ac 2013-09-24 08:25:26 +0000
+++ configure.ac 2014-05-22 02:14:13 +0000
@@ -1,7 +1,7 @@
1# Initialize Autoconf1# Initialize Autoconf
2AC_PREREQ([2.60])2AC_PREREQ([2.60])
3AC_INIT([Multitouch Protocol Translation Library],3AC_INIT([Multitouch Protocol Translation Library],
4 [1.1.4],4 [1.1.5],
5 [],5 [],
6 [mtdev])6 [mtdev])
7AC_CONFIG_SRCDIR([Makefile.am])7AC_CONFIG_SRCDIR([Makefile.am])
88
=== modified file 'debian/changelog'
--- debian/changelog 2013-10-26 18:16:52 +0000
+++ debian/changelog 2014-05-22 02:14:13 +0000
@@ -1,3 +1,18 @@
1mtdev (1.1.5-1ubuntu1) utopic; urgency=medium
2
3 * Merge from Debian unstable. Remaining chanages:
4 - debian/libmtdev1.links: Install apport hook links.
5
6 -- Logan Rosen <logan@ubuntu.com> Wed, 21 May 2014 22:11:19 -0400
7
8mtdev (1.1.5-1) unstable; urgency=medium
9
10 * New upstream release.
11 * Update debian/control.
12 Update Standards-Version to 3.9.5.
13
14 -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Wed, 02 Apr 2014 19:46:36 +0900
15
1mtdev (1.1.4-1ubuntu1) trusty; urgency=low16mtdev (1.1.4-1ubuntu1) trusty; urgency=low
217
3 * Merge from Debian unstable. Remaining changes:18 * Merge from Debian unstable. Remaining changes:
419
=== modified file 'debian/control'
--- debian/control 2013-05-20 21:16:05 +0000
+++ debian/control 2014-05-22 02:14:13 +0000
@@ -9,7 +9,7 @@
9 quilt,9 quilt,
10 dpkg-dev (>= 1.14.17),10 dpkg-dev (>= 1.14.17),
11 dh-autoreconf (>= 7)11 dh-autoreconf (>= 7)
12Standards-Version: 3.9.412Standards-Version: 3.9.5
13Homepage: http://bitmath.org/code/mtdev/13Homepage: http://bitmath.org/code/mtdev/
14Vcs-Git: git://anonscm.debian.org/collab-maint/mtdev.git14Vcs-Git: git://anonscm.debian.org/collab-maint/mtdev.git
15Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mtdev.git15Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mtdev.git
1616
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2013-09-24 08:25:26 +0000
+++ src/Makefile.am 2014-05-22 02:14:13 +0000
@@ -18,7 +18,7 @@
1818
19AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI19AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI
2020
21AM_CPPFLAGS = -I$(top_srcdir)/include/21AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(srcdir)
2222
23libmtdevincludedir = $(includedir)23libmtdevincludedir = $(includedir)
24libmtdevinclude_HEADERS = \24libmtdevinclude_HEADERS = \
2525
=== modified file 'src/Makefile.in'
--- src/Makefile.in 2013-09-24 08:25:26 +0000
+++ src/Makefile.in 2014-05-22 02:14:13 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.14 from Makefile.am.1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -325,7 +325,7 @@
325 match_four.c325 match_four.c
326326
327AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI327AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI
328AM_CPPFLAGS = -I$(top_srcdir)/include/328AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(srcdir)
329libmtdevincludedir = $(includedir)329libmtdevincludedir = $(includedir)
330libmtdevinclude_HEADERS = \330libmtdevinclude_HEADERS = \
331 $(top_srcdir)/include/mtdev-mapping.h \331 $(top_srcdir)/include/mtdev-mapping.h \
332332
=== modified file 'test/Makefile.am'
--- test/Makefile.am 2013-09-24 08:25:26 +0000
+++ test/Makefile.am 2014-05-22 02:14:13 +0000
@@ -1,7 +1,7 @@
1noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel1noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel
2bin_PROGRAMS = mtdev-test2bin_PROGRAMS = mtdev-test
33
4AM_CPPFLAGS=-I$(top_srcdir)/include/4AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include/
55
6mtdev_mapgen_SOURCES = mtdev-mapgen.c6mtdev_mapgen_SOURCES = mtdev-mapgen.c
77
88
=== modified file 'test/Makefile.in'
--- test/Makefile.in 2013-09-24 08:25:26 +0000
+++ test/Makefile.in 2014-05-22 02:14:13 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.14 from Makefile.am.1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -298,7 +298,7 @@
298top_build_prefix = @top_build_prefix@298top_build_prefix = @top_build_prefix@
299top_builddir = @top_builddir@299top_builddir = @top_builddir@
300top_srcdir = @top_srcdir@300top_srcdir = @top_srcdir@
301AM_CPPFLAGS = -I$(top_srcdir)/include/301AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/
302mtdev_mapgen_SOURCES = mtdev-mapgen.c302mtdev_mapgen_SOURCES = mtdev-mapgen.c
303mtdev_matching_SOURCES = mtdev-matching.c303mtdev_matching_SOURCES = mtdev-matching.c
304mtdev_matching_LDFLAGS = -L$(top_builddir)/src/.libs/ -lmtdev304mtdev_matching_LDFLAGS = -L$(top_builddir)/src/.libs/ -lmtdev

Subscribers

People subscribed via source and target branches

to all changes: