diff -Nru libcli-1.9.7/debian/changelog libcli-1.9.7/debian/changelog --- libcli-1.9.7/debian/changelog 2014-02-23 15:34:23.000000000 +0000 +++ libcli-1.9.7/debian/changelog 2015-06-26 11:42:18.000000000 +0000 @@ -1,3 +1,9 @@ +libcli (1.9.7-2) unstable; urgency=low + + * Fix compilation with GCC 5. Thanks to James Cowgill. (closes: #777941) + + -- Jonathan McDowell Fri, 26 Jun 2015 12:41:28 +0100 + libcli (1.9.7-1) unstable; urgency=low * New upstream release. diff -Nru libcli-1.9.7/debian/patches/02-gcc-5.diff libcli-1.9.7/debian/patches/02-gcc-5.diff --- libcli-1.9.7/debian/patches/02-gcc-5.diff 1970-01-01 00:00:00.000000000 +0000 +++ libcli-1.9.7/debian/patches/02-gcc-5.diff 2015-06-26 11:41:09.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Fix build failure on GCC5 by using C99 __func__ +Author: James Cowgill +Bug-Debian: https://bugs.debian.org/777941 +Forwarded: https://github.com/dparrish/libcli/pull/21 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/clitest.c ++++ b/clitest.c +@@ -72,7 +72,7 @@ int winsock_init() + int cmd_test(struct cli_def *cli, const char *command, char *argv[], int argc) + { + int i; +- cli_print(cli, "called %s with \"%s\"", __FUNCTION__, command); ++ cli_print(cli, "called %s with \"%s\"", __func__, command); + cli_print(cli, "%d arguments:", argc); + for (i = 0; i < argc; i++) + cli_print(cli, " %s", argv[i]); diff -Nru libcli-1.9.7/debian/patches/series libcli-1.9.7/debian/patches/series --- libcli-1.9.7/debian/patches/series 2012-06-07 04:29:05.000000000 +0000 +++ libcli-1.9.7/debian/patches/series 2015-06-26 11:39:51.000000000 +0000 @@ -1 +1,2 @@ 01-hardening.diff +02-gcc-5.diff