Package: elvis Version: 2.2.0-6 Severity: normal Tags: patch Hi,
Attached is the diff for my elvis 2.2.0-6.1 NMU.
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 @@ -19,0 +20 @@ +ft2-nameclash-fix -p0 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-6.1) unstable; urgency=low + + * Non-maintainer upload. + * patches/ft2-nameclash-fix: prevent a name clash with freetype2 by renaming + an enum member. Closes: 370687. + + -- Thomas Girard <[EMAIL PROTECTED]> Sat, 10 Jun 2006 13:49:38 +0200 + elvis (2.2.0-6) unstable; urgency=low * debian/patches: switched to "quilt". only in patch2: unchanged: --- elvis-2.2.0.orig/debian/patches/ft2-nameclash-fix +++ elvis-2.2.0/debian/patches/ft2-nameclash-fix @@ -0,0 +1,59 @@ +--- guix11/xdialog.c 2003-10-21 04:32:26.000000000 +0200 ++++ guix11/xdialog.c.debian 2006-06-10 13:36:00.890191000 +0200 +@@ -387,7 +387,7 @@ + case 'o': ft = FT_ONEOF, limit = scan; break; + case 'n': ft = FT_NUMBER, limit = scan; break; + case 's': ft = FT_STRING; break; +- case 'f': ft = FT_FILE; break; ++ case 'f': ft = FT_FILE_; break; + case 'l': ft = FT_LOCKED; break; + } + +@@ -556,7 +556,7 @@ + break; + + case FT_STRING: +- case FT_FILE: ++ case FT_FILE_: + button = addbutton(dia, "<", 'l', ELVCTRL('L')); + button->y = dia->y0 + dia->rowh * i; + button->x = dia->x0 + 3; +@@ -1111,7 +1111,7 @@ + newvalue = keystring(dia, key); + break; + +- case FT_FILE: ++ case FT_FILE_: + #ifdef FEATURE_COMPLETE + if (key == '\t') + { +@@ -1179,7 +1179,7 @@ + switch (dia->field[row].ft) + { + case FT_STRING: +- case FT_FILE: ++ case FT_FILE_: + case FT_NUMBER: + case FT_LOCKED: + drawtext(dia, row); +@@ -1207,7 +1207,7 @@ + break; + + case FT_STRING: +- case FT_FILE: ++ case FT_FILE_: + if (button->shape == 'l') + if (row == dia->current + ? dia->shift > 0 +diff -ru elvis-2.2_0/guix11/xdialog.h elvis-2.2.0+/guix11/xdialog.h +--- guix11/xdialog.h 2003-10-21 04:32:26.000000000 +0200 ++++ guix11/xdialog.h.debian 2006-06-10 13:35:46.241275500 +0200 +@@ -5,7 +5,7 @@ + FT_ONEOF, /* one of a preset list; includes boolean */ + FT_NUMBER, /* numeric field */ + FT_STRING, /* string field */ +- FT_FILE, /* string field where <Tab> does filename completion */ ++ FT_FILE_, /* string field where <Tab> does filename completion */ + FT_LOCKED /* non-editable field */ + } X_FIELDTYPE; + typedef struct