Merge lp:~townsend/nux/fix-lcov-version into lp:nux

[Christopher Townsend]

Need to add version 1.10 of lcov to the supported versions so the Debian package build can succeed.

Need to add version 1.10 of lcov to the supported versions so the Debian package build can succeed.

This is blocking Nux CI right now.

[Eleni Maria Stea (hikiko)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:832
http://jenkins.qa.ubuntu.com/job/nux-ci/98/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-trusty-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-trusty-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/98/rebuild

review: Approve (continuous-integration)

[lp:~townsend/nux/fix-lcov-version]

832. By Christopher Townsend on 2013-12-19

Need to add version 1.10 of lcov to the supported versions so the Debian package build can succeed.

Approved by PS Jenkins bot, Eleni Maria Stea.

=== modified file 'm4/gcov.m4'
--- m4/gcov.m4	2012-12-04 19:36:00 +0000
+++ m4/gcov.m4	2013-12-19 15:43:06 +0000
@@ -33,7 +33,7 @@
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
 
-  lcov_version_list="1.6 1.7 1.8 1.9"
+  lcov_version_list="1.6 1.7 1.8 1.9 1.10"
   AC_CHECK_PROG(LCOV, lcov, lcov)
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)