diff -Nru aspell-0.60.6/debian/changelog aspell-0.60.6/debian/changelog --- aspell-0.60.6/debian/changelog 2010-03-11 07:50:34.000000000 +0530 +++ aspell-0.60.6/debian/changelog 2010-07-25 07:38:22.000000000 +0530 @@ -1,3 +1,12 @@ +aspell (0.60.6-4ubuntu1) maverick; urgency=low + + * Merge from debian unstable(LP:#609646). Remaining changes: + - Add CVS patch 11_special_chars.diff: + - Closes LP: #77414 + * Set ubuntu maintainer + + -- Bhavani Shankar Sun, 25 Jul 2010 07:37:48 +0530 + aspell (0.60.6-4) unstable; urgency=low * Bumped Standards-Version to 3.8.4, no changes necessary @@ -13,6 +22,13 @@ -- Brian Nelson Wed, 10 Mar 2010 21:18:01 -0500 +aspell (0.60.6-3ubuntu1) lucid; urgency=low + + * Added CVS patch 11_special_chars.diff: + - Closes LP: #77414 + + -- Anthony Mercatante Wed, 24 Mar 2010 16:45:08 +0100 + aspell (0.60.6-3) unstable; urgency=low * Switched to dpkg-source 3.0 (quilt) format @@ -879,3 +895,4 @@ * Initial Release. -- Sudhakar Chandrasekharan Mon, 8 Feb 1999 14:49:01 -0800 + diff -Nru aspell-0.60.6/debian/control aspell-0.60.6/debian/control --- aspell-0.60.6/debian/control 2010-01-28 21:59:15.000000000 +0530 +++ aspell-0.60.6/debian/control 2010-07-25 07:37:35.000000000 +0530 @@ -1,7 +1,8 @@ Source: aspell Section: text Priority: optional -Maintainer: Brian Nelson +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Brian Nelson Build-Depends: debhelper (>= 7), libncursesw5-dev | libncurses-dev, cdbs (>= 0.4.0), texinfo Standards-Version: 3.8.4 Homepage: http://aspell.net/ diff -Nru aspell-0.60.6/debian/patches/11_special_chars.diff aspell-0.60.6/debian/patches/11_special_chars.diff --- aspell-0.60.6/debian/patches/11_special_chars.diff 1970-01-01 05:30:00.000000000 +0530 +++ aspell-0.60.6/debian/patches/11_special_chars.diff 2010-03-24 21:14:38.000000000 +0530 @@ -0,0 +1,44 @@ +diff -Nur aspell-0.60.6/prog/check_funs.cpp aspell-0.60.6.new/prog/check_funs.cpp +--- aspell-0.60.6/prog/check_funs.cpp 2006-11-18 11:29:29.000000000 +0100 ++++ aspell-0.60.6.new/prog/check_funs.cpp 2010-03-24 16:44:12.343040048 +0100 +@@ -327,7 +327,11 @@ + wnoutrefresh(choice_w); + doupdate(); + line.resize(0); +- int c; ++#ifdef HAVE_WIDE_CURSES ++ wint_t c; ++#else ++ int c; ++#endif + noecho(); + int begin_x; + {int junk; getyx(choice_w, junk, begin_x);} +@@ -336,13 +340,12 @@ + while (true) { + handle_last_signal(); + #ifdef HAVE_WIDE_CURSES +- wint_t wi = 0; +- int res = wget_wch(choice_w, &wi); +- c = wi; ++ int res = wget_wch(choice_w, &c); ++ if (res == ERR) continue; + #else + c = wgetch(choice_w); +-#endif + if (c == ERR) continue; ++#endif + if (c == '\r' || c == '\n' || c == KEY_ENTER) + break; + if (c == control('c') || c == KEY_BREAK) { +@@ -373,7 +376,9 @@ + } else if (x < max_x && 32 <= c && c != '\x7F' && NOT_KEY /*c < 256*/) { + #ifdef HAVE_WIDE_CURSES + wchar_t wc = c; +- wins_nwstr(choice_w, &wc, 1); ++ cchar_t cc; ++ setcchar(&cc, &wc, 0, 0, NULL); ++ wins_wch(choice_w, &cc); + #else + winsch(choice_w, c); + #endif diff -Nru aspell-0.60.6/debian/patches/series aspell-0.60.6/debian/patches/series --- aspell-0.60.6/debian/patches/series 2010-01-28 22:07:13.000000000 +0530 +++ aspell-0.60.6/debian/patches/series 2010-03-25 01:46:37.000000000 +0530 @@ -5,3 +5,4 @@ 05_doc_fix.diff 07_filter.diff 10_autotools.diff +11_special_chars.diff