tags 424107 + patch pending
thanks

Hi,

The following is the diff for my aspell 0.60.5-2.1 NMU.

Kind regards

T.

diff -u aspell-0.60.5/debian/patches/10_autotools.dpatch 
aspell-0.60.5/debian/patches/10_autotools.dpatch
--- aspell-0.60.5/debian/patches/10_autotools.dpatch
+++ aspell-0.60.5/debian/patches/10_autotools.dpatch
@@ -3120,164 +3120,6 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urNad aspell-0.60.5~/gen/settings.h.in~ aspell-0.60.5/gen/settings.h.in~
---- aspell-0.60.5~/gen/settings.h.in~  1969-12-31 19:00:00.000000000 -0500
-+++ aspell-0.60.5/gen/settings.h.in~   2005-10-20 22:58:42.000000000 -0400
-@@ -0,0 +1,154 @@
-+/* gen/settings.h.in.  Generated from configure.ac by autoheader.  */
-+
-+#ifndef ASPELL_SETTINGS__H
-+#define ASPELL_SETTINGS__H
-+
-+/* Defined if filters should be compiled in */
-+#undef COMPILE_IN_FILTER
-+
-+/* Defined to curses header file */
-+#undef CURSES_HEADER
-+
-+/* Defined if no special Workarounds are needed for Curses headers */
-+#undef CURSES_INCLUDE_STANDARD
-+
-+/* Defined if special Wordaround I is need for Curses headers */
-+#undef CURSES_INCLUDE_WORKAROUND_1
-+
-+/* Defined if curses like POSIX Functions should be used */
-+#undef CURSES_ONLY
-+
-+/* Defined if _XOPEN_SOURCE_EXTENDED needs to be defined. (Can't define
-+   globally as that will cause problems with some systems) */
-+#undef DEFINE_XOPEN_SOURCE_EXTENDED
-+
-+/* Define to 1 if translation of program messages to the user's native
-+   language is requested. */
-+#undef ENABLE_NLS
-+
-+/* Defined if win32 relocation should be used */
-+#undef ENABLE_WIN32_RELOCATABLE
-+
-+/* Defined if filter version control should be used */
-+#undef FILTER_VERSION_CONTROL
-+
-+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-+   CoreFoundation framework. */
-+#undef HAVE_CFLOCALECOPYCURRENT
-+
-+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-+   the CoreFoundation framework. */
-+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-+
-+/* Define if the GNU dcgettext() function is already present or preinstalled.
-+   */
-+#undef HAVE_DCGETTEXT
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Defined if msdos getch is supported */
-+#undef HAVE_GETCH
-+
-+/* Define if the GNU gettext() function is already present or preinstalled. */
-+#undef HAVE_GETTEXT
-+
-+/* Define if you have the iconv() function. */
-+#undef HAVE_ICONV
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-+#undef HAVE_LANGINFO_CODESET
-+
-+/* Defined if the curses library is available */
-+#undef HAVE_LIBCURSES
-+
-+/* Define to 1 if you have the `dl' library (-ldl). */
-+#undef HAVE_LIBDL
-+
-+/* Defined if mblen is supported */
-+#undef HAVE_MBLEN
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Defined if mmap and friends is supported */
-+#undef HAVE_MMAP
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Defined if curses libraray includes wide character support */
-+#undef HAVE_WIDE_CURSES
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Defined if Posix Termios is Supported */
-+#undef POSIX_TERMIOS
-+
-+/* Defined if STL rel_ops pollute the global namespace */
-+#undef REL_OPS_POLLUTION
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Defined if file ino is supported */
-+#undef USE_FILE_INO
-+
-+/* Defined if file locking and truncating is supported */
-+#undef USE_FILE_LOCKS
-+
-+/* Defined if Posix locales are supported */
-+#undef USE_LOCALE
-+
-+/* Defined if Posix mutexes are supported */
-+#undef USE_POSIX_MUTEX
-+
-+/* Defined if Posix regex are supported */
-+#undef USE_POSIX_REGEX
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+#define C_EXPORT extern "C"
-+
-+#endif /* ASPELL_SETTINGS__H */
 diff -urNad aspell-0.60.5~/install-sh aspell-0.60.5/install-sh
 --- aspell-0.60.5~/install-sh  2007-02-17 20:11:08.000000000 -0500
 +++ aspell-0.60.5/install-sh   2007-02-17 20:29:33.000000000 -0500
@@ -4510,1035 +4352,6 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urNad aspell-0.60.5~/manual/texinfo.tex aspell-0.60.5/manual/texinfo.tex
---- aspell-0.60.5~/manual/texinfo.tex  2007-02-17 20:11:08.000000000 -0500
-+++ aspell-0.60.5/manual/texinfo.tex   2007-02-17 20:29:34.000000000 -0500
-@@ -3,11 +3,11 @@
- % Load plain if necessary, i.e., if running under initex.
- \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
- %
--\def\texinfoversion{2006-10-04.17}
-+\def\texinfoversion{2005-07-05.19}
- %
- % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
--% Software Foundation, Inc.
-+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-+% Foundation, Inc.
- %
- % This texinfo.tex file is free software; you can redistribute it and/or
- % modify it under the terms of the GNU General Public License as
-@@ -153,22 +153,28 @@
- \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
- \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
- 
--% Since the category of space is not known, we have to be careful.
--\chardef\spacecat = 10
--\def\spaceisspace{\catcode`\ =\spacecat}
--
--% sometimes characters are active, so we need control sequences.
-+% In some macros, we cannot use the `\? notation---the left quote is
-+% in some cases the escape char.
-+\chardef\backChar  = `\\
- \chardef\colonChar = `\:
- \chardef\commaChar = `\,
--\chardef\dashChar  = `\-
- \chardef\dotChar   = `\.
- \chardef\exclamChar= `\!
--\chardef\lquoteChar= `\`
-+\chardef\plusChar  = `\+
- \chardef\questChar = `\?
--\chardef\rquoteChar= `\'
- \chardef\semiChar  = `\;
- \chardef\underChar = `\_
- 
-+\chardef\spaceChar = `\ %
-+\chardef\spacecat = 10
-+\def\spaceisspace{\catcode\spaceChar=\spacecat}
-+
-+{% for help with debugging.
-+ % example usage: \expandafter\show\activebackslash
-+ \catcode`\! = 0 \catcode`\\ = \active
-+ !global!def!activebackslash{\}
-+}
-+
- % Ignore a token.
- %
- \def\gobble#1{}
-@@ -305,13 +311,6 @@
-     % before the \shipout runs.
-     %
-     \indexdummies         % don't expand commands in the output.
--    \normalturnoffactive  % \ in index entries must not stay \, e.g., if
--               % the page break happens to be in the middle of an example.
--               % We don't want .vr (or whatever) entries like this:
--               % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
--               % "\acronym" won't work when it's read back in;
--               % it needs to be 
--               % {\code {{\tt \backslashcurfont }acronym}
-     \shipout\vbox{%
-       % Do this early so pdf references go to the beginning of the page.
-       \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
-@@ -339,9 +338,9 @@
-       \pagebody{#1}%
-       \ifdim\ht\footlinebox > 0pt
-         % Only leave this space if the footline is nonempty.
--        % (We lessened \vsize for it in \oddfootingyyy.)
-+        % (We lessened \vsize for it in \oddfootingxxx.)
-         % The \baselineskip=24pt in plain's \makefootline has no effect.
--        \vskip 24pt
-+        \vskip 2\baselineskip
-         \unvbox\footlinebox
-       \fi
-       %
-@@ -397,7 +396,7 @@
- %
- \def\parsearg{\parseargusing{}}
- \def\parseargusing#1#2{%
--  \def\argtorun{#2}%
-+  \def\next{#2}%
-   \begingroup
-     \obeylines
-     \spaceisspace
-@@ -428,7 +427,8 @@
- \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
-   \def\temp{#3}%
-   \ifx\temp\empty
--    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
-+    % We cannot use \next here, as it holds the macro to run;
-+    % thus we reuse \temp.
-     \let\temp\finishparsearg
-   \else
-     \let\temp\argcheckspaces
-@@ -440,14 +440,14 @@
- % If a _delimited_ argument is enclosed in braces, they get stripped; so
- % to get _exactly_ the rest of the line, we had to prevent such situation.
- % We prepended an \empty token at the very beginning and we expand it now,
--% just before passing the control to \argtorun.
-+% just before passing the control to \next.
- % (Similarily, we have to think about #3 of \argcheckspacesY above: it is
- % either the null string, or it ends with \^^M---thus there is no danger
- % that a pair of braces would be stripped.
- %
- % But first, we have to remove the trailing space token.
- %
--\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
-+\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
- 
- % \parseargdef\foo{...}
- %     is roughly equivalent to
-@@ -1051,9 +1051,9 @@
- % _ active, and distinguish by seeing if the current family is \slfam,
- % which is what @var uses.
- {
--  \catcode`\_ = \active
-+  \catcode\underChar = \active
-   \gdef\mathunderscore{%
--    \catcode`\_=\active
-+    \catcode\underChar=\active
-     \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-   }
- }
-@@ -1096,24 +1096,15 @@
- \def\minus{$-$}
- 
- % @dots{} outputs an ellipsis using the current font.
--% We do .5em per period so that it has the same spacing in the cm
--% typewriter fonts as three actual period characters; on the other hand,
--% in other typewriter fonts three periods are wider than 1.5em.  So do
--% whichever is larger.
-+% We do .5em per period so that it has the same spacing in a typewriter
-+% font as three actual period characters.
- %
- \def\dots{%
-   \leavevmode
--  \setbox0=\hbox{...}% get width of three periods
--  \ifdim\wd0 > 1.5em
--    \dimen0 = \wd0
--  \else
--    \dimen0 = 1.5em
--  \fi
--  \hbox to \dimen0{%
--    \hskip 0pt plus.25fil
--    .\hskip 0pt plus1fil
--    .\hskip 0pt plus1fil
--    .\hskip 0pt plus.5fil
-+  \hbox to 1.5em{%
-+    \hskip 0pt plus 0.25fil
-+    .\hfil.\hfil.%
-+    \hskip 0pt plus 0.5fil
-   }%
- }
- 
-@@ -1206,20 +1197,21 @@
-   \fi
- \fi
- 
--% PDF uses PostScript string constants for the names of xref targets,
-+% PDF uses PostScript string constants for the names of xref targets, to
- % for display in the outlines, and in other places.  Thus, we have to
- % double any backslashes.  Otherwise, a name like "\node" will be
- % interpreted as a newline (\n), followed by o, d, e.  Not good.
- % http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
- % (and related messages, the final outcome is that it is up to the TeX
- % user to double the backslashes and otherwise make the string valid, so
--% that's what we do).
-+% that's we do).
- 
- % double active backslashes.
- % 
- [EMAIL PROTECTED] \catcode`\\=\active
-+ @[EMAIL PROTECTED]@[EMAIL PROTECTED]@active @otherbackslash}
-  @[EMAIL PROTECTED]
--   @[EMAIL PROTECTED]@active
-+   @[EMAIL PROTECTED]@active
-    @[EMAIL PROTECTED]
- }
- 
-@@ -1251,17 +1243,21 @@
- \def\backslashparens#1{%
-   \xdef#1{#1}% redefine it as its expansion; the definition is simply
-              % \lastnode when called from \setref -> \pdfmkdest.
--  \HyPsdSubst{(}{\realbackslash(}{#1}%
--  \HyPsdSubst{)}{\realbackslash)}{#1}%
-+  \HyPsdSubst{(}{\backslashlparen}{#1}%
-+  \HyPsdSubst{)}{\backslashrparen}{#1}%
-+}
-+
-+{\catcode\exclamChar = 0 \catcode\backChar = \other
-+ !gdef!backslashlparen{\(}%
-+ !gdef!backslashrparen{\)}%
- }
- 
- \ifpdf
-   \input pdfcolor
-   \pdfcatalog{/PageMode /UseOutlines}%
--  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
-   \def\dopdfimage#1#2#3{%
--    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
--    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
-+    \def\imagewidth{#2}%
-+    \def\imageheight{#3}%
-     % without \immediate, pdftex seg faults when the same image is
-     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
-     \ifnum\pdftexversion < 14
-@@ -1269,8 +1265,8 @@
-     \else
-       \immediate\pdfximage
-     \fi
--      \ifdim \wd0 >0pt width \imagewidth \fi
--      \ifdim \wd2 >0pt height \imageheight \fi
-+      \ifx\empty\imagewidth\else width \imagewidth \fi
-+      \ifx\empty\imageheight\else height \imageheight \fi
-       \ifnum\pdftexversion<13
-          #1.pdf%
-        \else
-@@ -1394,7 +1390,7 @@
-       % now, I guess we'll just let the pdf reader have its way.
-       \indexnofonts
-       \setupdatafile
--      \catcode`\\=\active \otherbackslash
-+      \activebackslash
-       \input \jobname.toc
-     \endgroup
-   }
-@@ -1413,17 +1409,9 @@
-   \else
-     \let \startlink \pdfstartlink
-   \fi
--  % make a live url in pdf output.
-   \def\pdfurl#1{%
-     \begingroup
--      % it seems we really need yet another set of dummies; have not
--      % tried to figure out what each command should do in the context
--      % of @url.  for now, just make @/ a no-op, that's the only one
--      % people have actually reported a problem with.
--      % 
--      \normalturnoffactive
--      [EMAIL PROTECTED]@}%
--      \let\/=\empty
-+      [EMAIL PROTECTED]@}%
-       \makevalueexpandable
-       \leavevmode\Red
-       \startlink attr{/Border [0 0 0]}%
-@@ -1493,7 +1481,6 @@
- % We don't need math for this font style.
- \def\ttsl{\setfontstyle{ttsl}}
- 
--
- % Default leading.
- \newdimen\textleading  \textleading = 13.2pt
- 
-@@ -1515,13 +1502,11 @@
-   }%
- }
- 
--
- % Set the font macro #1 to the font named #2, adding on the
- % specified font prefix (normally `cm').
- % #3 is the font's design size, #4 is a scale factor
- \def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
- 
--
- % Use cm as the default font prefix.
- % To specify the font prefix, you must define \fontprefix
- % before you read in texinfo.tex.
-@@ -1545,10 +1530,6 @@
- \def\scshape{csc}
- \def\scbshape{csc}
- 
--% Definitions for a main text size of 11pt.  This is the default in
--% Texinfo.
--% 
--\def\definetextfontsizexi{
- % Text fonts (11.2pt, magstep1).
- \def\textnominalsize{11pt}
- \edef\mainmagstep{\magstephalf}
-@@ -1662,165 +1643,6 @@
- \font\reducedi=cmmi10
- \font\reducedsy=cmsy10
- 
--% reset the current fonts
--\textfonts
--\rm
--} % end of 11pt text font size definitions
--
--
--% Definitions to make the main text be 10pt Computer Modern, with
--% section, chapter, etc., sizes following suit.  This is for the GNU
--% Press printing of the Emacs 22 manual.  Maybe other manuals in the
--% future.  Used with @smallbook, which sets the leading to 12pt.
--% 
--\def\definetextfontsizex{%
--% Text fonts (10pt).
--\def\textnominalsize{10pt}
--\edef\mainmagstep{1000}
--\setfont\textrm\rmshape{10}{\mainmagstep}
--\setfont\texttt\ttshape{10}{\mainmagstep}
--\setfont\textbf\bfshape{10}{\mainmagstep}
--\setfont\textit\itshape{10}{\mainmagstep}
--\setfont\textsl\slshape{10}{\mainmagstep}
--\setfont\textsf\sfshape{10}{\mainmagstep}
--\setfont\textsc\scshape{10}{\mainmagstep}
--\setfont\textttsl\ttslshape{10}{\mainmagstep}
--\font\texti=cmmi10 scaled \mainmagstep
--\font\textsy=cmsy10 scaled \mainmagstep
--
--% A few fonts for @defun names and args.
--\setfont\defbf\bfshape{10}{\magstephalf}
--\setfont\deftt\ttshape{10}{\magstephalf}
--\setfont\defttsl\ttslshape{10}{\magstephalf}
--\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
--
--% Fonts for indices, footnotes, small examples (9pt).
--\def\smallnominalsize{9pt}
--\setfont\smallrm\rmshape{9}{1000}
--\setfont\smalltt\ttshape{9}{1000}
--\setfont\smallbf\bfshape{10}{900}
--\setfont\smallit\itshape{9}{1000}
--\setfont\smallsl\slshape{9}{1000}
--\setfont\smallsf\sfshape{9}{1000}
--\setfont\smallsc\scshape{10}{900}
--\setfont\smallttsl\ttslshape{10}{900}
--\font\smalli=cmmi9
--\font\smallsy=cmsy9
--
--% Fonts for small examples (8pt).
--\def\smallernominalsize{8pt}
--\setfont\smallerrm\rmshape{8}{1000}
--\setfont\smallertt\ttshape{8}{1000}
--\setfont\smallerbf\bfshape{10}{800}
--\setfont\smallerit\itshape{8}{1000}
--\setfont\smallersl\slshape{8}{1000}
--\setfont\smallersf\sfshape{8}{1000}
--\setfont\smallersc\scshape{10}{800}
--\setfont\smallerttsl\ttslshape{10}{800}
--\font\smalleri=cmmi8
--\font\smallersy=cmsy8
--
--% Fonts for title page (20.4pt):
--\def\titlenominalsize{20pt}
--\setfont\titlerm\rmbshape{12}{\magstep3}
--\setfont\titleit\itbshape{10}{\magstep4}
--\setfont\titlesl\slbshape{10}{\magstep4}
--\setfont\titlett\ttbshape{12}{\magstep3}
--\setfont\titlettsl\ttslshape{10}{\magstep4}
--\setfont\titlesf\sfbshape{17}{\magstep1}
--\let\titlebf=\titlerm
--\setfont\titlesc\scbshape{10}{\magstep4}
--\font\titlei=cmmi12 scaled \magstep3
--\font\titlesy=cmsy10 scaled \magstep4
--\def\authorrm{\secrm}
--\def\authortt{\sectt}
--
--% Chapter fonts (14.4pt).
--\def\chapnominalsize{14pt}
--\setfont\chaprm\rmbshape{12}{\magstep1}
--\setfont\chapit\itbshape{10}{\magstep2}
--\setfont\chapsl\slbshape{10}{\magstep2}
--\setfont\chaptt\ttbshape{12}{\magstep1}
--\setfont\chapttsl\ttslshape{10}{\magstep2}
--\setfont\chapsf\sfbshape{12}{\magstep1}
--\let\chapbf\chaprm
--\setfont\chapsc\scbshape{10}{\magstep2}
--\font\chapi=cmmi12 scaled \magstep1
--\font\chapsy=cmsy10 scaled \magstep2
--
--% Section fonts (12pt).
--\def\secnominalsize{12pt}
--\setfont\secrm\rmbshape{12}{1000}
--\setfont\secit\itbshape{10}{\magstep1}
--\setfont\secsl\slbshape{10}{\magstep1}
--\setfont\sectt\ttbshape{12}{1000}
--\setfont\secttsl\ttslshape{10}{\magstep1}
--\setfont\secsf\sfbshape{12}{1000}
--\let\secbf\secrm
--\setfont\secsc\scbshape{10}{\magstep1}
--\font\seci=cmmi12 
--\font\secsy=cmsy10 scaled \magstep1
--
--% Subsection fonts (10pt).
--\def\ssecnominalsize{10pt}
--\setfont\ssecrm\rmbshape{10}{1000}
--\setfont\ssecit\itbshape{10}{1000}
--\setfont\ssecsl\slbshape{10}{1000}
--\setfont\ssectt\ttbshape{10}{1000}
--\setfont\ssecttsl\ttslshape{10}{1000}
--\setfont\ssecsf\sfbshape{10}{1000}
--\let\ssecbf\ssecrm
--\setfont\ssecsc\scbshape{10}{1000}
--\font\sseci=cmmi10
--\font\ssecsy=cmsy10
--
--% Reduced fonts for @acro in text (9pt).
--\def\reducednominalsize{9pt}
--\setfont\reducedrm\rmshape{9}{1000}
--\setfont\reducedtt\ttshape{9}{1000}
--\setfont\reducedbf\bfshape{10}{900}
--\setfont\reducedit\itshape{9}{1000}
--\setfont\reducedsl\slshape{9}{1000}
--\setfont\reducedsf\sfshape{9}{1000}
--\setfont\reducedsc\scshape{10}{900}
--\setfont\reducedttsl\ttslshape{10}{900}
--\font\reducedi=cmmi9
--\font\reducedsy=cmsy9
--
--% reduce space between paragraphs
--\divide\parskip by 2
--
--% reset the current fonts
--\textfonts
--\rm
--} % end of 10pt text font size definitions
--
--
--% We provide the user-level command
--%   @fonttextsize 10
--% (or 11) to redefine the text font size.  pt is assumed.
--% 
--\def\xword{10}
--\def\xiword{11}
--%
--\parseargdef\fonttextsize{%
--  \def\textsizearg{#1}%
--  \wlog{doing @fonttextsize \textsizearg}%
--  %
--  % Set \globaldefs so that documents can use this inside @tex, since
--  % makeinfo 4.8 does not support it, but we need it nonetheless.
--  % 
-- \begingroup \globaldefs=1
--  \ifx\textsizearg\xword \definetextfontsizex
--  \else \ifx\textsizearg\xiword \definetextfontsizexi
--  \else
--    \errhelp=\EMsimple
--    [EMAIL PROTECTED] only supports `10' or `11', not `\textsizearg'}
--  \fi\fi
-- \endgroup
--}
--
--
- % In order for the font changes to affect most math symbols and letters,
- % we have to define the \textfont of the standard families.  Since
- % texinfo doesn't allow for producing subscripts and superscripts except
-@@ -1931,7 +1753,7 @@
- 
- % Set up the default fonts, so we can use them for creating boxes.
- %
--\definetextfontsizexi
-+\textfonts \rm
- 
- % Define these so they can be easily changed for other fonts.
- \def\angleleft{$\langle$}
-@@ -2056,14 +1878,11 @@
- % and arrange explicitly to hyphenate at a dash.
- %  -- rms.
- {
--  \catcode`\-=\active \catcode`\_=\active
--  \catcode`\'=\active \catcode`\`=\active
-+  \catcode`\-=\active
-+  \catcode`\_=\active
-   %
-   \global\def\code{\begingroup
--    \catcode\rquoteChar=\active \catcode\lquoteChar=\active
--    \let'\codequoteright \let`\codequoteleft
--    %
--    \catcode\dashChar=\active  \catcode\underChar=\active
-+    \catcode`\-=\active  \catcode`\_=\active
-     \ifallowcodebreaks
-      \let-\codedash
-      \let_\codeunder
-@@ -2309,10 +2128,6 @@
-     }$%
- }
- 
--% @textdegree - the normal degrees sign.
--%
--\def\textdegree{$^\circ$}
--
- % Laurent Siebenmann reports \Orb undefined with:
- %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
- % so we'll define it if necessary.
-@@ -2484,8 +2299,8 @@
-   %
-   % Leave some space for the footline.  Hopefully ok to assume
-   % @evenfooting will not be used by itself.
--  \global\advance\pageheight by -12pt
--  \global\advance\vsize by -12pt
-+  \global\advance\pageheight by -\baselineskip
-+  \global\advance\vsize by -\baselineskip
- }
- 
- \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
-@@ -3144,7 +2959,6 @@
- 
- \def\doignore#1{\begingroup
-   % Scan in ``verbatim'' mode:
--  \obeylines
-   \catcode`\@ = \other
-   \catcode`\{ = \other
-   \catcode`\} = \other
-@@ -3165,16 +2979,16 @@
-   \gdef\dodoignore#1{%
-     % #1 contains the command name as a string, e.g., `ifinfo'.
-     %
--    % Define a command to find the next [EMAIL PROTECTED] #1'.
--    [EMAIL PROTECTED] #1{%
--      [EMAIL PROTECTED]
--    %
-+    % Define a command to find the next [EMAIL PROTECTED] #1', which must be 
on a line
-+    % by itself.
-+    [EMAIL PROTECTED] [EMAIL PROTECTED]
-     % And this command to find another #1 command, at the beginning of a
-     % line.  (Otherwise, we would consider a line [EMAIL PROTECTED] @ifset', 
for
-     % example, to count as an @ifset for nesting.)
-     [EMAIL PROTECTED]
-     %
-     % And now expand that command.
-+    \obeylines %
-     \doignoretext ^^M%
-   }%
- }
-@@ -3204,12 +3018,7 @@
- }
- 
- % Finish off ignored text.
--{ \obeylines%
--  % Ignore anything after the last [EMAIL PROTECTED] #1'; this matters in 
verbatim
--  % environments, where otherwise the newline after an ignored conditional
--  % would result in a blank line in the output.
--  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
--}
-+\def\enddoignore{\endgroup\ignorespaces}
- 
- 
- % @set VAR sets the variable VAR to an empty value.
-@@ -3412,39 +3221,12 @@
-   \escapechar = `\\     % use backslash in output files.
-   [EMAIL PROTECTED]@}% change to @@ when we switch to @ as escape char in 
index files.
-   \def\ {\realbackslash\space }%
--  %
-   % Need these in case \tex is in effect and \{ is a \delimiter again.
-   % But can't use \lbracecmd and \rbracecmd because texindex assumes
-   % braces and backslashes are used only as delimiters.
-   \let\{ = \mylbrace
-   \let\} = \myrbrace
-   %
--  % I don't entirely understand this, but when an index entry is
--  % generated from a macro call, the \endinput which \scanmacro inserts
--  % causes processing to be prematurely terminated.  This is,
--  % apparently, because \indexsorttmp is fully expanded, and \endinput
--  % is an expandable command.  The redefinition below makes \endinput
--  % disappear altogether for that purpose -- although logging shows that
--  % processing continues to some further point.  On the other hand, it
--  % seems \endinput does not hurt in the printed index arg, since that
--  % is still getting written without apparent harm.
--  % 
--  % Sample source (mac-idx3.tex, reported by Graham Percival to
--  % help-texinfo, 22may06):
--  % @macro funindex {WORD}
--  % @findex xyz
--  % @end macro
--  % ...
--  % @funindex commtest
--  % 
--  % The above is not enough to reproduce the bug, but it gives the flavor.
--  % 
--  % Sample whatsit resulting:
--  % [EMAIL PROTECTED]@folio [EMAIL PROTECTED] [EMAIL PROTECTED] }}}
--  % 
--  % So:
--  \let\endinput = \empty
--  %
-   % Do the redefinitions.
-   \commondummies
- }
-@@ -3462,7 +3244,6 @@
-   %
-   % Do the redefinitions.
-   \commondummies
--  \otherbackslash
- }
- 
- % Called from \indexdummies and \atdummies.
-@@ -3536,7 +3317,6 @@
-   \definedummyword\point
-   \definedummyword\print
-   \definedummyword\result
--  \definedummyword\textdegree
-   %
-   % We want to disable all macros so that they are not expanded by \write.
-   \macrolist
-@@ -3550,62 +3330,63 @@
- 
- % \commondummiesnofonts: common to \commondummies and \indexnofonts.
- %
--\def\commondummiesnofonts{%
--  % Control letters and accents.
--  \definedummyletter\!%
--  \definedummyaccent\"%
--  \definedummyaccent\'%
--  \definedummyletter\*%
--  \definedummyaccent\,%
--  \definedummyletter\.%
--  \definedummyletter\/%
--  \definedummyletter\:%
--  \definedummyaccent\=%
--  \definedummyletter\?%
--  \definedummyaccent\^%
--  \definedummyaccent\`%
--  \definedummyaccent\~%
--  \definedummyword\u
--  \definedummyword\v
--  \definedummyword\H
--  \definedummyword\dotaccent
--  \definedummyword\ringaccent
--  \definedummyword\tieaccent
--  \definedummyword\ubaraccent
--  \definedummyword\udotaccent
--  \definedummyword\dotless
--  %
--  % Texinfo font commands.
--  \definedummyword\b
--  \definedummyword\i
--  \definedummyword\r
--  \definedummyword\sc
--  \definedummyword\t
--  %
--  % Commands that take arguments.
--  \definedummyword\acronym
--  \definedummyword\cite
--  \definedummyword\code
--  \definedummyword\command
--  \definedummyword\dfn
--  \definedummyword\emph
--  \definedummyword\env
--  \definedummyword\file
--  \definedummyword\kbd
--  \definedummyword\key
--  \definedummyword\math
--  \definedummyword\option
--  \definedummyword\pxref
--  \definedummyword\ref
--  \definedummyword\samp
--  \definedummyword\strong
--  \definedummyword\tie
--  \definedummyword\uref
--  \definedummyword\url
--  \definedummyword\var
--  \definedummyword\verb
--  \definedummyword\w
--  \definedummyword\xref
-+% Better have this without active chars.
-+{
-+  \catcode`\~=\other
-+  \gdef\commondummiesnofonts{%
-+    % Control letters and accents.
-+    \definedummyletter\!%
-+    \definedummyaccent\"%
-+    \definedummyaccent\'%
-+    \definedummyletter\*%
-+    \definedummyaccent\,%
-+    \definedummyletter\.%
-+    \definedummyletter\/%
-+    \definedummyletter\:%
-+    \definedummyaccent\=%
-+    \definedummyletter\?%
-+    \definedummyaccent\^%
-+    \definedummyaccent\`%
-+    \definedummyaccent\~%
-+    \definedummyword\u
-+    \definedummyword\v
-+    \definedummyword\H
-+    \definedummyword\dotaccent
-+    \definedummyword\ringaccent
-+    \definedummyword\tieaccent
-+    \definedummyword\ubaraccent
-+    \definedummyword\udotaccent
-+    \definedummyword\dotless
-+    %
-+    % Texinfo font commands.
-+    \definedummyword\b
-+    \definedummyword\i
-+    \definedummyword\r
-+    \definedummyword\sc
-+    \definedummyword\t
-+    %
-+    % Commands that take arguments.
-+    \definedummyword\acronym
-+    \definedummyword\cite
-+    \definedummyword\code
-+    \definedummyword\command
-+    \definedummyword\dfn
-+    \definedummyword\emph
-+    \definedummyword\env
-+    \definedummyword\file
-+    \definedummyword\kbd
-+    \definedummyword\key
-+    \definedummyword\math
-+    \definedummyword\option
-+    \definedummyword\samp
-+    \definedummyword\strong
-+    \definedummyword\tie
-+    \definedummyword\uref
-+    \definedummyword\url
-+    \definedummyword\var
-+    \definedummyword\verb
-+    \definedummyword\w
-+  }
- }
- 
- % \indexnofonts is used when outputting the strings to sort the index
-@@ -3670,7 +3451,6 @@
-   \def\point{.}%
-   \def\print{-|}%
-   \def\result{=>}%
--  \def\textdegree{degrees}%
-   %
-   % We need to get rid of all macros, leaving only the arguments (if present).
-   % Of course this is not nearly correct, but it is the best we can do for 
now.
-@@ -4019,9 +3799,9 @@
-   \endgroup
- }
- 
--% Like plain.tex's \dotfill, except uses up at least 1 em.
-+% Like \dotfill except takes at least 1 em.
- \def\indexdotfill{\cleaders
--  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
-+  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 
1fill}
- 
- \def\primary #1{\line{#1\hfil}}
- 
-@@ -4595,17 +4375,14 @@
-     \ifx\temptype\Ynothingkeyword
-       \setbox0 = \hbox{}%
-       \def\toctype{unnchap}%
--      \gdef\thischapternum{}%
-       \gdef\thischapter{#1}%
-     \else\ifx\temptype\Yomitfromtockeyword
-       \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
-       \def\toctype{omit}%
--      \gdef\thischapternum{}%
-       \gdef\thischapter{}%
-     \else\ifx\temptype\Yappendixkeyword
-       \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
-       \def\toctype{app}%
--      \xdef\thischapternum{\appendixletter}%
-       % We don't substitute the actual chapter name into \thischapter
-       % because we don't want its macros evaluated now.  And we don't
-       % use \thissection because that changes with each section.
-@@ -4615,7 +4392,6 @@
-     \else
-       \setbox0 = \hbox{#3\enspace}%
-       \def\toctype{numchap}%
--      \xdef\thischapternum{\the\chapno}%
-       \xdef\thischapter{\putwordChapter{} \the\chapno:
-                         \noexpand\thischaptername}%
-     \fi\fi\fi
-@@ -4727,21 +4503,13 @@
-       \gdef\thissection{#1}%
-     \fi\fi\fi
-     %
--    % Write the toc entry (before \donoderef).  See comments in \chapmacro.
-+    % Write the toc entry (before \donoderef).  See comments in \chfplain.
-     \writetocentry{\toctype\sectionlevel}{#1}{#4}%
-     %
-     % Write the node reference (= pdf destination for pdftex).
--    % Again, see comments in \chapmacro.
-+    % Again, see comments in \chfplain.
-     \donoderef{#3}%
-     %
--    % Interline glue will be inserted when the vbox is completed.
--    % That glue will be a valid breakpoint for the page, since it'll be
--    % preceded by a whatsit (usually from the \donoderef, or from the
--    % \writetocentry if there was no node).  We don't want to allow that
--    % break, since then the whatsits could end up on page n while the
--    % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
--    \nobreak
--    %
-     % Output the actual section heading.
-     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-           \hangindent=\wd0  % zero if no section number
-@@ -4804,7 +4572,7 @@
-        \edef\temp{%
-          [EMAIL PROTECTED]
-        \temp
--      }%
-+      }
-     \fi
-   \fi
-   %
-@@ -5056,7 +4824,7 @@
- {\tentt \global\dimen0 = 3em}% Width of the box.
- \dimen2 = .55pt % Thickness of rules
- % The text. (`r' is open on the right, `e' somewhat less so on the left.)
--\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
-+\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
- %
- \setbox\errorbox=\hbox to \dimen0{\hfil
-    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
-@@ -5279,10 +5047,11 @@
- %
- \maketwodispenvs {lisp}{example}{%
-   \nonfillstart
--  \tt\quoteexpand
-+  \tt
-   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-   \gobble       % eat return
- }
-+
- % @display/@smalldisplay: same as @lisp except keep current font.
- %
- \makedispenv {display}{%
-@@ -5410,34 +5179,6 @@
- \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
- %
- \def\starttabbox{\setbox0=\hbox\bgroup}
--
--% Allow an option to not replace quotes with a regular directed right
--% quote/apostrophe (char 0x27), but instead use the undirected quote
--% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
--% the default, but it works for pasting with more pdf viewers (at least
--% evince), the lilypond developers report.  xpdf does work with the
--% regular 0x27.  
--% 
--\def\codequoteright{%
--  \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
--    '%
--  \else
--    \char'15
--  \fi
--}
--%
--% and a similar option for the left quote char vs. a grave accent.
--% Modern fonts display ASCII 0x60 as a grave accent, so some people like
--% the code environments to do likewise.
--% 
--\def\codequoteleft{%
--  \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
--    `%
--  \else
--    \char'22
--  \fi
--}
--%
- \begingroup
-   \catcode`\^^I=\active
-   \gdef\tabexpand{%
-@@ -5450,16 +5191,7 @@
-       \wd0=\dimen0 \box0 \starttabbox
-     }%
-   }
--  \catcode`\'=\active
--  \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
--  %
--  \catcode`\`=\active
--  \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
--  %
--  \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
- \endgroup
--
--% start the verbatim environment.
- \def\setupverbatim{%
-   \let\nonarrowing = t%
-   \nonfillstart
-@@ -5468,7 +5200,6 @@
-   \def\par{\leavevmode\egroup\box0\endgraf}%
-   \catcode`\`=\active
-   \tabexpand
--  \quoteexpand
-   % Respect line breaks,
-   % print special symbols as themselves, and
-   % make each space count
-@@ -5918,6 +5649,7 @@
-     \spaceisspace
-     %
-     % Append \endinput to make sure that TeX does not see the ending newline.
-+    %
-     % I've verified that it is necessary both for e-TeX and for ordinary TeX
-     %                                                 --kasal, 29nov03
-     \scantokens{#1\endinput}%
-@@ -6184,11 +5916,11 @@
- % {.  If so it reads up to the closing }, if not, it reads the whole
- % line.  Whatever was read is then fed to the next control sequence
- % as an argument (by \parsebrace or \parsearg)
--\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
-+\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
- \def\braceorlinexxx{%
-   \ifx\nchar\bgroup\else
-     \expandafter\parsearg
--  \fi \macnamexxx}
-+  \fi \next}
- 
- 
- % @alias.
-@@ -6353,7 +6085,7 @@
-     % If the user specified the print name (third arg) to the ref,
-     % print it instead of our usual "Figure 1.2".
-     \ifdim\wd0 = 0pt
--      \refx{#1-snt}{}%
-+      \refx{#1-snt}%
-     \else
-       \printedrefname
-     \fi
-@@ -6783,7 +6515,7 @@
-     % above and below.
-     \nobreak\vskip\parskip
-     \nobreak
--    \line\bgroup
-+    \line\bgroup\hss
-   \fi
-   %
-   % Output the image.
-@@ -6796,7 +6528,7 @@
-     \epsfbox{#1.eps}%
-   \fi
-   %
--  \ifimagevmode \egroup \bigbreak \fi  % space after the image
-+  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
- \endgroup}
- 
- 
-@@ -6937,7 +6669,6 @@
-       % caption if specified, else the full caption if specified, else 
nothing.
-       {%
-         \atdummies
--        %
-         % since we read the caption text in the macro world, where ^^M
-         % is turned into a normal character, we have to scan it back, so
-         % we don't write the literal three characters "^^M" into the aux file.
-@@ -6958,9 +6689,8 @@
-   %
-   % place the captured inserts
-   %
--  % BEWARE: when the floats start floating, we have to issue warning
--  % whenever an insert appears inside a float which could possibly
--  % float. --kasal, 26may04
-+  % BEWARE: when the floats start float, we have to issue warning whenever an
-+  % insert appears inside a float which could possibly float. --kasal, 26may04
-   %
-   \checkinserts
- }
-@@ -7387,13 +7117,6 @@
- % \otherifyactive is called near the end of this file.
- \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
- 
--% Used sometimes to turn off (effectively) the active characters even after
--% parsing them.
--\def\turnoffactive{%
--  \normalturnoffactive
--  \otherbackslash
--}
--
- [EMAIL PROTECTED]
- 
- % \backslashcurfont outputs one backslash character in current font,
-@@ -7401,29 +7124,28 @@
- \global\chardef\backslashcurfont=`\\
- \global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
- 
-+% \rawbackslash defines an active \ to do \backslashcurfont.
-+% \otherbackslash defines an active \ to be a literal `\' character with
-+% catcode other.
-+{\catcode`\\=\active
-+ @[EMAIL PROTECTED]@[EMAIL PROTECTED]
-+ @[EMAIL PROTECTED]@[EMAIL PROTECTED]
-+}
-+
- % \realbackslash is an actual character `\' with catcode other, and
- % \doublebackslash is two of them (for the pdf outlines).
- {\catcode`\\=\other @[EMAIL PROTECTED] @[EMAIL PROTECTED]
- 
--% In texinfo, backslash is an active character; it prints the backslash
--% in fixed width font.
--\catcode`\\=\active
[EMAIL PROTECTED]@[EMAIL PROTECTED]@backslashcurfont}}
--% On startup, @fixbackslash assigns:
--%  @let \ = @normalbackslash
-+% \normalbackslash outputs one backslash in fixed width font.
-+\def\normalbackslash{{\tt\backslashcurfont}}
- 
--% \rawbackslash defines an active \ to do \backslashcurfont.
--% \otherbackslash defines an active \ to be a literal `\' character with
--% catcode other.
[EMAIL PROTECTED]@[EMAIL PROTECTED]@backslashcurfont}
[EMAIL PROTECTED]@[EMAIL PROTECTED]@realbackslash}
-+\catcode`\\=\active
- 
--% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
--% the literal character `\'.
--% 
[EMAIL PROTECTED]@normalturnoffactive{%
--  @[EMAIL PROTECTED]
-+% Used sometimes to turn off (effectively) the active characters
-+% even after parsing them.
[EMAIL PROTECTED]@turnoffactive{%
-   @let"[EMAIL PROTECTED]
-+  @[EMAIL PROTECTED]
-   @[EMAIL PROTECTED]
-   @[EMAIL PROTECTED]
-   @[EMAIL PROTECTED]
-@@ -7435,6 +7157,12 @@
-   @unsepspaces
- }
- 
-+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-+% the literal character `\'.  (Thus, \ is not expandable when this is in
-+% effect.)
-+%
[EMAIL PROTECTED]@[EMAIL PROTECTED] @[EMAIL PROTECTED]
-+
- % Make _ and + \other characters, temporarily.
- % This is canceled by @fixbackslash.
- @otherifyactive
-@@ -7447,7 +7175,7 @@
- @[EMAIL PROTECTED] = @eatinput
- 
- % On the other hand, perhaps the file did not have a `\input texinfo'. Then
--% the first `\' in the file would cause an error. This macro tries to fix
-+% the first `\{ in the file would cause an error. This macro tries to fix
- % that, assuming it is called before the first `\' could plausibly occur.
- % Also turn back on active characters that might appear in the input
- % file name, in case not using a pre-dumped format.
 diff -urNad aspell-0.60.5~/missing aspell-0.60.5/missing
 --- aspell-0.60.5~/missing     2007-02-17 20:11:08.000000000 -0500
 +++ aspell-0.60.5/missing      2007-02-17 20:29:33.000000000 -0500
diff -u aspell-0.60.5/debian/patches/00list aspell-0.60.5/debian/patches/00list
--- aspell-0.60.5/debian/patches/00list
+++ aspell-0.60.5/debian/patches/00list
@@ -4,2 +4,3 @@
 05_removedebug_munchlist
+06_add_oo-only_texi
 10_autotools
diff -u aspell-0.60.5/debian/rules aspell-0.60.5/debian/rules
--- aspell-0.60.5/debian/rules
+++ aspell-0.60.5/debian/rules
@@ -10,6 +10,9 @@
 DEB_INSTALL_CHANGELOGS_ALL := manual/aspell.html/ChangeLog.html
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-pkgdatadir=/usr/lib/aspell 
--enable-pkglibdir=/usr/lib/aspell
 
+build/aspell-doc::
+       make -C manual aspell.html
+
 install/aspell::
        install -m644 debian/aspell.compat debian/aspell/usr/share/aspell/
        install -D -m644 debian/aspell.lintian 
debian/aspell/usr/share/lintian/overrides/aspell
diff -u aspell-0.60.5/debian/changelog aspell-0.60.5/debian/changelog
--- aspell-0.60.5/debian/changelog
+++ aspell-0.60.5/debian/changelog
@@ -1,3 +1,13 @@
+aspell (0.60.5-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix double build FTBFS. Closes: #424107.
+    - Clean up autotools patch.
+    - Regenerate html documentation removed by make distclean.
+    - Add missing oo-only.texi from upstream cvs.
+
+ -- Thomas Viehmann <[EMAIL PROTECTED]>  Sun, 06 Apr 2008 10:51:27 +0200
+
 aspell (0.60.5-2) unstable; urgency=low
 
   * patches/04_gcc43_build_fix.dpatch: new patch to fix a (possible?) GCC
diff -u aspell-0.60.5/debian/control aspell-0.60.5/debian/control
--- aspell-0.60.5/debian/control
+++ aspell-0.60.5/debian/control
@@ -2,7 +2,7 @@
 Section: text
 Priority: optional
 Maintainer: Brian Nelson <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.4), libncursesw5-dev | libncurses-dev, cdbs 
(>= 0.4.0), dpatch
+Build-Depends: debhelper (>= 4.0.4), libncursesw5-dev | libncurses-dev, cdbs 
(>= 0.4.0), dpatch, texinfo
 Standards-Version: 3.7.2
 
 Package: aspell
only in patch2:
unchanged:
--- aspell-0.60.5.orig/debian/patches/06_add_oo-only_texi.dpatch
+++ aspell-0.60.5/debian/patches/06_add_oo-only_texi.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_add_oo-only_texi.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add oo-only.texi from upstream CVS
+
[EMAIL PROTECTED]@
+--- aspell-0.60.5~/manual/oo-only.texi 1970-01-01 00:00:00.000000000 +0000
++++ aspell-0.60.5/manual/oo-only.texi  2008-04-06 10:19:07.000000000 +0000
+@@ -0,0 +1,18 @@
[EMAIL PROTECTED]
[EMAIL PROTECTED] Coptic (cop)
[EMAIL PROTECTED] Fijian (fj)
[EMAIL PROTECTED] Friulian (fur)
[EMAIL PROTECTED] Dyula (dyu)
[EMAIL PROTECTED] Fulah (ff)
[EMAIL PROTECTED] Mossi (mos)
[EMAIL PROTECTED] Nepali (ne)
[EMAIL PROTECTED] South Ndebele (nr)
[EMAIL PROTECTED] Northern Sotho (nso)
[EMAIL PROTECTED] Swati (ss)
[EMAIL PROTECTED] Southern Sotho (st)
[EMAIL PROTECTED] Tsonga (ts)
[EMAIL PROTECTED] Venda (ve)
[EMAIL PROTECTED] Xhosa (xh)
[EMAIL PROTECTED] Khmer (km)
[EMAIL PROTECTED] Luxembourgish (lb)
[EMAIL PROTECTED] itemize
only in patch2:
unchanged:
--- aspell-0.60.5.orig/gen/filter.pot
+++ aspell-0.60.5/gen/filter.pot
@@ -13,6 +13,10 @@
 msgid "swaps visible and invisible text"
 msgstr ""
 
+#: modules/filter/debctrl-filter.info:7
+msgid "filter for Debian packaging control files"
+msgstr ""
+
 #: modules/filter/email-filter.info:7
 msgid "filter for skipping quoted text in email messages"
 msgstr ""
@@ -89,6 +93,10 @@
 msgid "mode to check any lines starting with a #"
 msgstr ""
 
+#: modules/filter/modes/debctrl.amf:5
+msgid "mode for Debian packaging control files"
+msgstr ""
+
 #: modules/filter/modes/email.amf:5
 msgid "mode for skipping quoted text in email messages"
 msgstr ""



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to