diff -Nru mush-7.2.5unoff2/debian/changelog mush-7.2.5unoff2/debian/changelog --- mush-7.2.5unoff2/debian/changelog 2010-02-10 19:07:28.000000000 +0530 +++ mush-7.2.5unoff2/debian/changelog 2010-02-10 19:07:28.000000000 +0530 @@ -1,3 +1,11 @@ +mush (7.2.5unoff2-25.1ubuntu1) lucid; urgency=low + + * mush7.2.5unoff2/pop.c + + Change all instances of getline to get_line according to POSIX + 2008 to fix ftbfs with GCC 4.4 LP: #519842 + + -- Bhavani Shankar Wed, 10 Feb 2010 18:48:03 +0530 + mush (7.2.5unoff2-25.1) unstable; urgency=low * Non-maintainer upload to fix pending l10n and QA issues. diff -Nru mush-7.2.5unoff2/debian/control mush-7.2.5unoff2/debian/control --- mush-7.2.5unoff2/debian/control 2010-02-10 19:07:28.000000000 +0530 +++ mush-7.2.5unoff2/debian/control 2010-02-10 19:07:28.000000000 +0530 @@ -1,7 +1,8 @@ Source: mush Section: non-free/mail Priority: extra -Maintainer: Pawel Wiecek +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Pawel Wiecek Build-Depends-Indep: perl Build-Depends: libncurses5-dev, libreadline5-dev, debhelper (>= 4.1.16) Standards-Version: 3.6.2 diff -Nru mush-7.2.5unoff2/debian/control.real mush-7.2.5unoff2/debian/control.real --- mush-7.2.5unoff2/debian/control.real 2010-02-10 19:07:28.000000000 +0530 +++ mush-7.2.5unoff2/debian/control.real 2010-02-10 19:07:28.000000000 +0530 @@ -1,7 +1,8 @@ Source: mush Section: non-free/mail Priority: extra -Maintainer: Pawel Wiecek +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Pawel Wiecek Build-Depends-Indep: debhelper (>= 4.1.16), perl Build-Depends: libncurses5-dev, libreadline5-dev Standards-Version: 3.6.1 diff -Nru mush-7.2.5unoff2/pop.c mush-7.2.5unoff2/pop.c --- mush-7.2.5unoff2/pop.c 2010-02-10 19:07:28.000000000 +0530 +++ mush-7.2.5unoff2/pop.c 2010-02-10 19:07:28.000000000 +0530 @@ -67,7 +67,7 @@ extern int h_errno; static int socket_connection(); -static char *getline(); +static char *get_line(); static int sendline(); static int fullwrite(); static int getok(); @@ -271,7 +271,7 @@ { char *fromserver; - if (sendline(server, "STAT") || (!(fromserver = getline(server)))) + if (sendline(server, "STAT") || (!(fromserver = get_line(server)))) return (-1); if (strncmp(fromserver, "+OK ", 4)) { @@ -343,7 +343,7 @@ free((char *) *sizes); return (-1); } - if (!(fromserver = getline(server))) { + if (!(fromserver = get_line(server))) { free((char *) *IDs); free((char *) *sizes); return (-1); @@ -379,7 +379,7 @@ return (-1); } for (i = 0; i < how_many; i++) { - if (!(fromserver = getline(server))) { + if (!(fromserver = get_line(server))) { free((char *) *IDs); free((char *) *sizes); return (-1); @@ -447,7 +447,7 @@ *cp = '\0'; while (1) { - char *fromserver = getline(server); + char *fromserver = get_line(server); int size; if (!fromserver) { @@ -540,7 +540,7 @@ if (sendline(server, "LAST")) return (-1); - if (!(fromserver = getline(server))) + if (!(fromserver = get_line(server))) return (-1); if (!strncmp(fromserver, "-ERR", 4)) { @@ -757,7 +757,7 @@ * Side effects: Closes the connection on error. */ static char * -getline(server) +get_line(server) PopServer server; { #define GETLINE_ERROR "Error reading from server: " @@ -910,7 +910,7 @@ { char *fromline; - if (!(fromline = getline(server))) { + if (!(fromline = get_line(server))) { return (-1); } if (!strncmp(fromline, "+OK", 3)) @@ -944,7 +944,7 @@ { char *fromserver; - fromserver = getline(server); + fromserver = get_line(server); if (!fromserver) return (-1);