diff -u elvis-2.2.0/debian/control elvis-2.2.0/debian/control
--- elvis-2.2.0/debian/control
+++ elvis-2.2.0/debian/control
@@ -1,7 +1,8 @@
 Source: elvis
 Section: editors
 Priority: optional
-Maintainer: Kapil Hari Paranjape <kapil@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Kapil Hari Paranjape <kapil@debian.org>
 Build-Depends: debhelper (>> 5), quilt, libncurses5-dev, libxft-dev, libxpm-dev, libxt-dev
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/elvis/
 Homepage: http://elvis.vi-editor.org
diff -u elvis-2.2.0/debian/changelog elvis-2.2.0/debian/changelog
--- elvis-2.2.0/debian/changelog
+++ elvis-2.2.0/debian/changelog
@@ -1,3 +1,11 @@
+elvis (2.2.0-11ubuntu1) karmic; urgency=low
+
+  * Added debian/patches/gcc4.4-getline-fix to fix FTBFS (LP: #432364)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Nicolas Van Wambeke <nicolasvw@free.fr>  Fri, 18 Sep 2009 10:53:58 +0200
+
 elvis (2.2.0-11) unstable; urgency=low
 
   * debian/watch: Modify to use PASV ftp, to ignore non-unix sources
diff -u elvis-2.2.0/debian/patches/series elvis-2.2.0/debian/patches/series
--- elvis-2.2.0/debian/patches/series
+++ elvis-2.2.0/debian/patches/series
@@ -21,0 +22 @@
+gcc4.4-getline-fix
diff -u elvis-2.2.0/debian/patches/APPLY elvis-2.2.0/debian/patches/APPLY
--- elvis-2.2.0/debian/patches/APPLY
+++ elvis-2.2.0/debian/patches/APPLY
@@ -67,0 +68,3 @@
+
+    fix build with gcc4.4 due to a redefined getline in ref.c:
+gccgetline-fix
only in patch2:
unchanged:
--- elvis-2.2.0.orig/debian/patches/gcc4.4-getline-fix
+++ elvis-2.2.0/debian/patches/gcc4.4-getline-fix
@@ -0,0 +1,49 @@
+Index: elvis-2.2.0/ref.c
+===================================================================
+--- elvis-2.2.0.orig/ref.c	2009-09-18 10:52:09.000000000 +0200
++++ elvis-2.2.0/ref.c	2009-09-18 10:52:48.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+ #if USE_PROTOTYPES
+ static void usage(char *argv0);
+-static char *getline(FILE *fp);
++static char *get_line(FILE *fp);
+ static void store(char *line, char **list);
+ static LINECLS classify(char *line, LINECLS prev);
+ static void lookup(TAG *tag);
+@@ -171,7 +171,7 @@
+ /* This function reads a single line, and replaces the terminating newline with
+  * a '\0' byte.  The string will be in a static buffer.  Returns NULL at EOF.
+  */
+-static char *getline(fp)
++static char *get_line(fp)
+ 	FILE	*fp;
+ {
+ 	int	ch;
+@@ -348,7 +348,7 @@
+ 	}
+ 
+ 	/* for each line... */
+-	for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
++	for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL; lnum++)
+ 	{
+ 		/* is this the tag definition? */
+ 		if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len))
+@@ -377,7 +377,7 @@
+ 			{
+ 				if (strchr(line, '(') != NULL)
+ 				{
+-					while ((line = getline(fp)) != NULL
++					while ((line = get_line(fp)) != NULL
+ 					    && *line
+ 					    && ((*line != '#' && *line != '{')
+ 						|| line[strlen(line) - 1] == '\\'))
+@@ -387,7 +387,7 @@
+ 				}
+ 				else if ((lc = classify(line, lc)) == LC_PARTIAL)
+ 				{
+-					while ((line = getline(fp)) != NULL
++					while ((line = get_line(fp)) != NULL
+ 					    && (lc = classify(line, lc)) == LC_PARTIAL)
+ 					{
+ 						puts(line);