--- aspell-0.60.5.orig/debian/patches/00list +++ aspell-0.60.5/debian/patches/00list @@ -0,0 +1,3 @@ +01_debctrl_filter +02_u-deva_common_data +10_autotools --- aspell-0.60.5.orig/debian/patches/02_u-deva_common_data.dpatch +++ aspell-0.60.5/debian/patches/02_u-deva_common_data.dpatch @@ -0,0 +1,1652 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_u-deva_common_data.dpatch by Brian Nelson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad aspell~/Makefile.am aspell/Makefile.am +--- aspell~/Makefile.am 2006-01-02 16:17:58.000000000 -0500 ++++ aspell/Makefile.am 2006-01-02 16:19:07.000000000 -0500 +@@ -376,7 +376,8 @@ + data/iso-8859-16.cmap data/iso-8859-16.cset \ + data/koi8-r.cmap data/koi8-r.cset \ + data/koi8-u.cmap data/koi8-u.cset \ +- data/dvorak.kbd data/split.kbd data/standard.kbd ++ data/dvorak.kbd data/split.kbd data/standard.kbd \ ++ data/u-deva.cmap data/u-deva.cset + + EXTRA_DIST += config.rpath README ${pkgdata_DATA} m4/*.m4 \ + misc/po-filter.c +diff -urNad aspell~/data/u-deva.cmap aspell/data/u-deva.cmap +--- aspell~/data/u-deva.cmap 1969-12-31 19:00:00.000000000 -0500 ++++ aspell/data/u-deva.cmap 2006-01-02 16:18:22.000000000 -0500 +@@ -0,0 +1,1362 @@ ++INTERNAL ++/ ++N 334 ++0000 > 00 ++0001 > 01 ++0002 > 02 ++0003 > 03 ++0004 > 04 ++0005 > 05 ++0006 > 06 ++0007 > 07 ++0008 > 08 ++0009 > 09 ++000A > 0A ++000B > 0B ++000C > 0C ++000D > 0D ++000E > 0E ++000F > 0F ++0010 > 10 ++0011 > 11 ++0012 > 12 ++0013 > 13 ++0014 > 14 ++0015 > 15 ++0016 > 16 ++0017 > 17 ++0018 > 18 ++0019 > 19 ++001A > 1A ++001B > 1B ++001C > 1C ++001D > 1D ++001E > 1E ++001F > 1F ++0020 > 20 ++0021 > 21 ++0022 > 22 ++0023 > 23 ++0024 > 24 ++0025 > 25 ++0026 > 26 ++0027 > 27 ++0028 > 28 ++0029 > 29 ++002A > 2A ++002B > 2B ++002C > 2C ++002D > 2D ++002E > 2E ++002F > 2F ++0030 > 30 ++0031 > 31 ++0032 > 32 ++0033 > 33 ++0034 > 34 ++0035 > 35 ++0036 > 36 ++0037 > 37 ++0038 > 38 ++0039 > 39 ++003A > 3A ++003B > 3B ++003C > 3C ++003D > 3D ++003E > 3E ++003F > 3F ++0040 > 40 ++0041 > 41 ++0042 > 42 ++0043 > 43 ++0044 > 44 ++0045 > 45 ++0046 > 46 ++0047 > 47 ++0048 > 48 ++0049 > 49 ++004A > 4A ++004B > 4B ++004C > 4C ++004D > 4D ++004E > 4E ++004F > 4F ++0050 > 50 ++0051 > 51 ++0052 > 52 ++0053 > 53 ++0054 > 54 ++0055 > 55 ++0056 > 56 ++0057 > 57 ++0058 > 58 ++0059 > 59 ++005A > 5A ++005B > 5B ++005C > 5C ++005D > 5D ++005E > 5E ++005F > 5F ++0060 > 60 ++0061 > 61 ++0062 > 62 ++0063 > 63 ++0064 > 64 ++0065 > 65 ++0066 > 66 ++0067 > 67 ++0068 > 68 ++0069 > 69 ++006A > 6A ++006B > 6B ++006C > 6C ++006D > 6D ++006E > 6E ++006F > 6F ++0070 > 70 ++0071 > 71 ++0072 > 72 ++0073 > 73 ++0074 > 74 ++0075 > 75 ++0076 > 76 ++0077 > 77 ++0078 > 78 ++0079 > 79 ++007A > 7A ++007B > 7B ++007C > 7C ++007D > 7D ++007E > 7E ++007F > 7F ++0080 > 80 ++00A0 > 20 # compat ++037E > 3B ++0901 > 81 ++0902 > 82 ++0903 > 83 ++0904 > 84 ++0905 > 85 ++0906 > 86 ++0907 > 87 ++0908 > 88 ++0909 > 89 ++090A > 8A ++090B > 8B ++090C > 8C ++090D > 8D ++090E > 8E ++090F > 8F ++0910 > 90 ++0911 > 91 ++0912 > 92 ++0913 > 93 ++0914 > 94 ++0915 > 95 / ++ N 1 ++ 093C > D8 ++ . ++0916 > 96 / ++ N 1 ++ 093C > D9 ++ . ++0917 > 97 / ++ N 1 ++ 093C > DA ++ . ++0918 > 98 ++0919 > 99 ++091A > 9A ++091B > 9B ++091C > 9C / ++ N 1 ++ 093C > DB ++ . ++091D > 9D ++091E > 9E ++091F > 9F ++0920 > A0 ++0921 > A1 / ++ N 1 ++ 093C > DC ++ . ++0922 > A2 / ++ N 1 ++ 093C > DD ++ . ++0923 > A3 ++0924 > A4 ++0925 > A5 ++0926 > A6 ++0927 > A7 ++0928 > A8 / ++ N 1 ++ 093C > A9 ++ . ++0929 > A9 ++092A > AA ++092B > AB / ++ N 1 ++ 093C > DE ++ . ++092C > AC ++092D > AD ++092E > AE ++092F > AF / ++ N 1 ++ 093C > DF ++ . ++0930 > B0 / ++ N 1 ++ 093C > B1 ++ . ++0931 > B1 ++0932 > B2 ++0933 > B3 / ++ N 1 ++ 093C > B4 ++ . ++0934 > B4 ++0935 > B5 ++0936 > B6 ++0937 > B7 ++0938 > B8 ++0939 > B9 ++093C > BC ++093D > BD ++093E > BE ++093F > BF ++0940 > C0 ++0941 > C1 ++0942 > C2 ++0943 > C3 ++0944 > C4 ++0945 > C5 ++0946 > C6 ++0947 > C7 ++0948 > C8 ++0949 > C9 ++094A > CA ++094B > CB ++094C > CC ++094D > CD ++0950 > D0 ++0951 > D1 ++0952 > D2 ++0953 > D3 ++0954 > D4 ++0958 > D8 ++0959 > D9 ++095A > DA ++095B > DB ++095C > DC ++095D > DD ++095E > DE ++095F > DF ++0960 > E0 ++0961 > E1 ++0962 > E2 ++0963 > E3 ++0964 > E4 ++0965 > E5 ++0966 > E6 ++0967 > E7 ++0968 > E8 ++0969 > E9 ++096A > EA ++096B > EB ++096C > EC ++096D > ED ++096E > EE ++096F > EF ++0970 > F0 ++1FEF > 60 ++2000 > 20 # compat ++2001 > 20 # compat ++2002 > 20 # compat ++2003 > 20 # compat ++2004 > 20 # compat ++2005 > 20 # compat ++2006 > 20 # compat ++2007 > 20 # compat ++2008 > 20 # compat ++2009 > 20 # compat ++200A > 20 # compat ++2024 > 2E # compat ++2025 > 2E 2E # compat ++2026 > 2E 2E 2E # compat ++202F > 20 # compat ++203C > 21 21 # compat ++2047 > 3F 3F # compat ++2048 > 3F 21 # compat ++2049 > 21 3F # compat ++205F > 20 # compat ++FB29 > 2B # compat ++FE30 > 2E 2E # compat ++FE33 > 5F # compat ++FE34 > 5F # compat ++FE35 > 28 # compat ++FE36 > 29 # compat ++FE37 > 7B # compat ++FE38 > 7D # compat ++FE47 > 5B # compat ++FE48 > 5D # compat ++FE4D > 5F # compat ++FE4E > 5F # compat ++FE4F > 5F # compat ++FE50 > 2C # compat ++FE52 > 2E # compat ++FE54 > 3B # compat ++FE55 > 3A # compat ++FE56 > 3F # compat ++FE57 > 21 # compat ++FE59 > 28 # compat ++FE5A > 29 # compat ++FE5B > 7B # compat ++FE5C > 7D # compat ++FE5F > 23 # compat ++FE60 > 26 # compat ++FE61 > 2A # compat ++FE62 > 2B # compat ++FE63 > 2D # compat ++FE64 > 3C # compat ++FE65 > 3E # compat ++FE66 > 3D # compat ++FE68 > 5C # compat ++FE69 > 24 # compat ++FE6A > 25 # compat ++FE6B > 40 # compat ++FF01 > 21 # compat ++FF02 > 22 # compat ++FF03 > 23 # compat ++FF04 > 24 # compat ++FF05 > 25 # compat ++FF06 > 26 # compat ++FF07 > 27 # compat ++FF08 > 28 # compat ++FF09 > 29 # compat ++FF0A > 2A # compat ++FF0B > 2B # compat ++FF0C > 2C # compat ++FF0D > 2D # compat ++FF0E > 2E # compat ++FF0F > 2F # compat ++FF10 > 30 # compat ++FF11 > 31 # compat ++FF12 > 32 # compat ++FF13 > 33 # compat ++FF14 > 34 # compat ++FF15 > 35 # compat ++FF16 > 36 # compat ++FF17 > 37 # compat ++FF18 > 38 # compat ++FF19 > 39 # compat ++FF1A > 3A # compat ++FF1B > 3B # compat ++FF1C > 3C # compat ++FF1D > 3D # compat ++FF1E > 3E # compat ++FF1F > 3F # compat ++FF20 > 40 # compat ++FF3B > 5B # compat ++FF3C > 5C # compat ++FF3D > 5D # compat ++FF3E > 5E # compat ++FF3F > 5F # compat ++FF40 > 60 # compat ++FF5B > 7B # compat ++FF5C > 7C # compat ++FF5D > 7D # compat ++FF5E > 7E # compat ++. ++ ++STRICT ++/ ++N 236 ++0000 > 00 ++0001 > 01 ++0002 > 02 ++0003 > 03 ++0004 > 04 ++0005 > 05 ++0006 > 06 ++0007 > 07 ++0008 > 08 ++0009 > 09 ++000A > 0A ++000B > 0B ++000C > 0C ++000D > 0D ++000E > 0E ++000F > 0F ++0010 > 10 ++0011 > 11 ++0012 > 12 ++0013 > 13 ++0014 > 14 ++0015 > 15 ++0016 > 16 ++0017 > 17 ++0018 > 18 ++0019 > 19 ++001A > 1A ++001B > 1B ++001C > 1C ++001D > 1D ++001E > 1E ++001F > 1F ++0020 > 20 ++0021 > 21 ++0022 > 22 ++0023 > 23 ++0024 > 24 ++0025 > 25 ++0026 > 26 ++0027 > 27 ++0028 > 28 ++0029 > 29 ++002A > 2A ++002B > 2B ++002C > 2C ++002D > 2D ++002E > 2E ++002F > 2F ++0030 > 30 ++0031 > 31 ++0032 > 32 ++0033 > 33 ++0034 > 34 ++0035 > 35 ++0036 > 36 ++0037 > 37 ++0038 > 38 ++0039 > 39 ++003A > 3A ++003B > 3B ++003C > 3C ++003D > 3D ++003E > 3E ++003F > 3F ++0040 > 40 ++0041 > 41 ++0042 > 42 ++0043 > 43 ++0044 > 44 ++0045 > 45 ++0046 > 46 ++0047 > 47 ++0048 > 48 ++0049 > 49 ++004A > 4A ++004B > 4B ++004C > 4C ++004D > 4D ++004E > 4E ++004F > 4F ++0050 > 50 ++0051 > 51 ++0052 > 52 ++0053 > 53 ++0054 > 54 ++0055 > 55 ++0056 > 56 ++0057 > 57 ++0058 > 58 ++0059 > 59 ++005A > 5A ++005B > 5B ++005C > 5C ++005D > 5D ++005E > 5E ++005F > 5F ++0060 > 60 ++0061 > 61 ++0062 > 62 ++0063 > 63 ++0064 > 64 ++0065 > 65 ++0066 > 66 ++0067 > 67 ++0068 > 68 ++0069 > 69 ++006A > 6A ++006B > 6B ++006C > 6C ++006D > 6D ++006E > 6E ++006F > 6F ++0070 > 70 ++0071 > 71 ++0072 > 72 ++0073 > 73 ++0074 > 74 ++0075 > 75 ++0076 > 76 ++0077 > 77 ++0078 > 78 ++0079 > 79 ++007A > 7A ++007B > 7B ++007C > 7C ++007D > 7D ++007E > 7E ++007F > 7F ++0080 > 80 ++037E > 3B ++0901 > 81 ++0902 > 82 ++0903 > 83 ++0904 > 84 ++0905 > 85 ++0906 > 86 ++0907 > 87 ++0908 > 88 ++0909 > 89 ++090A > 8A ++090B > 8B ++090C > 8C ++090D > 8D ++090E > 8E ++090F > 8F ++0910 > 90 ++0911 > 91 ++0912 > 92 ++0913 > 93 ++0914 > 94 ++0915 > 95 / ++ N 1 ++ 093C > D8 ++ . ++0916 > 96 / ++ N 1 ++ 093C > D9 ++ . ++0917 > 97 / ++ N 1 ++ 093C > DA ++ . ++0918 > 98 ++0919 > 99 ++091A > 9A ++091B > 9B ++091C > 9C / ++ N 1 ++ 093C > DB ++ . ++091D > 9D ++091E > 9E ++091F > 9F ++0920 > A0 ++0921 > A1 / ++ N 1 ++ 093C > DC ++ . ++0922 > A2 / ++ N 1 ++ 093C > DD ++ . ++0923 > A3 ++0924 > A4 ++0925 > A5 ++0926 > A6 ++0927 > A7 ++0928 > A8 / ++ N 1 ++ 093C > A9 ++ . ++0929 > A9 ++092A > AA ++092B > AB / ++ N 1 ++ 093C > DE ++ . ++092C > AC ++092D > AD ++092E > AE ++092F > AF / ++ N 1 ++ 093C > DF ++ . ++0930 > B0 / ++ N 1 ++ 093C > B1 ++ . ++0931 > B1 ++0932 > B2 ++0933 > B3 / ++ N 1 ++ 093C > B4 ++ . ++0934 > B4 ++0935 > B5 ++0936 > B6 ++0937 > B7 ++0938 > B8 ++0939 > B9 ++093C > BC ++093D > BD ++093E > BE ++093F > BF ++0940 > C0 ++0941 > C1 ++0942 > C2 ++0943 > C3 ++0944 > C4 ++0945 > C5 ++0946 > C6 ++0947 > C7 ++0948 > C8 ++0949 > C9 ++094A > CA ++094B > CB ++094C > CC ++094D > CD ++0950 > D0 ++0951 > D1 ++0952 > D2 ++0953 > D3 ++0954 > D4 ++0958 > D8 ++0959 > D9 ++095A > DA ++095B > DB ++095C > DC ++095D > DD ++095E > DE ++095F > DF ++0960 > E0 ++0961 > E1 ++0962 > E2 ++0963 > E3 ++0964 > E4 ++0965 > E5 ++0966 > E6 ++0967 > E7 ++0968 > E8 ++0969 > E9 ++096A > EA ++096B > EB ++096C > EC ++096D > ED ++096E > EE ++096F > EF ++0970 > F0 ++1FEF > 60 ++. ++ ++NFD ++/ ++N 234 ++00 > 0000 ++01 > 0001 ++02 > 0002 ++03 > 0003 ++04 > 0004 ++05 > 0005 ++06 > 0006 ++07 > 0007 ++08 > 0008 ++09 > 0009 ++0A > 000A ++0B > 000B ++0C > 000C ++0D > 000D ++0E > 000E ++0F > 000F ++10 > 0010 ++11 > 0011 ++12 > 0012 ++13 > 0013 ++14 > 0014 ++15 > 0015 ++16 > 0016 ++17 > 0017 ++18 > 0018 ++19 > 0019 ++1A > 001A ++1B > 001B ++1C > 001C ++1D > 001D ++1E > 001E ++1F > 001F ++20 > 0020 ++21 > 0021 ++22 > 0022 ++23 > 0023 ++24 > 0024 ++25 > 0025 ++26 > 0026 ++27 > 0027 ++28 > 0028 ++29 > 0029 ++2A > 002A ++2B > 002B ++2C > 002C ++2D > 002D ++2E > 002E ++2F > 002F ++30 > 0030 ++31 > 0031 ++32 > 0032 ++33 > 0033 ++34 > 0034 ++35 > 0035 ++36 > 0036 ++37 > 0037 ++38 > 0038 ++39 > 0039 ++3A > 003A ++3B > 003B ++3C > 003C ++3D > 003D ++3E > 003E ++3F > 003F ++40 > 0040 ++41 > 0041 ++42 > 0042 ++43 > 0043 ++44 > 0044 ++45 > 0045 ++46 > 0046 ++47 > 0047 ++48 > 0048 ++49 > 0049 ++4A > 004A ++4B > 004B ++4C > 004C ++4D > 004D ++4E > 004E ++4F > 004F ++50 > 0050 ++51 > 0051 ++52 > 0052 ++53 > 0053 ++54 > 0054 ++55 > 0055 ++56 > 0056 ++57 > 0057 ++58 > 0058 ++59 > 0059 ++5A > 005A ++5B > 005B ++5C > 005C ++5D > 005D ++5E > 005E ++5F > 005F ++60 > 0060 ++61 > 0061 ++62 > 0062 ++63 > 0063 ++64 > 0064 ++65 > 0065 ++66 > 0066 ++67 > 0067 ++68 > 0068 ++69 > 0069 ++6A > 006A ++6B > 006B ++6C > 006C ++6D > 006D ++6E > 006E ++6F > 006F ++70 > 0070 ++71 > 0071 ++72 > 0072 ++73 > 0073 ++74 > 0074 ++75 > 0075 ++76 > 0076 ++77 > 0077 ++78 > 0078 ++79 > 0079 ++7A > 007A ++7B > 007B ++7C > 007C ++7D > 007D ++7E > 007E ++7F > 007F ++80 > 0080 ++81 > 0901 ++82 > 0902 ++83 > 0903 ++84 > 0904 ++85 > 0905 ++86 > 0906 ++87 > 0907 ++88 > 0908 ++89 > 0909 ++8A > 090A ++8B > 090B ++8C > 090C ++8D > 090D ++8E > 090E ++8F > 090F ++90 > 0910 ++91 > 0911 ++92 > 0912 ++93 > 0913 ++94 > 0914 ++95 > 0915 ++96 > 0916 ++97 > 0917 ++98 > 0918 ++99 > 0919 ++9A > 091A ++9B > 091B ++9C > 091C ++9D > 091D ++9E > 091E ++9F > 091F ++A0 > 0920 ++A1 > 0921 ++A2 > 0922 ++A3 > 0923 ++A4 > 0924 ++A5 > 0925 ++A6 > 0926 ++A7 > 0927 ++A8 > 0928 ++A9 > 0928 093C ++AA > 092A ++AB > 092B ++AC > 092C ++AD > 092D ++AE > 092E ++AF > 092F ++B0 > 0930 ++B1 > 0930 093C ++B2 > 0932 ++B3 > 0933 ++B4 > 0933 093C ++B5 > 0935 ++B6 > 0936 ++B7 > 0937 ++B8 > 0938 ++B9 > 0939 ++BC > 093C ++BD > 093D ++BE > 093E ++BF > 093F ++C0 > 0940 ++C1 > 0941 ++C2 > 0942 ++C3 > 0943 ++C4 > 0944 ++C5 > 0945 ++C6 > 0946 ++C7 > 0947 ++C8 > 0948 ++C9 > 0949 ++CA > 094A ++CB > 094B ++CC > 094C ++CD > 094D ++D0 > 0950 ++D1 > 0951 ++D2 > 0952 ++D3 > 0953 ++D4 > 0954 ++D8 > 0915 093C ++D9 > 0916 093C ++DA > 0917 093C ++DB > 091C 093C ++DC > 0921 093C ++DD > 0922 093C ++DE > 092B 093C ++DF > 092F 093C ++E0 > 0960 ++E1 > 0961 ++E2 > 0962 ++E3 > 0963 ++E4 > 0964 ++E5 > 0965 ++E6 > 0966 ++E7 > 0967 ++E8 > 0968 ++E9 > 0969 ++EA > 096A ++EB > 096B ++EC > 096C ++ED > 096D ++EE > 096E ++EF > 096F ++F0 > 0970 ++. ++ ++NFC ++/ ++N 234 ++00 > 0000 ++01 > 0001 ++02 > 0002 ++03 > 0003 ++04 > 0004 ++05 > 0005 ++06 > 0006 ++07 > 0007 ++08 > 0008 ++09 > 0009 ++0A > 000A ++0B > 000B ++0C > 000C ++0D > 000D ++0E > 000E ++0F > 000F ++10 > 0010 ++11 > 0011 ++12 > 0012 ++13 > 0013 ++14 > 0014 ++15 > 0015 ++16 > 0016 ++17 > 0017 ++18 > 0018 ++19 > 0019 ++1A > 001A ++1B > 001B ++1C > 001C ++1D > 001D ++1E > 001E ++1F > 001F ++20 > 0020 ++21 > 0021 ++22 > 0022 ++23 > 0023 ++24 > 0024 ++25 > 0025 ++26 > 0026 ++27 > 0027 ++28 > 0028 ++29 > 0029 ++2A > 002A ++2B > 002B ++2C > 002C ++2D > 002D ++2E > 002E ++2F > 002F ++30 > 0030 ++31 > 0031 ++32 > 0032 ++33 > 0033 ++34 > 0034 ++35 > 0035 ++36 > 0036 ++37 > 0037 ++38 > 0038 ++39 > 0039 ++3A > 003A ++3B > 003B ++3C > 003C ++3D > 003D ++3E > 003E ++3F > 003F ++40 > 0040 ++41 > 0041 ++42 > 0042 ++43 > 0043 ++44 > 0044 ++45 > 0045 ++46 > 0046 ++47 > 0047 ++48 > 0048 ++49 > 0049 ++4A > 004A ++4B > 004B ++4C > 004C ++4D > 004D ++4E > 004E ++4F > 004F ++50 > 0050 ++51 > 0051 ++52 > 0052 ++53 > 0053 ++54 > 0054 ++55 > 0055 ++56 > 0056 ++57 > 0057 ++58 > 0058 ++59 > 0059 ++5A > 005A ++5B > 005B ++5C > 005C ++5D > 005D ++5E > 005E ++5F > 005F ++60 > 0060 ++61 > 0061 ++62 > 0062 ++63 > 0063 ++64 > 0064 ++65 > 0065 ++66 > 0066 ++67 > 0067 ++68 > 0068 ++69 > 0069 ++6A > 006A ++6B > 006B ++6C > 006C ++6D > 006D ++6E > 006E ++6F > 006F ++70 > 0070 ++71 > 0071 ++72 > 0072 ++73 > 0073 ++74 > 0074 ++75 > 0075 ++76 > 0076 ++77 > 0077 ++78 > 0078 ++79 > 0079 ++7A > 007A ++7B > 007B ++7C > 007C ++7D > 007D ++7E > 007E ++7F > 007F ++80 > 0080 ++81 > 0901 ++82 > 0902 ++83 > 0903 ++84 > 0904 ++85 > 0905 ++86 > 0906 ++87 > 0907 ++88 > 0908 ++89 > 0909 ++8A > 090A ++8B > 090B ++8C > 090C ++8D > 090D ++8E > 090E ++8F > 090F ++90 > 0910 ++91 > 0911 ++92 > 0912 ++93 > 0913 ++94 > 0914 ++95 > 0915 ++96 > 0916 ++97 > 0917 ++98 > 0918 ++99 > 0919 ++9A > 091A ++9B > 091B ++9C > 091C ++9D > 091D ++9E > 091E ++9F > 091F ++A0 > 0920 ++A1 > 0921 ++A2 > 0922 ++A3 > 0923 ++A4 > 0924 ++A5 > 0925 ++A6 > 0926 ++A7 > 0927 ++A8 > 0928 ++A9 > 0929 ++AA > 092A ++AB > 092B ++AC > 092C ++AD > 092D ++AE > 092E ++AF > 092F ++B0 > 0930 ++B1 > 0931 ++B2 > 0932 ++B3 > 0933 ++B4 > 0934 ++B5 > 0935 ++B6 > 0936 ++B7 > 0937 ++B8 > 0938 ++B9 > 0939 ++BC > 093C ++BD > 093D ++BE > 093E ++BF > 093F ++C0 > 0940 ++C1 > 0941 ++C2 > 0942 ++C3 > 0943 ++C4 > 0944 ++C5 > 0945 ++C6 > 0946 ++C7 > 0947 ++C8 > 0948 ++C9 > 0949 ++CA > 094A ++CB > 094B ++CC > 094C ++CD > 094D ++D0 > 0950 ++D1 > 0951 ++D2 > 0952 ++D3 > 0953 ++D4 > 0954 ++D8 > 0915 093C ++D9 > 0916 093C ++DA > 0917 093C ++DB > 091C 093C ++DC > 0921 093C ++DD > 0922 093C ++DE > 092B 093C ++DF > 092F 093C ++E0 > 0960 ++E1 > 0961 ++E2 > 0962 ++E3 > 0963 ++E4 > 0964 ++E5 > 0965 ++E6 > 0966 ++E7 > 0967 ++E8 > 0968 ++E9 > 0969 ++EA > 096A ++EB > 096B ++EC > 096C ++ED > 096D ++EE > 096E ++EF > 096F ++F0 > 0970 ++. ++ ++COMP ++/ ++N 234 ++00 > 0000 ++01 > 0001 ++02 > 0002 ++03 > 0003 ++04 > 0004 ++05 > 0005 ++06 > 0006 ++07 > 0007 ++08 > 0008 ++09 > 0009 ++0A > 000A ++0B > 000B ++0C > 000C ++0D > 000D ++0E > 000E ++0F > 000F ++10 > 0010 ++11 > 0011 ++12 > 0012 ++13 > 0013 ++14 > 0014 ++15 > 0015 ++16 > 0016 ++17 > 0017 ++18 > 0018 ++19 > 0019 ++1A > 001A ++1B > 001B ++1C > 001C ++1D > 001D ++1E > 001E ++1F > 001F ++20 > 0020 ++21 > 0021 ++22 > 0022 ++23 > 0023 ++24 > 0024 ++25 > 0025 ++26 > 0026 ++27 > 0027 ++28 > 0028 ++29 > 0029 ++2A > 002A ++2B > 002B ++2C > 002C ++2D > 002D ++2E > 002E ++2F > 002F ++30 > 0030 ++31 > 0031 ++32 > 0032 ++33 > 0033 ++34 > 0034 ++35 > 0035 ++36 > 0036 ++37 > 0037 ++38 > 0038 ++39 > 0039 ++3A > 003A ++3B > 003B ++3C > 003C ++3D > 003D ++3E > 003E ++3F > 003F ++40 > 0040 ++41 > 0041 ++42 > 0042 ++43 > 0043 ++44 > 0044 ++45 > 0045 ++46 > 0046 ++47 > 0047 ++48 > 0048 ++49 > 0049 ++4A > 004A ++4B > 004B ++4C > 004C ++4D > 004D ++4E > 004E ++4F > 004F ++50 > 0050 ++51 > 0051 ++52 > 0052 ++53 > 0053 ++54 > 0054 ++55 > 0055 ++56 > 0056 ++57 > 0057 ++58 > 0058 ++59 > 0059 ++5A > 005A ++5B > 005B ++5C > 005C ++5D > 005D ++5E > 005E ++5F > 005F ++60 > 0060 ++61 > 0061 ++62 > 0062 ++63 > 0063 ++64 > 0064 ++65 > 0065 ++66 > 0066 ++67 > 0067 ++68 > 0068 ++69 > 0069 ++6A > 006A ++6B > 006B ++6C > 006C ++6D > 006D ++6E > 006E ++6F > 006F ++70 > 0070 ++71 > 0071 ++72 > 0072 ++73 > 0073 ++74 > 0074 ++75 > 0075 ++76 > 0076 ++77 > 0077 ++78 > 0078 ++79 > 0079 ++7A > 007A ++7B > 007B ++7C > 007C ++7D > 007D ++7E > 007E ++7F > 007F ++80 > 0080 ++81 > 0901 ++82 > 0902 ++83 > 0903 ++84 > 0904 ++85 > 0905 ++86 > 0906 ++87 > 0907 ++88 > 0908 ++89 > 0909 ++8A > 090A ++8B > 090B ++8C > 090C ++8D > 090D ++8E > 090E ++8F > 090F ++90 > 0910 ++91 > 0911 ++92 > 0912 ++93 > 0913 ++94 > 0914 ++95 > 0915 ++96 > 0916 ++97 > 0917 ++98 > 0918 ++99 > 0919 ++9A > 091A ++9B > 091B ++9C > 091C ++9D > 091D ++9E > 091E ++9F > 091F ++A0 > 0920 ++A1 > 0921 ++A2 > 0922 ++A3 > 0923 ++A4 > 0924 ++A5 > 0925 ++A6 > 0926 ++A7 > 0927 ++A8 > 0928 ++A9 > 0929 ++AA > 092A ++AB > 092B ++AC > 092C ++AD > 092D ++AE > 092E ++AF > 092F ++B0 > 0930 ++B1 > 0931 ++B2 > 0932 ++B3 > 0933 ++B4 > 0934 ++B5 > 0935 ++B6 > 0936 ++B7 > 0937 ++B8 > 0938 ++B9 > 0939 ++BC > 093C ++BD > 093D ++BE > 093E ++BF > 093F ++C0 > 0940 ++C1 > 0941 ++C2 > 0942 ++C3 > 0943 ++C4 > 0944 ++C5 > 0945 ++C6 > 0946 ++C7 > 0947 ++C8 > 0948 ++C9 > 0949 ++CA > 094A ++CB > 094B ++CC > 094C ++CD > 094D ++D0 > 0950 ++D1 > 0951 ++D2 > 0952 ++D3 > 0953 ++D4 > 0954 ++D8 > 0958 ++D9 > 0959 ++DA > 095A ++DB > 095B ++DC > 095C ++DD > 095D ++DE > 095E ++DF > 095F ++E0 > 0960 ++E1 > 0961 ++E2 > 0962 ++E3 > 0963 ++E4 > 0964 ++E5 > 0965 ++E6 > 0966 ++E7 > 0967 ++E8 > 0968 ++E9 > 0969 ++EA > 096A ++EB > 096B ++EC > 096C ++ED > 096D ++EE > 096E ++EF > 096F ++F0 > 0970 ++. +diff -urNad aspell~/data/u-deva.cset aspell/data/u-deva.cset +--- aspell~/data/u-deva.cset 1969-12-31 19:00:00.000000000 -0500 ++++ aspell/data/u-deva.cset 2006-01-02 16:18:27.000000000 -0500 +@@ -0,0 +1,262 @@ ++# Aspell Character Data File. ++= u-deva ++> ascii ++/ ++# <plain> ++# <sl-first> <sl-rest> ++00 0000 - N 00 00 00 00 00 00 # <control> ++01 0001 . N 01 01 01 00 00 00 # <unused control> ++02 0002 . N 02 02 02 00 00 00 # <unused control> ++03 0003 . N 03 03 03 00 00 00 # <unused control> ++04 0004 . N 04 04 04 00 00 00 # <unused control> ++05 0005 . N 05 05 05 00 00 00 # <unused control> ++06 0006 . N 06 06 06 00 00 00 # <unused control> ++07 0007 . N 07 07 07 00 00 00 # <unused control> ++08 0008 . N 08 08 08 00 00 00 # <unused control> ++09 0009 . N 09 09 09 00 00 00 # <unused control> ++0A 000A . N 0A 0A 0A 00 00 00 # <unused control> ++0B 000B . N 0B 0B 0B 00 00 00 # <unused control> ++0C 000C . N 0C 0C 0C 00 00 00 # <unused control> ++0D 000D . N 0D 0D 0D 00 00 00 # <unused control> ++0E 000E . N 0E 0E 0E 00 00 00 # <unused control> ++0F 000F . N 0F 0F 0F 00 00 00 # <unused control> ++10 0010 - N 10 10 10 00 00 00 # <control> ++11 0011 . N 11 11 11 00 00 00 # <unused control> ++12 0012 . N 12 12 12 00 00 00 # <unused control> ++13 0013 . N 13 13 13 00 00 00 # <unused control> ++14 0014 . N 14 14 14 00 00 00 # <unused control> ++15 0015 . N 15 15 15 00 00 00 # <unused control> ++16 0016 . N 16 16 16 00 00 00 # <unused control> ++17 0017 . N 17 17 17 00 00 00 # <unused control> ++18 0018 . N 18 18 18 00 00 00 # <unused control> ++19 0019 . N 19 19 19 00 00 00 # <unused control> ++1A 001A . N 1A 1A 1A 00 00 00 # <unused control> ++1B 001B . N 1B 1B 1B 00 00 00 # <unused control> ++1C 001C . N 1C 1C 1C 00 00 00 # <unused control> ++1D 001D . N 1D 1D 1D 00 00 00 # <unused control> ++1E 001E . N 1E 1E 1E 00 00 00 # <unused control> ++1F 001F . N 1F 1F 1F 00 00 00 # <unused control> ++20 0020 W Y 20 20 20 00 00 00 # SPACE ++21 0021 - Y 21 21 21 00 00 00 # EXCLAMATION MARK ++22 0022 - Y 22 22 22 00 00 00 # QUOTATION MARK ++23 0023 - Y 23 23 23 00 00 00 # NUMBER SIGN ++24 0024 - Y 24 24 24 00 00 00 # DOLLAR SIGN ++25 0025 - Y 25 25 25 00 00 00 # PERCENT SIGN ++26 0026 - Y 26 26 26 00 00 00 # AMPERSAND ++27 0027 - Y 27 27 27 00 00 00 # APOSTROPHE ++28 0028 - Y 28 28 28 00 00 00 # LEFT PARENTHESIS ++29 0029 - Y 29 29 29 00 00 00 # RIGHT PARENTHESIS ++2A 002A - Y 2A 2A 2A 00 00 00 # ASTERISK ++2B 002B - Y 2B 2B 2B 00 00 00 # PLUS SIGN ++2C 002C - Y 2C 2C 2C 00 00 00 # COMMA ++2D 002D H Y 2D 2D 2D 00 00 00 # HYPHEN-MINUS ++2E 002E - Y 2E 2E 2E 00 00 00 # FULL STOP ++2F 002F - Y 2F 2F 2F 00 00 00 # SOLIDUS ++30 0030 D Y 30 30 30 00 00 00 # DIGIT ZERO ++31 0031 D Y 31 31 31 00 00 00 # DIGIT ONE ++32 0032 D Y 32 32 32 00 00 00 # DIGIT TWO ++33 0033 D Y 33 33 33 00 00 00 # DIGIT THREE ++34 0034 D Y 34 34 34 00 00 00 # DIGIT FOUR ++35 0035 D Y 35 35 35 00 00 00 # DIGIT FIVE ++36 0036 D Y 36 36 36 00 00 00 # DIGIT SIX ++37 0037 D Y 37 37 37 00 00 00 # DIGIT SEVEN ++38 0038 D Y 38 38 38 00 00 00 # DIGIT EIGHT ++39 0039 D Y 39 39 39 00 00 00 # DIGIT NINE ++3A 003A - Y 3A 3A 3A 00 00 00 # COLON ++3B 003B - Y 3B 3B 3B 00 00 00 # SEMICOLON ++3C 003C - Y 3C 3C 3C 00 00 00 # LESS-THAN SIGN ++3D 003D - Y 3D 3D 3D 00 00 00 # EQUALS SIGN ++3E 003E - Y 3E 3E 3E 00 00 00 # GREATER-THAN SIGN ++3F 003F - Y 3F 3F 3F 00 00 00 # QUESTION MARK ++40 0040 - Y 40 40 40 00 00 00 # COMMERCIAL AT ++41 0041 . Y 41 41 41 00 00 00 # <unused latin letter> ++42 0042 . Y 42 42 42 00 00 00 # <unused latin letter> ++43 0043 . Y 43 43 43 00 00 00 # <unused latin letter> ++44 0044 . Y 44 44 44 00 00 00 # <unused latin letter> ++45 0045 . Y 45 45 45 00 00 00 # <unused latin letter> ++46 0046 . Y 46 46 46 00 00 00 # <unused latin letter> ++47 0047 . Y 47 47 47 00 00 00 # <unused latin letter> ++48 0048 . Y 48 48 48 00 00 00 # <unused latin letter> ++49 0049 . Y 49 49 49 00 00 00 # <unused latin letter> ++4A 004A . Y 4A 4A 4A 00 00 00 # <unused latin letter> ++4B 004B . Y 4B 4B 4B 00 00 00 # <unused latin letter> ++4C 004C . Y 4C 4C 4C 00 00 00 # <unused latin letter> ++4D 004D . Y 4D 4D 4D 00 00 00 # <unused latin letter> ++4E 004E . Y 4E 4E 4E 00 00 00 # <unused latin letter> ++4F 004F . Y 4F 4F 4F 00 00 00 # <unused latin letter> ++50 0050 . Y 50 50 50 00 00 00 # <unused latin letter> ++51 0051 . Y 51 51 51 00 00 00 # <unused latin letter> ++52 0052 . Y 52 52 52 00 00 00 # <unused latin letter> ++53 0053 . Y 53 53 53 00 00 00 # <unused latin letter> ++54 0054 . Y 54 54 54 00 00 00 # <unused latin letter> ++55 0055 . Y 55 55 55 00 00 00 # <unused latin letter> ++56 0056 . Y 56 56 56 00 00 00 # <unused latin letter> ++57 0057 . Y 57 57 57 00 00 00 # <unused latin letter> ++58 0058 . Y 58 58 58 00 00 00 # <unused latin letter> ++59 0059 . Y 59 59 59 00 00 00 # <unused latin letter> ++5A 005A . Y 5A 5A 5A 00 00 00 # <unused latin letter> ++5B 005B - Y 5B 5B 5B 00 00 00 # LEFT SQUARE BRACKET ++5C 005C - Y 5C 5C 5C 00 00 00 # REVERSE SOLIDUS ++5D 005D - Y 5D 5D 5D 00 00 00 # RIGHT SQUARE BRACKET ++5E 005E - Y 5E 5E 5E 00 00 00 # CIRCUMFLEX ACCENT ++5F 005F - Y 5F 5F 5F 00 00 00 # LOW LINE ++60 0060 - Y 60 60 60 00 00 00 # GRAVE ACCENT ++61 0061 . Y 61 61 61 00 00 00 # <unused latin letter> ++62 0062 . Y 62 62 62 00 00 00 # <unused latin letter> ++63 0063 . Y 63 63 63 00 00 00 # <unused latin letter> ++64 0064 . Y 64 64 64 00 00 00 # <unused latin letter> ++65 0065 . Y 65 65 65 00 00 00 # <unused latin letter> ++66 0066 . Y 66 66 66 00 00 00 # <unused latin letter> ++67 0067 . Y 67 67 67 00 00 00 # <unused latin letter> ++68 0068 . Y 68 68 68 00 00 00 # <unused latin letter> ++69 0069 . Y 69 69 69 00 00 00 # <unused latin letter> ++6A 006A . Y 6A 6A 6A 00 00 00 # <unused latin letter> ++6B 006B . Y 6B 6B 6B 00 00 00 # <unused latin letter> ++6C 006C . Y 6C 6C 6C 00 00 00 # <unused latin letter> ++6D 006D . Y 6D 6D 6D 00 00 00 # <unused latin letter> ++6E 006E . Y 6E 6E 6E 00 00 00 # <unused latin letter> ++6F 006F . Y 6F 6F 6F 00 00 00 # <unused latin letter> ++70 0070 . Y 70 70 70 00 00 00 # <unused latin letter> ++71 0071 . Y 71 71 71 00 00 00 # <unused latin letter> ++72 0072 . Y 72 72 72 00 00 00 # <unused latin letter> ++73 0073 . Y 73 73 73 00 00 00 # <unused latin letter> ++74 0074 . Y 74 74 74 00 00 00 # <unused latin letter> ++75 0075 . Y 75 75 75 00 00 00 # <unused latin letter> ++76 0076 . Y 76 76 76 00 00 00 # <unused latin letter> ++77 0077 . Y 77 77 77 00 00 00 # <unused latin letter> ++78 0078 . Y 78 78 78 00 00 00 # <unused latin letter> ++79 0079 . Y 79 79 79 00 00 00 # <unused latin letter> ++7A 007A . Y 7A 7A 7A 00 00 00 # <unused latin letter> ++7B 007B - Y 7B 7B 7B 00 00 00 # LEFT CURLY BRACKET ++7C 007C - Y 7C 7C 7C 00 00 00 # VERTICAL LINE ++7D 007D - Y 7D 7D 7D 00 00 00 # RIGHT CURLY BRACKET ++7E 007E - Y 7E 7E 7E 00 00 00 # TILDE ++7F 007F - N 7F 7F 7F 00 00 00 # <control> ++80 0080 . N 80 80 80 00 00 00 # <unused control> ++81 0901 l M 81 81 81 81 81 81 # DEVANAGARI SIGN CANDRABINDU ++82 0902 l M 82 82 82 82 82 82 # DEVANAGARI SIGN ANUSVARA ++83 0903 l M 83 83 83 83 83 83 # DEVANAGARI SIGN VISARGA ++84 0904 L Y 84 84 84 84 84 84 # DEVANAGARI LETTER SHORT A ++85 0905 L Y 85 85 85 85 85 85 # DEVANAGARI LETTER A ++86 0906 L Y 86 86 86 86 86 86 # DEVANAGARI LETTER AA ++87 0907 L Y 87 87 87 87 87 87 # DEVANAGARI LETTER I ++88 0908 L Y 88 88 88 88 88 88 # DEVANAGARI LETTER II ++89 0909 L Y 89 89 89 89 89 89 # DEVANAGARI LETTER U ++8A 090A L Y 8A 8A 8A 8A 8A 8A # DEVANAGARI LETTER UU ++8B 090B L Y 8B 8B 8B 8B 8B 8B # DEVANAGARI LETTER VOCALIC R ++8C 090C L Y 8C 8C 8C 8C 8C 8C # DEVANAGARI LETTER VOCALIC L ++8D 090D L Y 8D 8D 8D 8D 8D 8D # DEVANAGARI LETTER CANDRA E ++8E 090E L Y 8E 8E 8E 8E 8E 8E # DEVANAGARI LETTER SHORT E ++8F 090F L Y 8F 8F 8F 8F 8F 8F # DEVANAGARI LETTER E ++90 0910 L Y 90 90 90 90 90 90 # DEVANAGARI LETTER AI ++91 0911 L Y 91 91 91 91 91 91 # DEVANAGARI LETTER CANDRA O ++92 0912 L Y 92 92 92 92 92 92 # DEVANAGARI LETTER SHORT O ++93 0913 L Y 93 93 93 93 93 93 # DEVANAGARI LETTER O ++94 0914 L Y 94 94 94 94 94 94 # DEVANAGARI LETTER AU ++95 0915 L Y 95 95 95 95 95 95 # DEVANAGARI LETTER KA ++96 0916 L Y 96 96 96 96 96 96 # DEVANAGARI LETTER KHA ++97 0917 L Y 97 97 97 97 97 97 # DEVANAGARI LETTER GA ++98 0918 L Y 98 98 98 98 98 98 # DEVANAGARI LETTER GHA ++99 0919 L Y 99 99 99 99 99 99 # DEVANAGARI LETTER NGA ++9A 091A L Y 9A 9A 9A 9A 9A 9A # DEVANAGARI LETTER CA ++9B 091B L Y 9B 9B 9B 9B 9B 9B # DEVANAGARI LETTER CHA ++9C 091C L Y 9C 9C 9C 9C 9C 9C # DEVANAGARI LETTER JA ++9D 091D L Y 9D 9D 9D 9D 9D 9D # DEVANAGARI LETTER JHA ++9E 091E L Y 9E 9E 9E 9E 9E 9E # DEVANAGARI LETTER NYA ++9F 091F L Y 9F 9F 9F 9F 9F 9F # DEVANAGARI LETTER TTA ++A0 0920 L Y A0 A0 A0 A0 A0 A0 # DEVANAGARI LETTER TTHA ++A1 0921 L Y A1 A1 A1 A1 A1 A1 # DEVANAGARI LETTER DDA ++A2 0922 L Y A2 A2 A2 A2 A2 A2 # DEVANAGARI LETTER DDHA ++A3 0923 L Y A3 A3 A3 A3 A3 A3 # DEVANAGARI LETTER NNA ++A4 0924 L Y A4 A4 A4 A4 A4 A4 # DEVANAGARI LETTER TA ++A5 0925 L Y A5 A5 A5 A5 A5 A5 # DEVANAGARI LETTER THA ++A6 0926 L Y A6 A6 A6 A6 A6 A6 # DEVANAGARI LETTER DA ++A7 0927 L Y A7 A7 A7 A7 A7 A7 # DEVANAGARI LETTER DHA ++A8 0928 L Y A8 A8 A8 A8 A8 A8 # DEVANAGARI LETTER NA ++A9 0929 L Y A9 A9 A9 A8 A8 A8 # DEVANAGARI LETTER NNNA ++AA 092A L Y AA AA AA AA AA AA # DEVANAGARI LETTER PA ++AB 092B L Y AB AB AB AB AB AB # DEVANAGARI LETTER PHA ++AC 092C L Y AC AC AC AC AC AC # DEVANAGARI LETTER BA ++AD 092D L Y AD AD AD AD AD AD # DEVANAGARI LETTER BHA ++AE 092E L Y AE AE AE AE AE AE # DEVANAGARI LETTER MA ++AF 092F L Y AF AF AF AF AF AF # DEVANAGARI LETTER YA ++B0 0930 L Y B0 B0 B0 B0 B0 B0 # DEVANAGARI LETTER RA ++B1 0931 L Y B1 B1 B1 B0 B0 B0 # DEVANAGARI LETTER RRA ++B2 0932 L Y B2 B2 B2 B2 B2 B2 # DEVANAGARI LETTER LA ++B3 0933 L Y B3 B3 B3 B3 B3 B3 # DEVANAGARI LETTER LLA ++B4 0934 L Y B4 B4 B4 B3 B3 B3 # DEVANAGARI LETTER LLLA ++B5 0935 L Y B5 B5 B5 B5 B5 B5 # DEVANAGARI LETTER VA ++B6 0936 L Y B6 B6 B6 B6 B6 B6 # DEVANAGARI LETTER SHA ++B7 0937 L Y B7 B7 B7 B7 B7 B7 # DEVANAGARI LETTER SSA ++B8 0938 L Y B8 B8 B8 B8 B8 B8 # DEVANAGARI LETTER SA ++B9 0939 L Y B9 B9 B9 B9 B9 B9 # DEVANAGARI LETTER HA ++BA E0BA . N BA BA BA 00 00 00 # <unused> ++BB E0BB . N BB BB BB 00 00 00 # <unused> ++BC 093C M M BC BC BC 00 00 00 # DEVANAGARI SIGN NUKTA ++BD 093D l Y BD BD BD BD BD BD # DEVANAGARI SIGN AVAGRAHA ++BE 093E L M BE BE BE BE 2A 00 # DEVANAGARI VOWEL SIGN AA ++BF 093F L M BF BF BF BF 2A 00 # DEVANAGARI VOWEL SIGN I ++C0 0940 L M C0 C0 C0 C0 2A 00 # DEVANAGARI VOWEL SIGN II ++C1 0941 L M C1 C1 C1 C1 2A 00 # DEVANAGARI VOWEL SIGN U ++C2 0942 L M C2 C2 C2 C2 2A 00 # DEVANAGARI VOWEL SIGN UU ++C3 0943 L M C3 C3 C3 C3 2A 00 # DEVANAGARI VOWEL SIGN VOCALIC R ++C4 0944 L M C4 C4 C4 C4 2A 00 # DEVANAGARI VOWEL SIGN VOCALIC RR ++C5 0945 L M C5 C5 C5 C5 2A 00 # DEVANAGARI VOWEL SIGN CANDRA E ++C6 0946 L M C6 C6 C6 C6 2A 00 # DEVANAGARI VOWEL SIGN SHORT E ++C7 0947 L M C7 C7 C7 C7 2A 00 # DEVANAGARI VOWEL SIGN E ++C8 0948 L M C8 C8 C8 C8 2A 00 # DEVANAGARI VOWEL SIGN AI ++C9 0949 L M C9 C9 C9 C9 2A 00 # DEVANAGARI VOWEL SIGN CANDRA O ++CA 094A L M CA CA CA CA 2A 00 # DEVANAGARI VOWEL SIGN SHORT O ++CB 094B L M CB CB CB CB 2A 00 # DEVANAGARI VOWEL SIGN O ++CC 094C L M CC CC CC CC 2A 00 # DEVANAGARI VOWEL SIGN AU ++CD 094D M M CD CD CD 00 00 00 # DEVANAGARI SIGN VIRAMA ++CE E0CE . N CE CE CE 00 00 00 # <unused> ++CF E0CF . N CF CF CF 00 00 00 # <unused> ++D0 0950 l Y D0 D0 D0 D0 D0 D0 # DEVANAGARI OM ++D1 0951 M M D1 D1 D1 00 00 00 # DEVANAGARI STRESS SIGN UDATTA ++D2 0952 M M D2 D2 D2 00 00 00 # DEVANAGARI STRESS SIGN ANUDATTA ++D3 0953 M M D3 D3 D3 00 00 00 # DEVANAGARI GRAVE ACCENT ++D4 0954 M M D4 D4 D4 00 00 00 # DEVANAGARI ACUTE ACCENT ++D5 E0D5 . N D5 D5 D5 00 00 00 # <unused> ++D6 E0D6 . N D6 D6 D6 00 00 00 # <unused> ++D7 E0D7 . N D7 D7 D7 00 00 00 # <unused> ++D8 0958 L Y D8 D8 D8 95 95 95 # DEVANAGARI LETTER QA ++D9 0959 L Y D9 D9 D9 96 96 96 # DEVANAGARI LETTER KHHA ++DA 095A L Y DA DA DA 97 97 97 # DEVANAGARI LETTER GHHA ++DB 095B L Y DB DB DB 9C 9C 9C # DEVANAGARI LETTER ZA ++DC 095C L Y DC DC DC A1 A1 A1 # DEVANAGARI LETTER DDDHA ++DD 095D L Y DD DD DD A2 A2 A2 # DEVANAGARI LETTER RHA ++DE 095E L Y DE DE DE AB AB AB # DEVANAGARI LETTER FA ++DF 095F L Y DF DF DF AF AF AF # DEVANAGARI LETTER YYA ++E0 0960 L Y E0 E0 E0 E0 E0 E0 # DEVANAGARI LETTER VOCALIC RR ++E1 0961 L Y E1 E1 E1 E1 E1 E1 # DEVANAGARI LETTER VOCALIC LL ++E2 0962 L M E2 E2 E2 E2 2A 00 # DEVANAGARI VOWEL SIGN VOCALIC L ++E3 0963 L M E3 E3 E3 E3 2A 00 # DEVANAGARI VOWEL SIGN VOCALIC LL ++E4 0964 - Y E4 E4 E4 00 00 00 # DEVANAGARI DANDA ++E5 0965 - Y E5 E5 E5 00 00 00 # DEVANAGARI DOUBLE DANDA ++E6 0966 D Y E6 E6 E6 00 00 00 # DEVANAGARI DIGIT ZERO ++E7 0967 D Y E7 E7 E7 00 00 00 # DEVANAGARI DIGIT ONE ++E8 0968 D Y E8 E8 E8 00 00 00 # DEVANAGARI DIGIT TWO ++E9 0969 D Y E9 E9 E9 00 00 00 # DEVANAGARI DIGIT THREE ++EA 096A D Y EA EA EA 00 00 00 # DEVANAGARI DIGIT FOUR ++EB 096B D Y EB EB EB 00 00 00 # DEVANAGARI DIGIT FIVE ++EC 096C D Y EC EC EC 00 00 00 # DEVANAGARI DIGIT SIX ++ED 096D D Y ED ED ED 00 00 00 # DEVANAGARI DIGIT SEVEN ++EE 096E D Y EE EE EE 00 00 00 # DEVANAGARI DIGIT EIGHT ++EF 096F D Y EF EF EF 00 00 00 # DEVANAGARI DIGIT NINE ++F0 0970 - Y F0 F0 F0 00 00 00 # DEVANAGARI ABBREVIATION SIGN ++F1 E0F1 . N F1 F1 F1 00 00 00 # <unused> ++F2 E0F2 . N F2 F2 F2 00 00 00 # <unused> ++F3 E0F3 . N F3 F3 F3 00 00 00 # <unused> ++F4 E0F4 . N F4 F4 F4 00 00 00 # <unused> ++F5 E0F5 . N F5 F5 F5 00 00 00 # <unused> ++F6 E0F6 . N F6 F6 F6 00 00 00 # <unused> ++F7 E0F7 . N F7 F7 F7 00 00 00 # <unused> ++F8 E0F8 . N F8 F8 F8 00 00 00 # <unused> ++F9 E0F9 . N F9 F9 F9 00 00 00 # <unused> ++FA E0FA . N FA FA FA 00 00 00 # <unused> ++FB E0FB . N FB FB FB 00 00 00 # <unused> ++FC E0FC . N FC FC FC 00 00 00 # <unused> ++FD E0FD . N FD FD FD 00 00 00 # <unused> ++FE E0FE . N FE FE FE 00 00 00 # <unused> ++FF E0FF . N FF FF FF 00 00 00 # <unused> --- aspell-0.60.5.orig/debian/patches/01_debctrl_filter.dpatch +++ aspell-0.60.5/debian/patches/01_debctrl_filter.dpatch @@ -0,0 +1,172 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_debctrl_filter.dpatch by Brian Nelson <pyro@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./Makefile.am /home/nelson/tmp/dpep-work.XX1rPC/aspell/Makefile.am +--- ./Makefile.am 2005-07-01 14:04:59.000000000 -0700 ++++ /home/nelson/tmp/dpep-work.XX1rPC/aspell/Makefile.am 2005-08-01 23:37:28.000000000 -0700 +@@ -154,6 +154,7 @@ + + ### Add the .info file your filter comes with + optfiles = \ ++ modules/filter/debctrl-filter.info\ + modules/filter/email-filter.info\ + modules/filter/tex-filter.info\ + modules/filter/sgml-filter.info\ +@@ -167,6 +168,7 @@ + modules/filter/modes/html.amf \ + modules/filter/modes/sgml.amf \ + modules/filter/modes/tex.amf \ ++ modules/filter/modes/debctrl.amf \ + modules/filter/modes/email.amf \ + modules/filter/modes/ccpp.amf \ + modules/filter/modes/none.amf \ +@@ -184,6 +186,7 @@ + ### starting with file containing filter class definition followed by + ### file containing filter member implementation. + libaspell_la_SOURCES +=\ ++ modules/filter/debctrl.cpp\ + modules/filter/email.cpp\ + modules/filter/tex.cpp\ + modules/filter/sgml.cpp\ +@@ -198,10 +201,14 @@ + + ### Add name of filter library containing your filter. Name always + ### must look like lib<filtername>-filter.la see development manual +-filter_LTLIBRARIES = email-filter.la tex-filter.la\ ++filter_LTLIBRARIES = debctrl-filter.la email-filter.la tex-filter.la\ + sgml-filter.la context-filter.la\ + nroff-filter.la texinfo-filter.la + ++debctrl_filter_la_SOURCES = modules/filter/debctrl.cpp ++debctrl_filter_la_LIBADD = libaspell.la ++debctrl_filter_la_LDFLAGS = ${filter_ldflags} ++ + email_filter_la_SOURCES = modules/filter/email.cpp + email_filter_la_LIBADD = libaspell.la + email_filter_la_LDFLAGS = ${filter_ldflags} +diff -urNad --exclude=CVS --exclude=.svn ./modules/filter/debctrl-filter.info /home/nelson/tmp/dpep-work.XX1rPC/aspell/modules/filter/debctrl-filter.info +--- ./modules/filter/debctrl-filter.info 1969-12-31 16:00:00.000000000 -0800 ++++ /home/nelson/tmp/dpep-work.XX1rPC/aspell/modules/filter/debctrl-filter.info 2005-08-01 23:37:28.000000000 -0700 +@@ -0,0 +1,9 @@ ++# debctrl filter option file ++ ++#This Filter is usable with the following version(s) of Aspell ++ASPELL >=0.51 ++ ++#This line will be printed when typing `Aspell help debctrl ++DESCRIPTION filter for Debian packaging control files ++ ++STATIC filter +diff -urNad --exclude=CVS --exclude=.svn ./modules/filter/debctrl.cpp /home/nelson/tmp/dpep-work.XX1rPC/aspell/modules/filter/debctrl.cpp +--- ./modules/filter/debctrl.cpp 1969-12-31 16:00:00.000000000 -0800 ++++ /home/nelson/tmp/dpep-work.XX1rPC/aspell/modules/filter/debctrl.cpp 2005-08-01 23:37:28.000000000 -0700 +@@ -0,0 +1,76 @@ ++// This file is part of The New Aspell ++// ++// Copyright (C) 2005 by Brian Nelson, based on the email filter, ++// Copyright (C) 2001 by Kevin Atkinson under the GNU LGPL license ++// version 2.0 or 2.1. You should have received a copy of the LGPL ++// license along with this library if you did not you can find it at ++// http://www.gnu.org/. ++ ++#include "settings.h" ++ ++#include "indiv_filter.hpp" ++#include "convert.hpp" ++#include "config.hpp" ++#include "indiv_filter.hpp" ++ ++namespace { ++ ++ using namespace acommon; ++ ++ class DebctrlFilter : public IndividualFilter ++ { ++ bool prev_newline; ++ bool in_field; ++ ++ public: ++ PosibErr<bool> setup(Config *); ++ void reset(); ++ void process(FilterChar * &, FilterChar * &); ++ }; ++ ++ PosibErr<bool> DebctrlFilter::setup(Config * opts) ++ { ++ name_ = "debctrl-filter"; ++ order_num_ = 0.90; ++ reset(); ++ return true; ++ } ++ ++ void DebctrlFilter::reset() ++ { ++ prev_newline = true; ++ in_field = false; ++ } ++ ++ void DebctrlFilter::process(FilterChar * & str, FilterChar * & end) ++ { ++ FilterChar * line_begin = str; ++ FilterChar * cur = str; ++ ++ while (cur < end) { ++ if (prev_newline && *cur != ' ') ++ in_field = true; ++ ++ if (*cur == '\n') { ++ if (in_field) { ++ for (FilterChar * i = line_begin; i != cur; ++i) ++ *i = ' '; ++ } ++ line_begin = cur; ++ in_field = false; ++ prev_newline = true; ++ } else { ++ prev_newline = false; ++ } ++ ++cur; ++ } ++ if (in_field) ++ for (FilterChar * i = line_begin; i != cur; ++i) ++ *i = ' '; ++ } ++} ++ ++C_EXPORT ++IndividualFilter * new_aspell_debctrl_filter() { ++ return new DebctrlFilter; ++} +diff -urNad --exclude=CVS --exclude=.svn ./modules/filter/modes/debctrl.amf /home/nelson/tmp/dpep-work.XX1rPC/aspell/modules/filter/modes/debctrl.amf +--- ./modules/filter/modes/debctrl.amf 1969-12-31 16:00:00.000000000 -0800 ++++ /home/nelson/tmp/dpep-work.XX1rPC/aspell/modules/filter/modes/debctrl.amf 2005-08-01 23:37:28.000000000 -0700 +@@ -0,0 +1,8 @@ ++MODE debctrl ++ ++ASPELL >=0.60 ++ ++DESCRIPTION mode for Debian packaging control files ++ ++FILTER url ++FILTER debctrl +diff -urNad --exclude=CVS --exclude=.svn ./prog/aspell.cpp /home/nelson/tmp/dpep-work.XX1rPC/aspell/prog/aspell.cpp +--- ./prog/aspell.cpp 2005-07-01 14:04:49.000000000 -0700 ++++ /home/nelson/tmp/dpep-work.XX1rPC/aspell/prog/aspell.cpp 2005-08-01 23:38:38.000000000 -0700 +@@ -203,10 +203,11 @@ + {'e', "mode=email", N_("enter Email mode.")}, + {'H', "mode=html", N_("enter HTML mode.")}, + {'t', "mode=tex", N_("enter TeX mode.")}, +- {'n', "mode=nroff", N_("enter Nroff mode.")} ++ {'n', "mode=nroff", N_("enter Nroff mode.")}, ++ {'D', "mode=debctrl", N_("enter Debctrl mode.")} + }; + +-static const ModeAbrv * mode_abrvs_end = mode_abrvs + 4; ++static const ModeAbrv * mode_abrvs_end = mode_abrvs + 5; + + const PossibleOption * find_option(char c) { + const PossibleOption * i = possible_options; --- aspell-0.60.5.orig/debian/patches/03_extra_qualification_fix.dpatch +++ aspell-0.60.5/debian/patches/03_extra_qualification_fix.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_extra_qualification_fix.dpatch by Brian Nelson <pyro@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes a compilation error with GCC 4.1 + +@DPATCH@ +diff -urNad aspell~/modules/filter/nroff.cpp aspell/modules/filter/nroff.cpp +--- aspell~/modules/filter/nroff.cpp 2005-07-01 14:04:49.000000000 -0700 ++++ aspell/modules/filter/nroff.cpp 2006-05-13 15:12:32.000000000 -0700 +@@ -73,7 +73,7 @@ + return false; + } + +- bool NroffFilter::process_char (FilterChar::Chr c); ++ bool process_char (FilterChar::Chr c); + + public: + --- aspell-0.60.5.orig/debian/patches/10_autotools.dpatch +++ aspell-0.60.5/debian/patches/10_autotools.dpatch @@ -0,0 +1,6069 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_autotools.dpatch by Brian Nelson <pyro@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad aspell-0.60.5~/Makefile.in aspell-0.60.5/Makefile.in +--- aspell-0.60.5~/Makefile.in 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/Makefile.in 2007-02-17 20:29:34.000000000 -0500 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,9 +18,13 @@ + + + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = . + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -44,6 +48,7 @@ + ### starting with file containing filter class definition followed by + ### file containing filter member implementation. + @COMPILE_IN_FILTERS_TRUE@am__append_3 = \ ++@COMPILE_IN_FILTERS_TRUE@ modules/filter/debctrl.cpp\ + @COMPILE_IN_FILTERS_TRUE@ modules/filter/email.cpp\ + @COMPILE_IN_FILTERS_TRUE@ modules/filter/tex.cpp\ + @COMPILE_IN_FILTERS_TRUE@ modules/filter/sgml.cpp\ +@@ -54,7 +59,6 @@ + @COMPILE_IN_FILTERS_FALSE@am__append_4 = ${optfiles} + @PSPELL_COMPATIBILITY_TRUE@am__append_5 = scripts/pspell-config + @PSPELL_COMPATIBILITY_TRUE@am__append_6 = scripts/pspell-config +-subdir = . + DIST_COMMON = README $(am__configure_deps) \ + $(am__pspell_include_HEADERS_DIST) $(include_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +@@ -74,6 +78,7 @@ + $(top_srcdir)/scripts/Makefile.in ABOUT-NLS COPYING TODO \ + compile config.guess config.rpath config.sub depcomp \ + install-sh ltmain.sh missing ++subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ +@@ -84,7 +89,7 @@ + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno config.status.lineno ++ configure.lineno configure.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/gen/settings.h + CONFIG_CLEAN_FILES = gen/Makefile common/Makefile lib/Makefile \ +@@ -114,19 +119,21 @@ + @COMPILE_IN_FILTERS_FALSE@am_context_filter_la_OBJECTS = \ + @COMPILE_IN_FILTERS_FALSE@ modules/filter/context.lo + context_filter_la_OBJECTS = $(am_context_filter_la_OBJECTS) +-context_filter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(context_filter_la_LDFLAGS) $(LDFLAGS) -o $@ + @COMPILE_IN_FILTERS_FALSE@am_context_filter_la_rpath = -rpath \ + @COMPILE_IN_FILTERS_FALSE@ $(filterdir) ++@COMPILE_IN_FILTERS_FALSE@debctrl_filter_la_DEPENDENCIES = \ ++@COMPILE_IN_FILTERS_FALSE@ libaspell.la ++am__debctrl_filter_la_SOURCES_DIST = modules/filter/debctrl.cpp ++@COMPILE_IN_FILTERS_FALSE@am_debctrl_filter_la_OBJECTS = \ ++@COMPILE_IN_FILTERS_FALSE@ modules/filter/debctrl.lo ++debctrl_filter_la_OBJECTS = $(am_debctrl_filter_la_OBJECTS) ++@COMPILE_IN_FILTERS_FALSE@am_debctrl_filter_la_rpath = -rpath \ ++@COMPILE_IN_FILTERS_FALSE@ $(filterdir) + @COMPILE_IN_FILTERS_FALSE@email_filter_la_DEPENDENCIES = libaspell.la + am__email_filter_la_SOURCES_DIST = modules/filter/email.cpp + @COMPILE_IN_FILTERS_FALSE@am_email_filter_la_OBJECTS = \ + @COMPILE_IN_FILTERS_FALSE@ modules/filter/email.lo + email_filter_la_OBJECTS = $(am_email_filter_la_OBJECTS) +-email_filter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(email_filter_la_LDFLAGS) $(LDFLAGS) -o $@ + @COMPILE_IN_FILTERS_FALSE@am_email_filter_la_rpath = -rpath \ + @COMPILE_IN_FILTERS_FALSE@ $(filterdir) + am__DEPENDENCIES_1 = +@@ -164,11 +171,12 @@ + lib/dummy.cpp lib/new_filter.cpp lib/new_fmode.cpp \ + lib/string_list-c.cpp lib/find_speller.cpp lib/speller-c.cpp \ + lib/string_pair_enumeration-c.cpp lib/new_checker.cpp \ +- modules/filter/url.cpp modules/filter/email.cpp \ +- modules/filter/tex.cpp modules/filter/sgml.cpp \ +- modules/filter/context.cpp modules/filter/nroff.cpp \ +- modules/filter/texinfo.cpp +-@COMPILE_IN_FILTERS_TRUE@am__objects_1 = modules/filter/email.lo \ ++ modules/filter/url.cpp modules/filter/debctrl.cpp \ ++ modules/filter/email.cpp modules/filter/tex.cpp \ ++ modules/filter/sgml.cpp modules/filter/context.cpp \ ++ modules/filter/nroff.cpp modules/filter/texinfo.cpp ++@COMPILE_IN_FILTERS_TRUE@am__objects_1 = modules/filter/debctrl.lo \ ++@COMPILE_IN_FILTERS_TRUE@ modules/filter/email.lo \ + @COMPILE_IN_FILTERS_TRUE@ modules/filter/tex.lo \ + @COMPILE_IN_FILTERS_TRUE@ modules/filter/sgml.lo \ + @COMPILE_IN_FILTERS_TRUE@ modules/filter/context.lo \ +@@ -206,25 +214,16 @@ + lib/speller-c.lo lib/string_pair_enumeration-c.lo \ + lib/new_checker.lo modules/filter/url.lo $(am__objects_1) + libaspell_la_OBJECTS = $(am_libaspell_la_OBJECTS) +-libaspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(libaspell_la_LDFLAGS) $(LDFLAGS) -o $@ + @PSPELL_COMPATIBILITY_TRUE@libpspell_la_DEPENDENCIES = libaspell.la + am__libpspell_la_SOURCES_DIST = lib/dummy.cpp + @PSPELL_COMPATIBILITY_TRUE@am_libpspell_la_OBJECTS = lib/dummy.lo + libpspell_la_OBJECTS = $(am_libpspell_la_OBJECTS) +-libpspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(libpspell_la_LDFLAGS) $(LDFLAGS) -o $@ + @PSPELL_COMPATIBILITY_TRUE@am_libpspell_la_rpath = -rpath $(libdir) + @COMPILE_IN_FILTERS_FALSE@nroff_filter_la_DEPENDENCIES = libaspell.la + am__nroff_filter_la_SOURCES_DIST = modules/filter/nroff.cpp + @COMPILE_IN_FILTERS_FALSE@am_nroff_filter_la_OBJECTS = \ + @COMPILE_IN_FILTERS_FALSE@ modules/filter/nroff.lo + nroff_filter_la_OBJECTS = $(am_nroff_filter_la_OBJECTS) +-nroff_filter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(nroff_filter_la_LDFLAGS) $(LDFLAGS) -o $@ + @COMPILE_IN_FILTERS_FALSE@am_nroff_filter_la_rpath = -rpath \ + @COMPILE_IN_FILTERS_FALSE@ $(filterdir) + @COMPILE_IN_FILTERS_FALSE@sgml_filter_la_DEPENDENCIES = libaspell.la +@@ -232,9 +231,6 @@ + @COMPILE_IN_FILTERS_FALSE@am_sgml_filter_la_OBJECTS = \ + @COMPILE_IN_FILTERS_FALSE@ modules/filter/sgml.lo + sgml_filter_la_OBJECTS = $(am_sgml_filter_la_OBJECTS) +-sgml_filter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(sgml_filter_la_LDFLAGS) $(LDFLAGS) -o $@ + @COMPILE_IN_FILTERS_FALSE@am_sgml_filter_la_rpath = -rpath \ + @COMPILE_IN_FILTERS_FALSE@ $(filterdir) + @COMPILE_IN_FILTERS_FALSE@tex_filter_la_DEPENDENCIES = libaspell.la +@@ -242,9 +238,6 @@ + @COMPILE_IN_FILTERS_FALSE@am_tex_filter_la_OBJECTS = \ + @COMPILE_IN_FILTERS_FALSE@ modules/filter/tex.lo + tex_filter_la_OBJECTS = $(am_tex_filter_la_OBJECTS) +-tex_filter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(tex_filter_la_LDFLAGS) $(LDFLAGS) -o $@ + @COMPILE_IN_FILTERS_FALSE@am_tex_filter_la_rpath = -rpath $(filterdir) + @COMPILE_IN_FILTERS_FALSE@texinfo_filter_la_DEPENDENCIES = \ + @COMPILE_IN_FILTERS_FALSE@ libaspell.la +@@ -252,9 +245,6 @@ + @COMPILE_IN_FILTERS_FALSE@am_texinfo_filter_la_OBJECTS = \ + @COMPILE_IN_FILTERS_FALSE@ modules/filter/texinfo.lo + texinfo_filter_la_OBJECTS = $(am_texinfo_filter_la_OBJECTS) +-texinfo_filter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(texinfo_filter_la_LDFLAGS) $(LDFLAGS) -o $@ + @COMPILE_IN_FILTERS_FALSE@am_texinfo_filter_la_rpath = -rpath \ + @COMPILE_IN_FILTERS_FALSE@ $(filterdir) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +@@ -272,34 +262,33 @@ + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)/gen@am__isrc@ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/gen + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ++ $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ++ $(AM_CXXFLAGS) $(CXXFLAGS) + CXXLD = $(CXX) +-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(context_filter_la_SOURCES) $(email_filter_la_SOURCES) \ +- $(libaspell_la_SOURCES) $(libpspell_la_SOURCES) \ +- $(nroff_filter_la_SOURCES) $(sgml_filter_la_SOURCES) \ +- $(tex_filter_la_SOURCES) $(texinfo_filter_la_SOURCES) \ +- $(aspell_SOURCES) $(prezip_bin_SOURCES) \ +- $(word_list_compress_SOURCES) ++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ++ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++SOURCES = $(context_filter_la_SOURCES) $(debctrl_filter_la_SOURCES) \ ++ $(email_filter_la_SOURCES) $(libaspell_la_SOURCES) \ ++ $(libpspell_la_SOURCES) $(nroff_filter_la_SOURCES) \ ++ $(sgml_filter_la_SOURCES) $(tex_filter_la_SOURCES) \ ++ $(texinfo_filter_la_SOURCES) $(aspell_SOURCES) \ ++ $(prezip_bin_SOURCES) $(word_list_compress_SOURCES) + DIST_SOURCES = $(am__context_filter_la_SOURCES_DIST) \ ++ $(am__debctrl_filter_la_SOURCES_DIST) \ + $(am__email_filter_la_SOURCES_DIST) \ + $(am__libaspell_la_SOURCES_DIST) \ + $(am__libpspell_la_SOURCES_DIST) \ +@@ -310,11 +299,10 @@ + $(prezip_bin_SOURCES) $(word_list_compress_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive ++ install-exec-recursive install-info-recursive \ ++ install-recursive installcheck-recursive installdirs-recursive \ ++ pdf-recursive ps-recursive uninstall-info-recursive \ ++ uninstall-recursive + filterDATA_INSTALL = $(INSTALL_DATA) + optDATA_INSTALL = $(INSTALL_DATA) + pkgdataDATA_INSTALL = $(INSTALL_DATA) +@@ -323,8 +311,6 @@ + am__pspell_include_HEADERS_DIST = interfaces/cc/pspell.h + pspell_includeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(include_HEADERS) $(pspell_include_HEADERS) +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -343,6 +329,8 @@ + pkgdatadir = @pkgdatadir@ + pkglibdir = @pkglibdir@ + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -352,6 +340,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ ++COMPILE_IN_FILTERS_FALSE = @COMPILE_IN_FILTERS_FALSE@ ++COMPILE_IN_FILTERS_TRUE = @COMPILE_IN_FILTERS_TRUE@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CURSES_INCLUDE = @CURSES_INCLUDE@ +@@ -374,7 +364,8 @@ + GMSGFMT = @GMSGFMT@ + GMSGFMT_015 = @GMSGFMT_015@ + GREP = @GREP@ +-INSTALL = @INSTALL@ ++INCREMENTED_SONAME_FALSE = @INCREMENTED_SONAME_FALSE@ ++INCREMENTED_SONAME_TRUE = @INCREMENTED_SONAME_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -392,8 +383,9 @@ + LTLIBINTL = @LTLIBINTL@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + MSGFMT = @MSGFMT@ + MSGFMT_015 = @MSGFMT_015@ + MSGMERGE = @MSGMERGE@ +@@ -407,6 +399,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERLPROG = @PERLPROG@ + POSUB = @POSUB@ ++PSPELL_COMPATIBILITY_FALSE = @PSPELL_COMPATIBILITY_FALSE@ ++PSPELL_COMPATIBILITY_TRUE = @PSPELL_COMPATIBILITY_TRUE@ + PTHREAD_LIB = @PTHREAD_LIB@ + RANLIB = @RANLIB@ + SED = @SED@ +@@ -417,13 +411,13 @@ + VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ + XGETTEXT_015 = @XGETTEXT_015@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -435,7 +429,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -464,15 +457,12 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign subdir-objects + SUBDIRS = . po manual + DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5 +@@ -582,6 +572,7 @@ + + ### Add the .info file your filter comes with + optfiles = \ ++ modules/filter/debctrl-filter.info\ + modules/filter/email-filter.info\ + modules/filter/tex-filter.info\ + modules/filter/sgml-filter.info\ +@@ -596,6 +587,7 @@ + modules/filter/modes/html.amf \ + modules/filter/modes/sgml.amf \ + modules/filter/modes/tex.amf \ ++ modules/filter/modes/debctrl.amf \ + modules/filter/modes/email.amf \ + modules/filter/modes/ccpp.amf \ + modules/filter/modes/none.amf \ +@@ -609,10 +601,13 @@ + + ### Add name of filter library containing your filter. Name always + ### must look like lib<filtername>-filter.la see development manual +-@COMPILE_IN_FILTERS_FALSE@filter_LTLIBRARIES = email-filter.la tex-filter.la\ ++@COMPILE_IN_FILTERS_FALSE@filter_LTLIBRARIES = debctrl-filter.la email-filter.la tex-filter.la\ + @COMPILE_IN_FILTERS_FALSE@ sgml-filter.la context-filter.la\ + @COMPILE_IN_FILTERS_FALSE@ nroff-filter.la texinfo-filter.la + ++@COMPILE_IN_FILTERS_FALSE@debctrl_filter_la_SOURCES = modules/filter/debctrl.cpp ++@COMPILE_IN_FILTERS_FALSE@debctrl_filter_la_LIBADD = libaspell.la ++@COMPILE_IN_FILTERS_FALSE@debctrl_filter_la_LDFLAGS = ${filter_ldflags} + @COMPILE_IN_FILTERS_FALSE@email_filter_la_SOURCES = modules/filter/email.cpp + @COMPILE_IN_FILTERS_FALSE@email_filter_la_LIBADD = libaspell.la + @COMPILE_IN_FILTERS_FALSE@email_filter_la_LDFLAGS = ${filter_ldflags} +@@ -692,7 +687,8 @@ + data/iso-8859-16.cmap data/iso-8859-16.cset \ + data/koi8-r.cmap data/koi8-r.cset \ + data/koi8-u.cmap data/koi8-u.cset \ +- data/dvorak.kbd data/split.kbd data/standard.kbd ++ data/dvorak.kbd data/split.kbd data/standard.kbd \ ++ data/u-deva.cmap data/u-deva.cset + + ACLOCAL_AMFLAGS = -I m4 + all: all-recursive +@@ -736,7 +732,7 @@ + gen/settings.h: gen/stamp-h1 + @if test ! -f $@; then \ + rm -f gen/stamp-h1; \ +- $(MAKE) $(AM_MAKEFLAGS) gen/stamp-h1; \ ++ $(MAKE) gen/stamp-h1; \ + else :; fi + + gen/stamp-h1: $(top_srcdir)/gen/settings.h.in $(top_builddir)/config.status +@@ -781,7 +777,7 @@ + cd $(top_builddir) && $(SHELL) ./config.status $@ + install-filterLTLIBRARIES: $(filter_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(filterdir)" || $(MKDIR_P) "$(DESTDIR)$(filterdir)" ++ test -z "$(filterdir)" || $(mkdir_p) "$(DESTDIR)$(filterdir)" + @list='$(filter_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -792,7 +788,7 @@ + + uninstall-filterLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(filter_LTLIBRARIES)'; for p in $$list; do \ ++ @set -x; list='$(filter_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(filterdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(filterdir)/$$p"; \ +@@ -808,7 +804,7 @@ + done + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -819,7 +815,7 @@ + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ +@@ -834,24 +830,28 @@ + rm -f "$${dir}/so_locations"; \ + done + modules/filter/$(am__dirstamp): +- @$(MKDIR_P) modules/filter ++ @$(mkdir_p) modules/filter + @: > modules/filter/$(am__dirstamp) + modules/filter/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) modules/filter/$(DEPDIR) ++ @$(mkdir_p) modules/filter/$(DEPDIR) + @: > modules/filter/$(DEPDIR)/$(am__dirstamp) + modules/filter/context.lo: modules/filter/$(am__dirstamp) \ + modules/filter/$(DEPDIR)/$(am__dirstamp) + context-filter.la: $(context_filter_la_OBJECTS) $(context_filter_la_DEPENDENCIES) +- $(context_filter_la_LINK) $(am_context_filter_la_rpath) $(context_filter_la_OBJECTS) $(context_filter_la_LIBADD) $(LIBS) ++ $(CXXLINK) $(am_context_filter_la_rpath) $(context_filter_la_LDFLAGS) $(context_filter_la_OBJECTS) $(context_filter_la_LIBADD) $(LIBS) ++modules/filter/debctrl.lo: modules/filter/$(am__dirstamp) \ ++ modules/filter/$(DEPDIR)/$(am__dirstamp) ++debctrl-filter.la: $(debctrl_filter_la_OBJECTS) $(debctrl_filter_la_DEPENDENCIES) ++ $(CXXLINK) $(am_debctrl_filter_la_rpath) $(debctrl_filter_la_LDFLAGS) $(debctrl_filter_la_OBJECTS) $(debctrl_filter_la_LIBADD) $(LIBS) + modules/filter/email.lo: modules/filter/$(am__dirstamp) \ + modules/filter/$(DEPDIR)/$(am__dirstamp) + email-filter.la: $(email_filter_la_OBJECTS) $(email_filter_la_DEPENDENCIES) +- $(email_filter_la_LINK) $(am_email_filter_la_rpath) $(email_filter_la_OBJECTS) $(email_filter_la_LIBADD) $(LIBS) ++ $(CXXLINK) $(am_email_filter_la_rpath) $(email_filter_la_LDFLAGS) $(email_filter_la_OBJECTS) $(email_filter_la_LIBADD) $(LIBS) + common/$(am__dirstamp): +- @$(MKDIR_P) common ++ @$(mkdir_p) common + @: > common/$(am__dirstamp) + common/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) common/$(DEPDIR) ++ @$(mkdir_p) common/$(DEPDIR) + @: > common/$(DEPDIR)/$(am__dirstamp) + common/cache.lo: common/$(am__dirstamp) \ + common/$(DEPDIR)/$(am__dirstamp) +@@ -902,10 +902,10 @@ + common/file_data_util.lo: common/$(am__dirstamp) \ + common/$(DEPDIR)/$(am__dirstamp) + modules/speller/default/$(am__dirstamp): +- @$(MKDIR_P) modules/speller/default ++ @$(mkdir_p) modules/speller/default + @: > modules/speller/default/$(am__dirstamp) + modules/speller/default/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) modules/speller/default/$(DEPDIR) ++ @$(mkdir_p) modules/speller/default/$(DEPDIR) + @: > modules/speller/default/$(DEPDIR)/$(am__dirstamp) + modules/speller/default/readonly_ws.lo: \ + modules/speller/default/$(am__dirstamp) \ +@@ -950,18 +950,18 @@ + modules/speller/default/$(am__dirstamp) \ + modules/speller/default/$(DEPDIR)/$(am__dirstamp) + modules/tokenizer/$(am__dirstamp): +- @$(MKDIR_P) modules/tokenizer ++ @$(mkdir_p) modules/tokenizer + @: > modules/tokenizer/$(am__dirstamp) + modules/tokenizer/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) modules/tokenizer/$(DEPDIR) ++ @$(mkdir_p) modules/tokenizer/$(DEPDIR) + @: > modules/tokenizer/$(DEPDIR)/$(am__dirstamp) + modules/tokenizer/basic.lo: modules/tokenizer/$(am__dirstamp) \ + modules/tokenizer/$(DEPDIR)/$(am__dirstamp) + lib/$(am__dirstamp): +- @$(MKDIR_P) lib ++ @$(mkdir_p) lib + @: > lib/$(am__dirstamp) + lib/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) lib/$(DEPDIR) ++ @$(mkdir_p) lib/$(DEPDIR) + @: > lib/$(DEPDIR)/$(am__dirstamp) + lib/filter-c.lo: lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) + lib/word_list-c.lo: lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +@@ -999,20 +999,20 @@ + modules/filter/texinfo.lo: modules/filter/$(am__dirstamp) \ + modules/filter/$(DEPDIR)/$(am__dirstamp) + libaspell.la: $(libaspell_la_OBJECTS) $(libaspell_la_DEPENDENCIES) +- $(libaspell_la_LINK) -rpath $(libdir) $(libaspell_la_OBJECTS) $(libaspell_la_LIBADD) $(LIBS) ++ $(CXXLINK) -rpath $(libdir) $(libaspell_la_LDFLAGS) $(libaspell_la_OBJECTS) $(libaspell_la_LIBADD) $(LIBS) + libpspell.la: $(libpspell_la_OBJECTS) $(libpspell_la_DEPENDENCIES) +- $(libpspell_la_LINK) $(am_libpspell_la_rpath) $(libpspell_la_OBJECTS) $(libpspell_la_LIBADD) $(LIBS) ++ $(CXXLINK) $(am_libpspell_la_rpath) $(libpspell_la_LDFLAGS) $(libpspell_la_OBJECTS) $(libpspell_la_LIBADD) $(LIBS) + nroff-filter.la: $(nroff_filter_la_OBJECTS) $(nroff_filter_la_DEPENDENCIES) +- $(nroff_filter_la_LINK) $(am_nroff_filter_la_rpath) $(nroff_filter_la_OBJECTS) $(nroff_filter_la_LIBADD) $(LIBS) ++ $(CXXLINK) $(am_nroff_filter_la_rpath) $(nroff_filter_la_LDFLAGS) $(nroff_filter_la_OBJECTS) $(nroff_filter_la_LIBADD) $(LIBS) + sgml-filter.la: $(sgml_filter_la_OBJECTS) $(sgml_filter_la_DEPENDENCIES) +- $(sgml_filter_la_LINK) $(am_sgml_filter_la_rpath) $(sgml_filter_la_OBJECTS) $(sgml_filter_la_LIBADD) $(LIBS) ++ $(CXXLINK) $(am_sgml_filter_la_rpath) $(sgml_filter_la_LDFLAGS) $(sgml_filter_la_OBJECTS) $(sgml_filter_la_LIBADD) $(LIBS) + tex-filter.la: $(tex_filter_la_OBJECTS) $(tex_filter_la_DEPENDENCIES) +- $(tex_filter_la_LINK) $(am_tex_filter_la_rpath) $(tex_filter_la_OBJECTS) $(tex_filter_la_LIBADD) $(LIBS) ++ $(CXXLINK) $(am_tex_filter_la_rpath) $(tex_filter_la_LDFLAGS) $(tex_filter_la_OBJECTS) $(tex_filter_la_LIBADD) $(LIBS) + texinfo-filter.la: $(texinfo_filter_la_OBJECTS) $(texinfo_filter_la_DEPENDENCIES) +- $(texinfo_filter_la_LINK) $(am_texinfo_filter_la_rpath) $(texinfo_filter_la_OBJECTS) $(texinfo_filter_la_LIBADD) $(LIBS) ++ $(CXXLINK) $(am_texinfo_filter_la_rpath) $(texinfo_filter_la_LDFLAGS) $(texinfo_filter_la_OBJECTS) $(texinfo_filter_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ +@@ -1039,10 +1039,10 @@ + rm -f $$p $$f ; \ + done + prog/$(am__dirstamp): +- @$(MKDIR_P) prog ++ @$(mkdir_p) prog + @: > prog/$(am__dirstamp) + prog/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) prog/$(DEPDIR) ++ @$(mkdir_p) prog/$(DEPDIR) + @: > prog/$(DEPDIR)/$(am__dirstamp) + prog/aspell.$(OBJEXT): prog/$(am__dirstamp) \ + prog/$(DEPDIR)/$(am__dirstamp) +@@ -1052,20 +1052,20 @@ + prog/$(DEPDIR)/$(am__dirstamp) + aspell$(EXEEXT): $(aspell_OBJECTS) $(aspell_DEPENDENCIES) + @rm -f aspell$(EXEEXT) +- $(CXXLINK) $(aspell_OBJECTS) $(aspell_LDADD) $(LIBS) ++ $(CXXLINK) $(aspell_LDFLAGS) $(aspell_OBJECTS) $(aspell_LDADD) $(LIBS) + prog/prezip.$(OBJEXT): prog/$(am__dirstamp) \ + prog/$(DEPDIR)/$(am__dirstamp) + prezip-bin$(EXEEXT): $(prezip_bin_OBJECTS) $(prezip_bin_DEPENDENCIES) + @rm -f prezip-bin$(EXEEXT) +- $(LINK) $(prezip_bin_OBJECTS) $(prezip_bin_LDADD) $(LIBS) ++ $(LINK) $(prezip_bin_LDFLAGS) $(prezip_bin_OBJECTS) $(prezip_bin_LDADD) $(LIBS) + prog/compress.$(OBJEXT): prog/$(am__dirstamp) \ + prog/$(DEPDIR)/$(am__dirstamp) + word-list-compress$(EXEEXT): $(word_list_compress_OBJECTS) $(word_list_compress_DEPENDENCIES) + @rm -f word-list-compress$(EXEEXT) +- $(LINK) $(word_list_compress_OBJECTS) $(word_list_compress_LDADD) $(LIBS) ++ $(LINK) $(word_list_compress_LDFLAGS) $(word_list_compress_OBJECTS) $(word_list_compress_LDADD) $(LIBS) + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ +@@ -1084,7 +1084,7 @@ + done + install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" ++ test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" + @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ +@@ -1192,6 +1192,8 @@ + -rm -f lib/word_list-c.lo + -rm -f modules/filter/context.$(OBJEXT) + -rm -f modules/filter/context.lo ++ -rm -f modules/filter/debctrl.$(OBJEXT) ++ -rm -f modules/filter/debctrl.lo + -rm -f modules/filter/email.$(OBJEXT) + -rm -f modules/filter/email.lo + -rm -f modules/filter/nroff.$(OBJEXT) +@@ -1287,6 +1289,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/string_pair_enumeration-c.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/word_list-c.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@modules/filter/$(DEPDIR)/context.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@modules/filter/$(DEPDIR)/debctrl.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@modules/filter/$(DEPDIR)/email.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@modules/filter/$(DEPDIR)/nroff.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@modules/filter/$(DEPDIR)/sgml.Plo@am__quote@ +@@ -1315,49 +1318,49 @@ + @AMDEP_TRUE@@am__include@ @am__quote@prog/$(DEPDIR)/prezip.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +-@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po ++@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \ ++@am__fastdepCC_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< + + .c.obj: +-@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +-@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po ++@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \ ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++@am__fastdepCC_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +-@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Plo ++@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \ ++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \ ++@am__fastdepCC_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + .cpp.o: +-@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +-@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Po ++@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \ ++@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + + .cpp.obj: +-@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +-@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Po ++@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \ ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .cpp.lo: +-@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +-@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +-@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Plo ++@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \ ++@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \ ++@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@@ -1375,9 +1378,10 @@ + + distclean-libtool: + -rm -f libtool ++uninstall-info-am: + install-filterDATA: $(filter_DATA) + @$(NORMAL_INSTALL) +- test -z "$(filterdir)" || $(MKDIR_P) "$(DESTDIR)$(filterdir)" ++ test -z "$(filterdir)" || $(mkdir_p) "$(DESTDIR)$(filterdir)" + @list='$(filter_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -1394,7 +1398,7 @@ + done + install-optDATA: $(opt_DATA) + @$(NORMAL_INSTALL) +- test -z "$(optdir)" || $(MKDIR_P) "$(DESTDIR)$(optdir)" ++ test -z "$(optdir)" || $(mkdir_p) "$(DESTDIR)$(optdir)" + @list='$(opt_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -1411,7 +1415,7 @@ + done + install-pkgdataDATA: $(pkgdata_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" ++ test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" + @list='$(pkgdata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -1428,7 +1432,7 @@ + done + install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" ++ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -1445,7 +1449,7 @@ + done + install-pspell_includeHEADERS: $(pspell_include_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(pspell_includedir)" || $(MKDIR_P) "$(DESTDIR)$(pspell_includedir)" ++ test -z "$(pspell_includedir)" || $(mkdir_p) "$(DESTDIR)$(pspell_includedir)" + @list='$(pspell_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -1492,7 +1496,8 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -1594,22 +1599,24 @@ + + distdir: $(DISTFILES) + $(am__remove_distdir) +- test -d $(distdir) || mkdir $(distdir) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ mkdir $(distdir) ++ $(mkdir_p) $(distdir)/auto $(distdir)/auto/MkSrc $(distdir)/common $(distdir)/data $(distdir)/gen $(distdir)/interfaces $(distdir)/interfaces/cc $(distdir)/lib $(distdir)/m4 $(distdir)/misc $(distdir)/modules $(distdir)/modules/filter $(distdir)/modules/filter/modes $(distdir)/modules/speller $(distdir)/modules/speller/default $(distdir)/modules/tokenizer $(distdir)/po $(distdir)/prog $(distdir)/scripts $(distdir)/win32 ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1623,7 +1630,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -1631,8 +1638,6 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -1643,7 +1648,7 @@ + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ++ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +@@ -1718,7 +1723,7 @@ + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' ++ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +@@ -1746,7 +1751,7 @@ + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(filterdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(filterdir)" "$(DESTDIR)$(optdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(pspell_includedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: install-recursive + install-exec: install-exec-recursive +@@ -1811,21 +1816,13 @@ + install-includeHEADERS install-optDATA install-pkgdataDATA \ + install-pkgdataSCRIPTS install-pspell_includeHEADERS + +-install-dvi: install-dvi-recursive +- + install-exec-am: install-binPROGRAMS install-binSCRIPTS \ + install-libLTLIBRARIES + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -1851,39 +1848,39 @@ + + uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-filterDATA uninstall-filterLTLIBRARIES \ +- uninstall-includeHEADERS uninstall-libLTLIBRARIES \ +- uninstall-optDATA uninstall-pkgdataDATA \ +- uninstall-pkgdataSCRIPTS uninstall-pspell_includeHEADERS ++ uninstall-includeHEADERS uninstall-info-am \ ++ uninstall-libLTLIBRARIES uninstall-optDATA \ ++ uninstall-pkgdataDATA uninstall-pkgdataSCRIPTS \ ++ uninstall-pspell_includeHEADERS + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip ++uninstall-info: uninstall-info-recursive + +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am am--refresh check check-am clean clean-binPROGRAMS \ +- clean-filterLTLIBRARIES clean-generic clean-libLTLIBRARIES \ +- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ ++ check-am clean clean-binPROGRAMS clean-filterLTLIBRARIES \ ++ clean-generic clean-libLTLIBRARIES clean-libtool \ ++ clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-compile distclean-generic distclean-hdr \ +- distclean-libtool distclean-tags distcleancheck distdir \ +- distuninstallcheck dvi dvi-am html html-am info info-am \ +- install install-am install-binPROGRAMS install-binSCRIPTS \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-filterDATA \ +- install-filterLTLIBRARIES install-html install-html-am \ ++ distclean-libtool distclean-recursive distclean-tags \ ++ distcleancheck distdir distuninstallcheck dvi dvi-am html \ ++ html-am info info-am install install-am install-binPROGRAMS \ ++ install-binSCRIPTS install-data install-data-am install-exec \ ++ install-exec-am install-filterDATA install-filterLTLIBRARIES \ + install-includeHEADERS install-info install-info-am \ +- install-libLTLIBRARIES install-man install-optDATA install-pdf \ +- install-pdf-am install-pkgdataDATA install-pkgdataSCRIPTS \ +- install-ps install-ps-am install-pspell_includeHEADERS \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am \ ++ install-libLTLIBRARIES install-man install-optDATA \ ++ install-pkgdataDATA install-pkgdataSCRIPTS \ ++ install-pspell_includeHEADERS install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local \ ++ maintainer-clean-recursive mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-filterDATA uninstall-filterLTLIBRARIES \ +- uninstall-includeHEADERS uninstall-libLTLIBRARIES \ +- uninstall-optDATA uninstall-pkgdataDATA \ +- uninstall-pkgdataSCRIPTS uninstall-pspell_includeHEADERS ++ uninstall-includeHEADERS uninstall-info-am \ ++ uninstall-libLTLIBRARIES uninstall-optDATA \ ++ uninstall-pkgdataDATA uninstall-pkgdataSCRIPTS \ ++ uninstall-pspell_includeHEADERS + + + # settings.h added as a dependency so it will get recreated if +diff -urNad aspell-0.60.5~/aclocal.m4 aspell-0.60.5/aclocal.m4 +--- aspell-0.60.5~/aclocal.m4 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/aclocal.m4 2007-02-17 20:29:30.000000000 -0500 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.10 -*- Autoconf -*- ++# generated automatically by aclocal 1.9.6 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006 Free Software Foundation, Inc. ++# 2005 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,14 +11,9 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-m4_if(m4_PACKAGE_VERSION, [2.61],, +-[m4_fatal([this file was generated for autoconf 2.61. +-You have another version of autoconf. If you want to use that, +-you should regenerate the build system entirely.], [63])]) +- + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 48 AC_PROG_LIBTOOL ++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -1402,18 +1397,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -1569,7 +1552,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1598,7 +1581,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1607,7 +1590,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -2315,7 +2298,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -2369,11 +2352,11 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -3121,7 +3104,7 @@ + freebsd-elf*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_AC_TAGVAR(ld_shlibs, $1)=yes +@@ -3280,7 +3263,7 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -3382,7 +3365,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -4647,7 +4630,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[[ABCDGIRSTW]]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -4920,7 +4903,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -4963,7 +4946,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -5006,7 +4989,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -5217,7 +5200,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +@@ -5358,6 +5341,9 @@ + cygwin* | mingw*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -5528,7 +5514,7 @@ + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -5554,12 +5540,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -5889,7 +5876,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes +@@ -5991,7 +5978,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -6393,7 +6380,7 @@ + AC_MSG_RESULT([$SED]) + ]) + +-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -6403,29 +6390,14 @@ + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. +-# (This private macro should not be called outside this file.) +-AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.10' +-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +-dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.10], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +-]) +- +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) ++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) + + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- +-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# Call AM_AUTOMAKE_VERSION so it can be traced. + # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.10])dnl +-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) ++ [AM_AUTOMAKE_VERSION([1.9.6])]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +@@ -6482,14 +6454,14 @@ + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 8 ++# serial 7 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -6498,10 +6470,8 @@ + [AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++AC_SUBST([$1_TRUE]) ++AC_SUBST([$1_FALSE]) + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -6515,14 +6485,15 @@ + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 9 ++# serial 8 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -6550,7 +6521,6 @@ + ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +@@ -6616,7 +6586,6 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -6669,8 +6638,7 @@ + AMDEPBACKSLASH='\' + fi + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++AC_SUBST([AMDEPBACKSLASH]) + ]) + + # Generate code to set up dependency tracking. -*- Autoconf -*- +@@ -6695,9 +6663,8 @@ + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue +@@ -6756,8 +6723,8 @@ + + # Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006 Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -6780,20 +6747,16 @@ + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.60])dnl ++[AC_PREREQ([2.58])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- fi ++# test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi + + # test whether we have cygpath +@@ -6813,9 +6776,6 @@ + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], + [_AM_SET_OPTIONS([$1])dnl +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +@@ -6851,10 +6811,6 @@ + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + ]) + ]) + +@@ -6890,7 +6846,7 @@ + # Define $install_sh. + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++install_sh=${install_sh-"$am_aux_dir/install-sh"} + AC_SUBST(install_sh)]) + + # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +@@ -6995,14 +6951,13 @@ + rm -f confinc confmf + ]) + +-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 ++# serial 3 + + # AM_PROG_CC_C_O + # -------------- +@@ -7010,7 +6965,6 @@ + AC_DEFUN([AM_PROG_CC_C_O], + [AC_REQUIRE([AC_PROG_CC_C_O])dnl + AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([compile])dnl + # FIXME: we rely on the cache variable name because + # there is no other way. + set dummy $CC +@@ -7023,22 +6977,18 @@ + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" + fi +-dnl Make sure AC_PROG_CC is never called again, or it will override our +-dnl setting of CC. +-m4_define([AC_PROG_CC], +- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) + ]) + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 ++# serial 4 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -7054,7 +7004,6 @@ + # If it does, set am_missing_run to use it, otherwise, to nothing. + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl + test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then +@@ -7065,7 +7014,7 @@ + fi + ]) + +-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -7073,23 +7022,60 @@ + + # AM_PROG_MKDIR_P + # --------------- +-# Check for `mkdir -p'. ++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. ++# ++# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories ++# created by `make install' are always world readable, even if the ++# installer happens to have an overly restrictive umask (e.g. 077). ++# This was a mistake. There are at least two reasons why we must not ++# use `-m 0755': ++# - it causes special bits like SGID to be ignored, ++# - it may be too restrictive (some setups expect 775 directories). ++# ++# Do not use -m 0755 and let people choose whatever they expect by ++# setting umask. ++# ++# We cannot accept any implementation of `mkdir' that recognizes `-p'. ++# Some implementations (such as Solaris 8's) are not thread-safe: if a ++# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' ++# concurrently, both version can detect that a/ is missing, but only ++# one can create it and the other will error out. Consequently we ++# restrict ourselves to GNU make (using the --version option ensures ++# this.) + AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +-]) ++[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++ # We used to keeping the `.' as first argument, in order to ++ # allow $(mkdir_p) to be used without argument. As in ++ # $(mkdir_p) $(somedir) ++ # where $(somedir) is conditionally defined. However this is wrong ++ # for two reasons: ++ # 1. if the package is installed by a user who cannot write `.' ++ # make install will fail, ++ # 2. the above comment should most certainly read ++ # $(mkdir_p) $(DESTDIR)$(somedir) ++ # so it does not work when $(somedir) is undefined and ++ # $(DESTDIR) is not. ++ # To support the latter case, we have to write ++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), ++ # so the `.' trick is pointless. ++ mkdir_p='mkdir -p --' ++else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ for d in ./-p ./--version; ++ do ++ test -d $d && rmdir $d ++ done ++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. ++ if test -f "$ac_aux_dir/mkinstalldirs"; then ++ mkdir_p='$(mkinstalldirs)' ++ else ++ mkdir_p='$(install_sh) -d' ++ fi ++fi ++AC_SUBST([mkdir_p])]) + + # Helper functions for option handling. -*- Autoconf -*- + +@@ -7201,21 +7187,9 @@ + if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) + fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) +- + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004, 2005 Free Software Foundation, Inc. +diff -urNad aspell-0.60.5~/config.guess aspell-0.60.5/config.guess +--- aspell-0.60.5~/config.guess 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/config.guess 2007-02-17 20:29:34.000000000 -0500 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ++# Inc. + +-timestamp='2005-12-13' ++timestamp='2006-07-02' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -106,7 +107,7 @@ + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; + trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +@@ -206,8 +207,11 @@ + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; + macppc:MirBSD:*:*) +- echo powerppc-unknown-mirbsd${UNAME_RELEASE} ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} +@@ -764,7 +768,14 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +@@ -779,8 +790,11 @@ + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- x86:Interix*:[345]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' ++ x86:Interix*:[3456]*) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ EM64T:Interix*:[3456]*) ++ echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +@@ -817,6 +831,9 @@ + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; +@@ -851,7 +868,11 @@ + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) +@@ -870,7 +891,11 @@ + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +@@ -967,7 +992,7 @@ + LIBC=gnulibc1 + # endif + #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) ++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout +@@ -977,7 +1002,11 @@ + LIBC=dietlibc + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^LIBC/{ ++ s: ::g ++ p ++ }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit +diff -urNad aspell-0.60.5~/config.sub aspell-0.60.5/config.sub +--- aspell-0.60.5~/config.sub 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/config.sub 2007-02-17 20:29:34.000000000 -0500 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ++# Inc. + +-timestamp='2005-12-11' ++timestamp='2006-09-20' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -240,7 +241,7 @@ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +@@ -248,7 +249,8 @@ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ +- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -268,26 +270,25 @@ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ ++ | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ +- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ +- | sparcv8 | sparcv9 | sparcv9b \ +- | strongarm \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ +- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; +- m32c) +- basic_machine=$basic_machine-unknown +- ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown +@@ -317,7 +318,7 @@ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* \ ++ | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ +@@ -328,7 +329,7 @@ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ +- | m32r-* | m32rle-* \ ++ | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ +@@ -350,29 +351,28 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ +- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) + ;; +- m32c-*) +- ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) +@@ -818,6 +818,12 @@ + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +@@ -904,6 +910,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; + sei) + basic_machine=mips-sei + os=-seiux +@@ -1120,7 +1130,7 @@ + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sparc | sparcv8 | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) +@@ -1193,7 +1203,8 @@ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +@@ -1208,7 +1219,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos*) ++ | -skyos* | -haiku* | -rdos* | -toppers*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1360,6 +1371,12 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1369,9 +1386,9 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff +- ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 +diff -urNad aspell-0.60.5~/configure aspell-0.60.5/configure +--- aspell-0.60.5~/configure 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/configure 2007-02-17 20:29:31.000000000 -0500 +@@ -820,7 +820,6 @@ + INSTALL_PROGRAM + INSTALL_SCRIPT + INSTALL_DATA +-am__isrc + CYGPATH_W + PACKAGE + VERSION +@@ -2146,8 +2145,7 @@ + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- +-am__api_version='1.10' +- ++am__api_version="1.9" + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: +@@ -2299,53 +2297,38 @@ + echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +-if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++ # We used to keeping the `.' as first argument, in order to ++ # allow $(mkdir_p) to be used without argument. As in ++ # $(mkdir_p) $(somedir) ++ # where $(somedir) is conditionally defined. However this is wrong ++ # for two reasons: ++ # 1. if the package is installed by a user who cannot write `.' ++ # make install will fail, ++ # 2. the above comment should most certainly read ++ # $(mkdir_p) $(DESTDIR)$(somedir) ++ # so it does not work when $(somedir) is undefined and ++ # $(DESTDIR) is not. ++ # To support the latter case, we have to write ++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), ++ # so the `.' trick is pointless. ++ mkdir_p='mkdir -p --' + else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue +- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +- 'mkdir (GNU coreutils) '* | \ +- 'mkdir (coreutils) '* | \ +- 'mkdir (fileutils) '4.1*) +- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext +- break 3;; +- esac +- done +- done +-done +-IFS=$as_save_IFS +- +-fi +- +- if test "${ac_cv_path_mkdir+set}" = set; then +- MKDIR_P="$ac_cv_path_mkdir -p" ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ for d in ./-p ./--version; ++ do ++ test -d $d && rmdir $d ++ done ++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. ++ if test -f "$ac_aux_dir/mkinstalldirs"; then ++ mkdir_p='$(mkinstalldirs)' + else +- # As a last resort, use the slow shell script. Don't cache a +- # value for MKDIR_P within a source directory, because that will +- # break other packages using the cache if that directory is +- # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version +- MKDIR_P="$ac_install_sh -d" ++ mkdir_p='$(install_sh) -d' + fi + fi +-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +-echo "${ECHO_T}$MKDIR_P" >&6; } +- +-mkdir_p="$MKDIR_P" +-case $mkdir_p in +- [\\/$]* | ?:[\\/]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac + + for ac_prog in gawk mawk nawk awk + do +@@ -2428,16 +2411,12 @@ + fi + rmdir .tst 2>/dev/null + +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- am__isrc=' -I$(srcdir)' +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++# test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 + echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } +- fi + fi + + # test whether we have cygpath +@@ -2480,7 +2459,7 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++install_sh=${install_sh-"$am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2584,7 +2563,7 @@ + fi + + fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -2612,7 +2591,9 @@ + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } +- if test $USE_MAINTAINER_MODE = yes; then ++ ++ ++if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' + else +@@ -3391,7 +3372,9 @@ + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- if test "x$enable_dependency_tracking" != xno; then ++ ++ ++if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -3401,6 +3384,7 @@ + + + ++ + depcc="$CXX" am_compiler_list= + + { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +@@ -3468,7 +3452,6 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -3498,7 +3481,9 @@ + echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +- if ++ ++ ++if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= +@@ -4264,7 +4249,6 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -4294,7 +4278,9 @@ + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- if ++ ++ ++if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -4431,7 +4417,6 @@ + fi + + +- + # Check whether --enable-static was given. + if test "${enable_static+set}" = set; then + enableval=$enable_static; p=${PACKAGE-default} +@@ -4973,7 +4958,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -5027,11 +5012,11 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -5148,7 +5133,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5151 "configure"' > conftest.$ac_ext ++ echo '#line 5136 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -6596,7 +6581,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -7402,11 +7387,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7405: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7390: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7409: \$? = $ac_status" >&5 ++ echo "$as_me:7394: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7564,7 +7549,7 @@ + lt_prog_compiler_static='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl='-Wl,' +@@ -7670,11 +7655,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7673: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7658: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7677: \$? = $ac_status" >&5 ++ echo "$as_me:7662: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7774,11 +7759,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7777: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7762: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7781: \$? = $ac_status" >&5 ++ echo "$as_me:7766: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8003,7 +7988,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -8029,12 +8014,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs=no + else + ld_shlibs=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -8462,7 +8448,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -8564,7 +8550,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -9054,18 +9040,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -9221,7 +9195,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -9250,7 +9224,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -9259,7 +9233,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -10082,7 +10056,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10085 "configure" ++#line 10059 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10182,7 +10156,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10185 "configure" ++#line 10159 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11495,7 +11469,7 @@ + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes +@@ -11654,7 +11628,7 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -11756,7 +11730,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -12323,7 +12297,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -12366,7 +12340,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -12409,7 +12383,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -12518,11 +12492,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12521: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12495: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12525: \$? = $ac_status" >&5 ++ echo "$as_me:12499: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -12622,11 +12596,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12625: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12599: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12629: \$? = $ac_status" >&5 ++ echo "$as_me:12603: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12694,6 +12668,9 @@ + cygwin* | mingw*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -12973,18 +12950,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -13140,7 +13105,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -13169,7 +13134,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -13178,7 +13143,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -14086,7 +14051,7 @@ + lt_prog_compiler_static_F77='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_F77='-Wl,' +@@ -14192,11 +14157,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14195: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14160: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14199: \$? = $ac_status" >&5 ++ echo "$as_me:14164: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14296,11 +14261,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14299: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14264: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14303: \$? = $ac_status" >&5 ++ echo "$as_me:14268: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14525,7 +14490,7 @@ + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -14551,12 +14516,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -14964,7 +14930,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes +@@ -15066,7 +15032,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -15556,18 +15522,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -15723,7 +15677,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15752,7 +15706,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15761,7 +15715,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -16494,11 +16448,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16497: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16451: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16501: \$? = $ac_status" >&5 ++ echo "$as_me:16455: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16656,7 +16610,7 @@ + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -16762,11 +16716,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16765: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16719: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16769: \$? = $ac_status" >&5 ++ echo "$as_me:16723: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16866,11 +16820,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16869: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16823: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16873: \$? = $ac_status" >&5 ++ echo "$as_me:16827: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17095,7 +17049,7 @@ + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -17121,12 +17075,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -17554,7 +17509,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes +@@ -17656,7 +17611,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -18146,18 +18101,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -18313,7 +18256,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -18342,7 +18285,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -18351,7 +18294,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -19942,7 +19885,9 @@ + + fi + +- if test "$enable_compile_in_filters" = "yes"; then ++ ++ ++if test "$enable_compile_in_filters" = "yes"; then + COMPILE_IN_FILTERS_TRUE= + COMPILE_IN_FILTERS_FALSE='#' + else +@@ -19951,7 +19896,9 @@ + fi + + +- if test "$enable_pspell_compatibility" != "no"; then ++ ++ ++if test "$enable_pspell_compatibility" != "no"; then + PSPELL_COMPATIBILITY_TRUE= + PSPELL_COMPATIBILITY_FALSE='#' + else +@@ -19959,7 +19906,9 @@ + PSPELL_COMPATIBILITY_FALSE= + fi + +- if test "$enable_incremented_soname" = "yes"; then ++ ++ ++if test "$enable_incremented_soname" = "yes"; then + INCREMENTED_SONAME_TRUE= + INCREMENTED_SONAME_FALSE='#' + else +@@ -23992,7 +23941,6 @@ + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' +-MKDIR_P='$MKDIR_P' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -24240,7 +24188,6 @@ + INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim + INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim + INSTALL_DATA!$INSTALL_DATA$ac_delim +-am__isrc!$am__isrc$ac_delim + CYGPATH_W!$CYGPATH_W$ac_delim + PACKAGE!$PACKAGE$ac_delim + VERSION!$VERSION$ac_delim +@@ -24285,6 +24232,7 @@ + CFLAGS!$CFLAGS$ac_delim + ac_ct_CC!$ac_ct_CC$ac_delim + CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -24326,7 +24274,6 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim + am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim + GREP!$GREP$ac_delim + EGREP!$EGREP$ac_delim +@@ -24370,7 +24317,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -24597,11 +24544,6 @@ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac +- ac_MKDIR_P=$MKDIR_P +- case $MKDIR_P in +- [\\/$]* | ?:[\\/]* ) ;; +- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; +- esac + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -24655,7 +24597,6 @@ + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t +-s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +@@ -24820,9 +24761,8 @@ + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ +diff -urNad aspell-0.60.5~/depcomp aspell-0.60.5/depcomp +--- aspell-0.60.5~/depcomp 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/depcomp 2007-02-17 20:29:34.000000000 -0500 +@@ -1,10 +1,9 @@ + #! /bin/sh + # depcomp - compile a program generating dependencies as side-effects + +-scriptversion=2006-10-15.18 ++scriptversion=2005-07-09.11 + +-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +-# Foundation, Inc. ++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -92,20 +91,7 @@ + ## gcc 3 implements dependency tracking that does exactly what + ## we want. Yay! Note: for some reason libtool 1.4 doesn't like + ## it if -MD -MP comes after the -MF stuff. Hmm. +-## Unfortunately, FreeBSD c89 acceptance of flags depends upon +-## the command line argument order; so add the flags where they +-## appear in depend2.am. Note that the slowdown incurred here +-## affects only configure: in makefiles, %FASTDEP% shortcuts this. +- for arg +- do +- case $arg in +- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; +- *) set fnord "$@" "$arg" ;; +- esac +- shift # fnord +- shift # $arg +- done +- "$@" ++ "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else +@@ -290,46 +276,6 @@ + rm -f "$tmpdepfile" + ;; + +-hp2) +- # The "hp" stanza above does not work with aCC (C++) and HP's ia64 +- # compilers, which have integrated preprocessors. The correct option +- # to use with these is +Maked; it writes dependencies to a file named +- # 'foo.d', which lands next to the object file, wherever that +- # happens to be. +- # Much of this is similar to the tru64 case; see comments there. +- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` +- test "x$dir" = "x$object" && dir= +- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` +- if test "$libtool" = yes; then +- tmpdepfile1=$dir$base.d +- tmpdepfile2=$dir.libs/$base.d +- "$@" -Wc,+Maked +- else +- tmpdepfile1=$dir$base.d +- tmpdepfile2=$dir$base.d +- "$@" +Maked +- fi +- stat=$? +- if test $stat -eq 0; then : +- else +- rm -f "$tmpdepfile1" "$tmpdepfile2" +- exit $stat +- fi +- +- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" +- do +- test -f "$tmpdepfile" && break +- done +- if test -f "$tmpdepfile"; then +- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" +- # Add `dependent.h:' lines. +- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" +- else +- echo "#dummy" > "$depfile" +- fi +- rm -f "$tmpdepfile" "$tmpdepfile2" +- ;; +- + tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +@@ -342,13 +288,13 @@ + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a +- # static library. This mechanism is used in libtool 1.4 series to ++ # static library. This mecanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two +- # compilations output dependencies in $dir.libs/$base.o.d and ++ # compilations output dependencies in in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is +diff -urNad aspell-0.60.5~/examples/Makefile.in aspell-0.60.5/examples/Makefile.in +--- aspell-0.60.5~/examples/Makefile.in 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/examples/Makefile.in 2007-02-17 20:29:33.000000000 -0500 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,9 +14,13 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -53,18 +57,17 @@ + am_list_dicts_OBJECTS = list-dicts.$(OBJEXT) + list_dicts_OBJECTS = $(am_list_dicts_OBJECTS) + list_dicts_DEPENDENCIES = ../libaspell.la +-DEFAULT_INCLUDES = -I. -I$(top_builddir)/gen@am__isrc@ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/gen + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ++ $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(example_c_SOURCES) $(list_dicts_SOURCES) + DIST_SOURCES = $(example_c_SOURCES) $(list_dicts_SOURCES) + ETAGS = etags +@@ -73,6 +76,8 @@ + pkgdatadir = @pkgdatadir@ + pkglibdir = @pkglibdir@ + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -82,6 +87,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ ++COMPILE_IN_FILTERS_FALSE = @COMPILE_IN_FILTERS_FALSE@ ++COMPILE_IN_FILTERS_TRUE = @COMPILE_IN_FILTERS_TRUE@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CURSES_INCLUDE = @CURSES_INCLUDE@ +@@ -104,7 +111,8 @@ + GMSGFMT = @GMSGFMT@ + GMSGFMT_015 = @GMSGFMT_015@ + GREP = @GREP@ +-INSTALL = @INSTALL@ ++INCREMENTED_SONAME_FALSE = @INCREMENTED_SONAME_FALSE@ ++INCREMENTED_SONAME_TRUE = @INCREMENTED_SONAME_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -122,8 +130,9 @@ + LTLIBINTL = @LTLIBINTL@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + MSGFMT = @MSGFMT@ + MSGFMT_015 = @MSGFMT_015@ + MSGMERGE = @MSGMERGE@ +@@ -137,6 +146,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERLPROG = @PERLPROG@ + POSUB = @POSUB@ ++PSPELL_COMPATIBILITY_FALSE = @PSPELL_COMPATIBILITY_FALSE@ ++PSPELL_COMPATIBILITY_TRUE = @PSPELL_COMPATIBILITY_TRUE@ + PTHREAD_LIB = @PTHREAD_LIB@ + RANLIB = @RANLIB@ + SED = @SED@ +@@ -147,13 +158,13 @@ + VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ + XGETTEXT_015 = @XGETTEXT_015@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -165,7 +176,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -194,15 +204,12 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + AM_CPPFLAGS = -I${top_srcdir}/interfaces/cc/ -I${top_srcdir}/common + example_c_SOURCES = example-c.c + example_c_LDADD = ../libaspell.la +@@ -221,9 +228,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/Makefile ++ $(AUTOMAKE) --gnu examples/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -250,10 +257,10 @@ + done + example-c$(EXEEXT): $(example_c_OBJECTS) $(example_c_DEPENDENCIES) + @rm -f example-c$(EXEEXT) +- $(LINK) $(example_c_OBJECTS) $(example_c_LDADD) $(LIBS) ++ $(LINK) $(example_c_LDFLAGS) $(example_c_OBJECTS) $(example_c_LDADD) $(LIBS) + list-dicts$(EXEEXT): $(list_dicts_OBJECTS) $(list_dicts_DEPENDENCIES) + @rm -f list-dicts$(EXEEXT) +- $(LINK) $(list_dicts_OBJECTS) $(list_dicts_LDADD) $(LIBS) ++ $(LINK) $(list_dicts_LDFLAGS) $(list_dicts_OBJECTS) $(list_dicts_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -265,22 +272,22 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-dicts.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -291,6 +298,10 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -340,21 +351,22 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -402,7 +414,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + +@@ -416,20 +428,12 @@ + + install-data-am: + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -450,22 +454,19 @@ + + ps-am: + +-uninstall-am: +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ ++ install install-am install-data install-data-am install-exec \ ++ install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-info-am + + # 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 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2006-10-14.15 ++scriptversion=2005-05-14.22 + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -39,24 +39,15 @@ + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +-# from scratch. +- +-nl=' +-' +-IFS=" "" $nl" ++# from scratch. It can only install one file at a time, a restriction ++# shared with many OS's install programs. + + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. + doit="${DOITPROG-}" +-if test -z "$doit"; then +- doit_exec=exec +-else +- doit_exec=$doit +-fi + +-# Put in absolute file names if you don't have them in your path; +-# or use environment vars. ++# put in absolute paths if you don't have them in your path; or use env. vars. + + mvprog="${MVPROG-mv}" + cpprog="${CPPROG-cp}" +@@ -67,13 +58,7 @@ + rmprog="${RMPROG-rm}" + mkdirprog="${MKDIRPROG-mkdir}" + +-posix_glob= +-posix_mkdir= +- +-# Desired mode of installed file. +-mode=0755 +- +-chmodcmd=$chmodprog ++chmodcmd="$chmodprog 0755" + chowncmd= + chgrpcmd= + stripcmd= +@@ -110,7 +95,7 @@ + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + " + +-while test $# -ne 0; do ++while test -n "$1"; do + case $1 in + -c) shift + continue;; +@@ -126,15 +111,9 @@ + + --help) echo "$usage"; exit $?;; + +- -m) mode=$2 ++ -m) chmodcmd="$chmodprog $2" + shift + shift +- case $mode in +- *' '* | *' '* | *' +-'* | *'*'* | *'?'* | *'['*) +- echo "$0: invalid mode: $mode" >&2 +- exit 1;; +- esac + continue;; + + -o) chowncmd="$chownprog $2" +@@ -157,33 +136,25 @@ + + --version) echo "$0 $scriptversion"; exit $?;; + +- --) shift ++ *) # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ test -n "$dir_arg$dstarg" && break ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dstarg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dstarg" ++ shift # fnord ++ fi ++ shift # arg ++ dstarg=$arg ++ done + break;; +- +- -*) echo "$0: invalid option: $1" >&2 +- exit 1;; +- +- *) break;; + esac + done + +-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +- # When -d is used, all remaining arguments are directories to create. +- # When -t is used, the destination is already specified. +- # Otherwise, the last argument is the destination. Remove it from $@. +- for arg +- do +- if test -n "$dstarg"; then +- # $@ is not empty: it contains at least $arg. +- set fnord "$@" "$dstarg" +- shift # fnord +- fi +- shift # arg +- dstarg=$arg +- done +-fi +- +-if test $# -eq 0; then ++if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 +@@ -193,33 +164,6 @@ + exit 0 + fi + +-if test -z "$dir_arg"; then +- trap '(exit $?); exit' 1 2 13 15 +- +- # Set umask so as not to create temps with too-generous modes. +- # However, 'strip' requires both read and write access to temps. +- case $mode in +- # Optimize common cases. +- *644) cp_umask=133;; +- *755) cp_umask=22;; +- +- *[0-7]) +- if test -z "$stripcmd"; then +- u_plus_rw= +- else +- u_plus_rw='% 200' +- fi +- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; +- *) +- if test -z "$stripcmd"; then +- u_plus_rw= +- else +- u_plus_rw=,u+rw +- fi +- cp_umask=$mode$u_plus_rw;; +- esac +-fi +- + for src + do + # Protect names starting with `-'. +@@ -229,11 +173,15 @@ + + if test -n "$dir_arg"; then + dst=$src +- dstdir=$dst +- test -d "$dstdir" +- dstdir_status=$? +- else ++ src= + ++ if test -d "$dst"; then ++ mkdircmd=: ++ chmodcmd= ++ else ++ mkdircmd=$mkdirprog ++ fi ++ else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. +@@ -260,188 +208,53 @@ + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi +- dstdir=$dst +- dst=$dstdir/`basename "$src"` +- dstdir_status=0 +- else +- # Prefer dirname, but fall back on a substitute if dirname fails. +- dstdir=` +- (dirname "$dst") 2>/dev/null || +- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$dst" : 'X\(//\)[^/]' \| \ +- X"$dst" : 'X\(//\)$' \| \ +- X"$dst" : 'X\(/\)' \| . 2>/dev/null || +- echo X"$dst" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q' +- ` +- +- test -d "$dstdir" +- dstdir_status=$? ++ dst=$dst/`basename "$src"` + fi + fi + +- obsolete_mkdir_used=false +- +- if test $dstdir_status != 0; then +- case $posix_mkdir in +- '') +- # Create intermediate dirs using mode 755 as modified by the umask. +- # This is like FreeBSD 'install' as of 1997-10-28. +- umask=`umask` +- case $stripcmd.$umask in +- # Optimize common cases. +- *[2367][2367]) mkdir_umask=$umask;; +- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; +- +- *[0-7]) +- mkdir_umask=`expr $umask + 22 \ +- - $umask % 100 % 40 + $umask % 20 \ +- - $umask % 10 % 4 + $umask % 2 +- `;; +- *) mkdir_umask=$umask,go-w;; +- esac +- +- # With -d, create the new directory with the user-specified mode. +- # Otherwise, rely on $mkdir_umask. +- if test -n "$dir_arg"; then +- mkdir_mode=-m$mode +- else +- mkdir_mode= +- fi +- +- posix_mkdir=false +- case $umask in +- *[123567][0-7][0-7]) +- # POSIX mkdir -p sets u+wx bits regardless of umask, which +- # is incompatible with FreeBSD 'install' when (umask & 300) != 0. +- ;; +- *) +- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ +- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 +- +- if (umask $mkdir_umask && +- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 +- then +- if test -z "$dir_arg" || { +- # Check for POSIX incompatibilities with -m. +- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or +- # other-writeable bit of parent directory when it shouldn't. +- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. +- ls_ld_tmpdir=`ls -ld "$tmpdir"` +- case $ls_ld_tmpdir in +- d????-?r-*) different_mode=700;; +- d????-?--*) different_mode=755;; +- *) false;; +- esac && +- $mkdirprog -m$different_mode -p -- "$tmpdir" && { +- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` +- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" +- } +- } +- then posix_mkdir=: +- fi +- rmdir "$tmpdir/d" "$tmpdir" +- else +- # Remove any dirs left behind by ancient mkdir implementations. +- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null +- fi +- trap '' 0;; +- esac;; +- esac ++ # This sed command emulates the dirname command. ++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + +- if +- $posix_mkdir && ( +- umask $mkdir_umask && +- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" +- ) +- then : +- else ++ # Make sure that the destination directory exists. + +- # The umask is ridiculous, or mkdir does not conform to POSIX, +- # or it failed possibly due to a race condition. Create the +- # directory the slow way, step by step, checking for races as we go. ++ # Skip lots of stat calls in the usual case. ++ if test ! -d "$dstdir"; then ++ defaultIFS=' ++ ' ++ IFS="${IFS-$defaultIFS}" + +- case $dstdir in +- /*) prefix=/ ;; +- -*) prefix=./ ;; +- *) prefix= ;; +- esac ++ oIFS=$IFS ++ # Some sh's can't handle IFS=/ for some reason. ++ IFS='%' ++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ++ shift ++ IFS=$oIFS + +- case $posix_glob in +- '') +- if (set -f) 2>/dev/null; then +- posix_glob=true +- else +- posix_glob=false +- fi ;; +- esac ++ pathcomp= + +- oIFS=$IFS +- IFS=/ +- $posix_glob && set -f +- set fnord $dstdir ++ while test $# -ne 0 ; do ++ pathcomp=$pathcomp$1 + shift +- $posix_glob && set +f +- IFS=$oIFS +- +- prefixes= +- +- for d +- do +- test -z "$d" && continue +- +- prefix=$prefix$d +- if test -d "$prefix"; then +- prefixes= +- else +- if $posix_mkdir; then +- (umask=$mkdir_umask && +- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break +- # Don't fail if two instances are running concurrently. +- test -d "$prefix" || exit 1 +- else +- case $prefix in +- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; +- *) qprefix=$prefix;; +- esac +- prefixes="$prefixes '$qprefix'" +- fi +- fi +- prefix=$prefix/ +- done +- +- if test -n "$prefixes"; then +- # Don't fail if two instances are running concurrently. +- (umask $mkdir_umask && +- eval "\$doit_exec \$mkdirprog $prefixes") || +- test -d "$dstdir" || exit 1 +- obsolete_mkdir_used=true ++ if test ! -d "$pathcomp"; then ++ $mkdirprog "$pathcomp" ++ # mkdir can fail with a `File exist' error in case several ++ # install-sh are creating the directory concurrently. This ++ # is OK. ++ test -d "$pathcomp" || exit + fi +- fi ++ pathcomp=$pathcomp/ ++ done + fi + + if test -n "$dir_arg"; then +- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && +- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && +- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || +- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 ++ $doit $mkdircmd "$dst" \ ++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ++ + else ++ dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ +@@ -449,9 +262,10 @@ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. +- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && ++ $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # +@@ -462,10 +276,10 @@ + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ +- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. +- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ ++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not +@@ -477,12 +291,11 @@ + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { +- if test -f "$dst"; then +- $doit $rmcmd -f "$dst" 2>/dev/null \ +- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ +- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ ++ if test -f "$dstdir/$dstfile"; then ++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { +- echo "$0: cannot unlink or rename $dst" >&2 ++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else +@@ -491,14 +304,17 @@ + } && + + # Now rename the file to the real destination. +- $doit $mvcmd "$dsttmp" "$dst" ++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } +- } || exit 1 +- +- trap '' 0 +- fi ++ } ++ fi || { (exit 1); exit 1; } + done + ++# The final little trick to "correctly" pass the exit status to the exit trap. ++{ ++ (exit 0); exit 0 ++} ++ + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" +diff -urNad aspell-0.60.5~/lib5/Makefile.in aspell-0.60.5/lib5/Makefile.in +--- aspell-0.60.5~/lib5/Makefile.in 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/lib5/Makefile.in 2007-02-17 20:29:33.000000000 -0500 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,9 +14,13 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -59,32 +63,25 @@ + am__libaspell_la_SOURCES_DIST = aspell-dummy.cpp + @INCREMENTED_SONAME_TRUE@am_libaspell_la_OBJECTS = aspell-dummy.lo + libaspell_la_OBJECTS = $(am_libaspell_la_OBJECTS) +-libaspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(libaspell_la_LDFLAGS) $(LDFLAGS) -o $@ + @INCREMENTED_SONAME_TRUE@am_libaspell_la_rpath = -rpath $(libdir) + @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_DEPENDENCIES = ../libaspell.la + am__libpspell_la_SOURCES_DIST = pspell-dummy.cpp + @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@am_libpspell_la_OBJECTS = pspell-dummy.lo + libpspell_la_OBJECTS = $(am_libpspell_la_OBJECTS) +-libpspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(libpspell_la_LDFLAGS) $(LDFLAGS) -o $@ + @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@am_libpspell_la_rpath = \ + @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@ -rpath \ + @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@ $(libdir) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)/gen@am__isrc@ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/gen + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ++ $(AM_CXXFLAGS) $(CXXFLAGS) + CXXLD = $(CXX) +-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ++ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(libaspell_la_SOURCES) $(libpspell_la_SOURCES) + DIST_SOURCES = $(am__libaspell_la_SOURCES_DIST) \ + $(am__libpspell_la_SOURCES_DIST) +@@ -94,6 +91,8 @@ + pkgdatadir = @pkgdatadir@ + pkglibdir = @pkglibdir@ + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -103,6 +102,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ ++COMPILE_IN_FILTERS_FALSE = @COMPILE_IN_FILTERS_FALSE@ ++COMPILE_IN_FILTERS_TRUE = @COMPILE_IN_FILTERS_TRUE@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CURSES_INCLUDE = @CURSES_INCLUDE@ +@@ -125,7 +126,8 @@ + GMSGFMT = @GMSGFMT@ + GMSGFMT_015 = @GMSGFMT_015@ + GREP = @GREP@ +-INSTALL = @INSTALL@ ++INCREMENTED_SONAME_FALSE = @INCREMENTED_SONAME_FALSE@ ++INCREMENTED_SONAME_TRUE = @INCREMENTED_SONAME_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -143,8 +145,9 @@ + LTLIBINTL = @LTLIBINTL@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + MSGFMT = @MSGFMT@ + MSGFMT_015 = @MSGFMT_015@ + MSGMERGE = @MSGMERGE@ +@@ -158,6 +161,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERLPROG = @PERLPROG@ + POSUB = @POSUB@ ++PSPELL_COMPATIBILITY_FALSE = @PSPELL_COMPATIBILITY_FALSE@ ++PSPELL_COMPATIBILITY_TRUE = @PSPELL_COMPATIBILITY_TRUE@ + PTHREAD_LIB = @PTHREAD_LIB@ + RANLIB = @RANLIB@ + SED = @SED@ +@@ -168,13 +173,13 @@ + VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ + XGETTEXT_015 = @XGETTEXT_015@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -186,7 +191,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -215,15 +219,12 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + @INCREMENTED_SONAME_TRUE@lib_LTLIBRARIES = libaspell.la \ + @INCREMENTED_SONAME_TRUE@ $(am__append_1) + @INCREMENTED_SONAME_TRUE@libaspell_la_SOURCES = aspell-dummy.cpp +@@ -245,9 +246,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib5/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib5/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign lib5/Makefile ++ $(AUTOMAKE) --gnu lib5/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -267,7 +268,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -278,7 +279,7 @@ + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ +@@ -293,9 +294,9 @@ + rm -f "$${dir}/so_locations"; \ + done + libaspell.la: $(libaspell_la_OBJECTS) $(libaspell_la_DEPENDENCIES) +- $(libaspell_la_LINK) $(am_libaspell_la_rpath) $(libaspell_la_OBJECTS) $(libaspell_la_LIBADD) $(LIBS) ++ $(CXXLINK) $(am_libaspell_la_rpath) $(libaspell_la_LDFLAGS) $(libaspell_la_OBJECTS) $(libaspell_la_LIBADD) $(LIBS) + libpspell.la: $(libpspell_la_OBJECTS) $(libpspell_la_DEPENDENCIES) +- $(libpspell_la_LINK) $(am_libpspell_la_rpath) $(libpspell_la_OBJECTS) $(libpspell_la_LIBADD) $(LIBS) ++ $(CXXLINK) $(am_libpspell_la_rpath) $(libpspell_la_LDFLAGS) $(libpspell_la_OBJECTS) $(libpspell_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -307,22 +308,22 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pspell-dummy.Plo@am__quote@ + + .cpp.o: +-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + + .cpp.obj: +-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .cpp.lo: +-@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@@ -333,6 +334,10 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -382,21 +387,22 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -412,7 +418,7 @@ + all-am: Makefile $(LTLIBRARIES) + installdirs: + for dir in "$(DESTDIR)$(libdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -447,7 +453,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + +@@ -461,20 +467,12 @@ + + install-data-am: + +-install-dvi: install-dvi-am +- + install-exec-am: install-libLTLIBRARIES + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -495,23 +493,20 @@ + + ps-am: + +-uninstall-am: uninstall-libLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am \ +- install-libLTLIBRARIES install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ ++ install install-am install-data install-data-am install-exec \ ++ install-exec-am install-info install-info-am \ ++ install-libLTLIBRARIES install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-libLTLIBRARIES ++ tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-libLTLIBRARIES + + # 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~/ltmain.sh aspell-0.60.5/ltmain.sh +--- aspell-0.60.5~/ltmain.sh 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/ltmain.sh 2006-03-11 13:49:04.000000000 -0500 +@@ -43,7 +43,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=1.5.22 ++VERSION="1.5.22 Debian 1.5.22-4" + TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" + + # See if we are running on zsh, and set the options which allow our +@@ -2082,7 +2082,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$pass" = dlopen; then +@@ -3201,6 +3204,11 @@ + age="$number_minor" + revision="$number_minor" + ;; ++ *) ++ $echo "$modename: unknown library version type \`$version_type'" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE ++ ;; + esac + ;; + no) +diff -urNad aspell-0.60.5~/manual/Makefile.in aspell-0.60.5/manual/Makefile.in +--- aspell-0.60.5~/manual/Makefile.in 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/manual/Makefile.in 2007-02-17 20:29:34.000000000 -0500 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,9 +13,13 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -60,12 +64,6 @@ + AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) + DVIPS = dvips + am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + man1dir = $(mandir)/man1 + NROFF = nroff + MANS = $(man_MANS) +@@ -73,6 +71,8 @@ + pkgdatadir = @pkgdatadir@ + pkglibdir = @pkglibdir@ + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -82,6 +82,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ ++COMPILE_IN_FILTERS_FALSE = @COMPILE_IN_FILTERS_FALSE@ ++COMPILE_IN_FILTERS_TRUE = @COMPILE_IN_FILTERS_TRUE@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CURSES_INCLUDE = @CURSES_INCLUDE@ +@@ -104,7 +106,8 @@ + GMSGFMT = @GMSGFMT@ + GMSGFMT_015 = @GMSGFMT_015@ + GREP = @GREP@ +-INSTALL = @INSTALL@ ++INCREMENTED_SONAME_FALSE = @INCREMENTED_SONAME_FALSE@ ++INCREMENTED_SONAME_TRUE = @INCREMENTED_SONAME_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -122,8 +125,9 @@ + LTLIBINTL = @LTLIBINTL@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + MSGFMT = @MSGFMT@ + MSGFMT_015 = @MSGFMT_015@ + MSGMERGE = @MSGMERGE@ +@@ -137,6 +141,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERLPROG = @PERLPROG@ + POSUB = @POSUB@ ++PSPELL_COMPATIBILITY_FALSE = @PSPELL_COMPATIBILITY_FALSE@ ++PSPELL_COMPATIBILITY_TRUE = @PSPELL_COMPATIBILITY_TRUE@ + PTHREAD_LIB = @PTHREAD_LIB@ + RANLIB = @RANLIB@ + SED = @SED@ +@@ -147,13 +153,13 @@ + VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ + XGETTEXT_015 = @XGETTEXT_015@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -165,7 +171,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -194,15 +199,12 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + info_TEXINFOS = aspell.texi aspell-dev.texi + MAKEINFOFLAGS = --enable-encoding + aspell_TEXINFOS = readme.texi fdl.texi lgpl.texi \ +@@ -226,9 +228,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign manual/Makefile ++ $(AUTOMAKE) --gnu manual/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -253,6 +255,9 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++ + .texi.info: + restore=: && backupdir="$(am__leading_dot)am$$$$" && \ + am__cwd=`pwd` && cd $(srcdir) && \ +@@ -310,26 +315,9 @@ + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(DVIPS) -o $@ $< + +-uninstall-dvi-am: +- @$(NORMAL_UNINSTALL) +- @list='$(DVIS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ +- rm -f "$(DESTDIR)$(dvidir)/$$f"; \ +- done +- +-uninstall-html-am: +- @$(NORMAL_UNINSTALL) +- @list='$(HTMLS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ +- rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ +- done +- + uninstall-info-am: + @$(PRE_UNINSTALL) +- @if test -d '$(DESTDIR)$(infodir)' && \ +- (install-info --version && \ ++ @if (install-info --version && \ + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ +@@ -343,28 +331,12 @@ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ +- (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ ++ (if cd "$(DESTDIR)$(infodir)"; then \ + echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ + rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ + else :; fi); \ + done + +-uninstall-pdf-am: +- @$(NORMAL_UNINSTALL) +- @list='$(PDFS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ +- done +- +-uninstall-ps-am: +- @$(NORMAL_UNINSTALL) +- @list='$(PSS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(psdir)/$$f"; \ +- done +- + dist-info: $(INFO_DEPS) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(INFO_DEPS)'; \ +@@ -402,7 +374,7 @@ + done + install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) +- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" ++ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ +@@ -453,21 +425,22 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -486,7 +459,7 @@ + all-am: Makefile $(INFO_DEPS) $(MANS) + installdirs: + for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -518,7 +491,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + +@@ -534,42 +507,13 @@ + + install-data-am: install-info-am install-man + +-install-dvi: install-dvi-am +- +-install-dvi-am: $(DVIS) +- @$(NORMAL_INSTALL) +- test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" +- @list='$(DVIS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \ +- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \ +- done + install-exec-am: + +-install-html: install-html-am +- +-install-html-am: $(HTMLS) +- @$(NORMAL_INSTALL) +- test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" +- @list='$(HTMLS)'; for p in $$list; do \ +- if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- if test -d "$$d$$p"; then \ +- echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ +- $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ +- echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ +- $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \ +- else \ +- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ +- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ +- fi; \ +- done + install-info: install-info-am + + install-info-am: $(INFO_DEPS) + @$(NORMAL_INSTALL) +- test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" ++ test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ +@@ -599,28 +543,6 @@ + else : ; fi + install-man: install-man1 + +-install-pdf: install-pdf-am +- +-install-pdf-am: $(PDFS) +- @$(NORMAL_INSTALL) +- test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" +- @list='$(PDFS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ +- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ +- done +-install-ps: install-ps-am +- +-install-ps-am: $(PSS) +- @$(NORMAL_INSTALL) +- test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" +- @list='$(PSS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \ +- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \ +- done + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -641,27 +563,21 @@ + + ps-am: $(PSS) + +-uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ +- uninstall-man uninstall-pdf-am uninstall-ps-am ++uninstall-am: uninstall-info-am uninstall-man + + uninstall-man: uninstall-man1 + +-.MAKE: install-am install-strip +- + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + dist-info distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-man1 install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-info install-info-am install-man \ ++ install-man1 install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic mostlyclean mostlyclean-aminfo \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ +- uninstall-info-am uninstall-man uninstall-man1 \ +- uninstall-pdf-am uninstall-ps-am ++ uninstall uninstall-am uninstall-info-am uninstall-man \ ++ uninstall-man1 + + # 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. + % + {\catcode`\@=0 \catcode`\\=\active ++ @gdef@activebackslash{@catcode`@\=@active @otherbackslash} + @gdef@activebackslashdouble{% +- @catcode`@\=@active ++ @catcode@backChar=@active + @let\=@doublebackslash} + } + +@@ -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 +- \def\@{@}% +- \let\/=\empty ++ \normalturnoffactive\def\@{@}% + \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 +- \errmessage{@fonttextsize 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 `@end #1'. +- \long\def\doignoretext##1^^M@end #1{% +- \doignoretextyyy##1^^M@#1\_STOP_}% +- % ++ % Define a command to find the next `@end #1', which must be on a line ++ % by itself. ++ \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}% + % And this command to find another #1 command, at the beginning of a + % line. (Otherwise, we would consider a line `@c @ifset', for + % example, to count as an @ifset for nesting.) + \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% + % + % And now expand that command. ++ \obeylines % + \doignoretext ^^M% + }% + } +@@ -3204,12 +3018,7 @@ + } + + % Finish off ignored text. +-{ \obeylines% +- % Ignore anything after the last `@end #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. + \def\@{@}% 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: +- % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} +- % +- % 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{% + \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}% + \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 +-} +- + \catcode`\@=0 + + % \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 ++ @gdef@rawbackslash{@let\=@backslashcurfont} ++ @gdef@otherbackslash{@let\=@realbackslash} ++} ++ + % \realbackslash is an actual character `\' with catcode other, and + % \doublebackslash is two of them (for the pdf outlines). + {\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} + +-% In texinfo, backslash is an active character; it prints the backslash +-% in fixed width font. +-\catcode`\\=\active +-@def@normalbackslash{{@tt@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. +-@gdef@rawbackslash{@let\=@backslashcurfont} +-@gdef@otherbackslash{@let\=@realbackslash} ++\catcode`\\=\active + +-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of +-% the literal character `\'. +-% +-@def@normalturnoffactive{% +- @let\=@normalbackslash ++% Used sometimes to turn off (effectively) the active characters ++% even after parsing them. ++@def@turnoffactive{% + @let"=@normaldoublequote ++ @let\=@realbackslash + @let~=@normaltilde + @let^=@normalcaret + @let_=@normalunderscore +@@ -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.) ++% ++@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash} ++ + % Make _ and + \other characters, temporarily. + % This is canceled by @fixbackslash. + @otherifyactive +@@ -7447,7 +7175,7 @@ + @global@let\ = @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 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. + +-scriptversion=2006-05-10.23 ++scriptversion=2005-06-08.21 + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. + +@@ -33,8 +33,6 @@ + fi + + run=: +-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +-sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + + # In the cases where this matters, `missing' is being run in the + # srcdir already. +@@ -46,7 +44,7 @@ + + msg="missing on your system" + +-case $1 in ++case "$1" in + --run) + # Try to run requested program, and just exit if it succeeds. + run= +@@ -79,7 +77,6 @@ + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' +- autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c +@@ -109,7 +106,7 @@ + # Now exit if we have it, but it failed. Also exit now if we + # don't have it and --version was passed (most likely to detect + # the program). +-case $1 in ++case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; +@@ -138,7 +135,7 @@ + + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. +-case $1 in ++case "$1" in + aclocal*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if +@@ -167,7 +164,7 @@ + test -z "$files" && files="config.h" + touch_files= + for f in $files; do +- case $f in ++ case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; +@@ -195,8 +192,8 @@ + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` ++ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else +@@ -217,25 +214,25 @@ + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h +- if test $# -ne 1; then ++ if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" +- case $LASTARG in ++ case "$LASTARG" in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if test -f "$SRCFILE"; then ++ if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if test -f "$SRCFILE"; then ++ if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi +- if test ! -f y.tab.h; then ++ if [ ! -f y.tab.h ]; then + echo >y.tab.h + fi +- if test ! -f y.tab.c; then ++ if [ ! -f y.tab.c ]; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; +@@ -247,18 +244,18 @@ + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c +- if test $# -ne 1; then ++ if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" +- case $LASTARG in ++ case "$LASTARG" in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if test -f "$SRCFILE"; then ++ if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi +- if test ! -f lex.yy.c; then ++ if [ ! -f lex.yy.c ]; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; +@@ -270,9 +267,11 @@ + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -f "$file"; then ++ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ if test -z "$file"; then ++ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` ++ fi ++ if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file +@@ -290,17 +289,11 @@ + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n ' +- /^@setfilename/{ +- s/.* \([^ ]*\) *$/\1/ +- p +- q +- }' $infile` ++ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi +@@ -324,13 +317,13 @@ + fi + firstarg="$1" + if shift; then +- case $firstarg in ++ case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac +- case $firstarg in ++ case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 +diff -urNad aspell-0.60.5~/myspell/Makefile.in aspell-0.60.5/myspell/Makefile.in +--- aspell-0.60.5~/myspell/Makefile.in 2007-02-17 20:11:08.000000000 -0500 ++++ aspell-0.60.5/myspell/Makefile.in 2007-02-17 20:29:34.000000000 -0500 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,9 +14,13 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -50,18 +54,17 @@ + am_munch_OBJECTS = munch.$(OBJEXT) + munch_OBJECTS = $(am_munch_OBJECTS) + munch_LDADD = $(LDADD) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)/gen@am__isrc@ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/gen + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ++ $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(munch_SOURCES) + DIST_SOURCES = $(munch_SOURCES) + ETAGS = etags +@@ -70,6 +73,8 @@ + pkgdatadir = @pkgdatadir@ + pkglibdir = @pkglibdir@ + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -79,6 +84,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ ++COMPILE_IN_FILTERS_FALSE = @COMPILE_IN_FILTERS_FALSE@ ++COMPILE_IN_FILTERS_TRUE = @COMPILE_IN_FILTERS_TRUE@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CURSES_INCLUDE = @CURSES_INCLUDE@ +@@ -101,7 +108,8 @@ + GMSGFMT = @GMSGFMT@ + GMSGFMT_015 = @GMSGFMT_015@ + GREP = @GREP@ +-INSTALL = @INSTALL@ ++INCREMENTED_SONAME_FALSE = @INCREMENTED_SONAME_FALSE@ ++INCREMENTED_SONAME_TRUE = @INCREMENTED_SONAME_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -119,8 +127,9 @@ + LTLIBINTL = @LTLIBINTL@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + MSGFMT = @MSGFMT@ + MSGFMT_015 = @MSGFMT_015@ + MSGMERGE = @MSGMERGE@ +@@ -134,6 +143,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERLPROG = @PERLPROG@ + POSUB = @POSUB@ ++PSPELL_COMPATIBILITY_FALSE = @PSPELL_COMPATIBILITY_FALSE@ ++PSPELL_COMPATIBILITY_TRUE = @PSPELL_COMPATIBILITY_TRUE@ + PTHREAD_LIB = @PTHREAD_LIB@ + RANLIB = @RANLIB@ + SED = @SED@ +@@ -144,13 +155,13 @@ + VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ + XGETTEXT_015 = @XGETTEXT_015@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -162,7 +173,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -191,15 +201,12 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + munch_SOURCES = munch.c + EXTRA_DIST = README* en_US.aff *.h + all: all-am +@@ -215,9 +222,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign myspell/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu myspell/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign myspell/Makefile ++ $(AUTOMAKE) --gnu myspell/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -244,7 +251,7 @@ + done + munch$(EXEEXT): $(munch_OBJECTS) $(munch_DEPENDENCIES) + @rm -f munch$(EXEEXT) +- $(LINK) $(munch_OBJECTS) $(munch_LDADD) $(LIBS) ++ $(LINK) $(munch_LDFLAGS) $(munch_OBJECTS) $(munch_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -255,22 +262,22 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/munch.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -281,6 +288,10 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -330,21 +341,22 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -392,7 +404,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + +@@ -406,20 +418,12 @@ + + install-data-am: + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -440,22 +444,19 @@ + + ps-am: + +-uninstall-am: +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ ++ install install-am install-data install-data-am install-exec \ ++ install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-info-am + + # 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~/po/Makevars.template aspell-0.60.5/po/Makevars.template +--- aspell-0.60.5~/po/Makevars.template 1969-12-31 19:00:00.000000000 -0500 ++++ aspell-0.60.5/po/Makevars.template 2007-02-17 20:29:24.000000000 -0500 +@@ -0,0 +1,41 @@ ++# Makefile variables for PO directory in any package using GNU gettext. ++ ++# Usually the message domain is the same as the package name. ++DOMAIN = $(PACKAGE) ++ ++# These two variables depend on the location of this directory. ++subdir = po ++top_builddir = .. ++ ++# These options get passed to xgettext. ++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ ++ ++# This is the copyright holder that gets inserted into the header of the ++# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding ++# package. (Note that the msgstr strings, extracted from the package's ++# sources, belong to the copyright holder of the package.) Translators are ++# expected to transfer the copyright for their translations to this person ++# or entity, or to disclaim their copyright. The empty string stands for ++# the public domain; in this case the translators are expected to disclaim ++# their copyright. ++COPYRIGHT_HOLDER = Free Software Foundation, Inc. ++ ++# This is the email address or URL to which the translators shall report ++# bugs in the untranslated strings: ++# - Strings which are not entire sentences, see the maintainer guidelines ++# in the GNU gettext documentation, section 'Preparing Strings'. ++# - Strings which use unclear terms or require additional context to be ++# understood. ++# - Strings which make invalid assumptions about notation of date, time or ++# money. ++# - Pluralisation problems. ++# - Incorrect English spelling. ++# - Incorrect formatting. ++# It can be your email address, or a mailing list address where translators ++# can write to without being subscribed, or the URL of a web page through ++# which the translators can contact you. ++MSGID_BUGS_ADDRESS = ++ ++# This is the list of locale categories, beyond LC_MESSAGES, for which the ++# message catalogs shall be used. It is usually empty. ++EXTRA_LOCALE_CATEGORIES = --- aspell-0.60.5.orig/debian/aspell.install +++ aspell-0.60.5/debian/aspell.install @@ -0,0 +1,11 @@ +usr/bin/aspell +usr/bin/aspell-import +usr/bin/run-with-aspell +usr/bin/word-list-compress +usr/bin/prezip-bin +usr/bin/prezip +usr/bin/preunzip +usr/bin/precat +usr/share/locale +usr/lib/aspell/spell usr/share/doc/aspell/examples +usr/lib/aspell/ispell usr/share/doc/aspell/examples --- aspell-0.60.5.orig/debian/aspell.dirs +++ aspell-0.60.5/debian/aspell.dirs @@ -0,0 +1 @@ +usr/share/aspell --- aspell-0.60.5.orig/debian/control +++ aspell-0.60.5/debian/control @@ -0,0 +1,80 @@ +Source: aspell +Section: text +Priority: optional +Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Brian Nelson <pyro@debian.org> +Build-Depends: debhelper (>= 4.0.4), libncursesw5-dev | libncurses-dev, cdbs (>= 0.4.0), dpatch +Standards-Version: 3.7.2 + +Package: aspell +Architecture: any +Depends: ${shlibs:Depends}, libaspell15 (= ${Source-Version}), dictionaries-common (>> 0.40) +Recommends: aspell-en | aspell-dictionary | aspell6a-dictionary +Suggests: aspell-doc, spellutils +Conflicts: aspell-bin (<< 0.60.3-2) +Replaces: aspell-bin (<< 0.60.3-2), aspell-hi (<= 0.01-1), aspell-mr (<= 0.10-1) +Provides: aspell-bin +Description: GNU Aspell spell-checker + GNU Aspell is a spell-checker which can be used either as a standalone + application or embedded in other programs. Its main feature is that it + does a much better job of suggesting possible spellings than just about + any other spell-checker available for the English language, including + Ispell and Microsoft Word. It also has many other technical + enhancements over Ispell such as using shared memory for dictionaries + and intelligently handling personal dictionaries when more than one + Aspell process is open at once. + . + Aspell is designed to be a drop-in replacement for Ispell. + . + Homepage: http://aspell.net/ + +Package: aspell-doc +Architecture: all +Section: doc +Suggests: aspell (>> 0.60) +Description: Documentation for GNU Aspell spell-checker + This package contains the documentation for GNU Aspell in various + formats. The aspell package comes with minimal man pages. Install + this package if you need further information on the development process + and workings of Aspell. + +Package: libaspell15 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Conflicts: aspell6-dictionary, aspell-bin (<< 0.60.3-2) +Recommends: aspell-en | aspell-dictionary | aspell6a-dictionary +Suggests: aspell +Description: GNU Aspell spell-checker runtime library + These are the runtime parts of the Aspell and pspell spell-checking + toolkits, needed by applications that use the toolkits at runtime. + . + For a standalone spell-checker, install aspell as well. + +Package: libaspell-dev +Architecture: any +Section: libdevel +Depends: libaspell15 (= ${Source-Version}) +Suggests: aspell-doc +Description: Development files for applications with GNU Aspell support + This package contains the headers and static libraries for developing + applications with Aspell spell-checking support. + . + You need this package ONLY if you plan to build applications that link + against the Aspell libraries. You do not have to install this package + if all you want to do is use the Aspell program to spell-check + documents. + +Package: libpspell-dev +Architecture: any +Section: libdevel +Depends: libaspell15 (= ${Source-Version}), libaspell-dev +Replaces: aspell-bin (<< 0.50.3-3) +Suggests: aspell-doc +Description: Development files for applications with pspell support + This package contains the headers and static libraries for developing + applications with portable spell-checking interface (pspell) support. + . + You need this package ONLY if you plan to build applications that link + against the pspell static libraries. You do not have to install this + package if all you want to do is use the Aspell program to spell-check. --- aspell-0.60.5.orig/debian/compat +++ aspell-0.60.5/debian/compat @@ -0,0 +1 @@ +4 --- aspell-0.60.5.orig/debian/libaspell15.install +++ aspell-0.60.5/debian/libaspell15.install @@ -0,0 +1,3 @@ +usr/lib/libaspell.so.* +usr/lib/libpspell.so.* +usr/lib/aspell --- aspell-0.60.5.orig/debian/aspell.postinst +++ aspell-0.60.5/debian/aspell.postinst @@ -0,0 +1,9 @@ +#!/bin/sh -e + +#DEBHELPER# + +if [ "$1" = "configure" ] ; then + if [ -x /usr/sbin/aspell-autobuildhash ]; then + aspell-autobuildhash + fi +fi --- aspell-0.60.5.orig/debian/changelog +++ aspell-0.60.5/debian/changelog @@ -0,0 +1,793 @@ +aspell (0.60.5-1ubuntu1) gutsy; urgency=low + + * Build with -fpermissive when building with g++-4.3. LP: #138557. + * Set Ubuntu maintainer address. + + -- Matthias Klose <doko@ubuntu.com> Thu, 13 Sep 2007 19:05:25 +0000 + +aspell (0.60.5-1) unstable; urgency=low + + * New upstream release + - Buggy '-m' option fixed (Closes: #400878) + - Core dump with when (r)eplacing with 00 fixed (Closes: #347191) + - Improper Tex filter handling of escaped % fixed (Closes: #347589) + - Affix compression bug fixed (Closes: #340958) + + * Removed debian/patches/03_extra_qualification_fix.dpatch, incorporated + upstream + + * debian/patches/10_autotools.dpatch: regenerated + + * debian/control: dropped the libaspell15c2 dummy package, as nothing in + the archive depends on it any more + + -- Brian Nelson <pyro@debian.org> Sat, 17 Feb 2007 20:59:32 -0500 + +aspell (0.60.4-4) unstable; urgency=low + + * debian/patches/03_extra_qualification_fix.dpatch: new patch to fix a + FTBFS with GCC 4.1. Thanks to Martin Michlmayr <tbm@cyrius.com> for + the patch. (Closes: #356444) + + * Updated to standards version 3.7.2 + + -- Brian Nelson <pyro@debian.org> Sat, 13 May 2006 15:25:15 -0700 + +aspell (0.60.4-3) unstable; urgency=low + + * debian/aspell.manpages: added manual/prezip-bin.1 + + * debian/rules: removed the -D argument from the install command of + debian/aspell.compat, since the destination directory already should + exist anyway and having it mysteriously breaks some builds (namely + ia64 at the moment). + + -- Brian Nelson <pyro@debian.org> Fri, 20 Jan 2006 12:26:37 -0800 + +aspell (0.60.4-2) unstable; urgency=low + + * Rebuilding, which should fix segfaults due to C++ ABI changes + (Closes: #343060) + + * Renamed debian/aspell.overrides to debian/aspell.lintian, and modified + debian/rules to install it + + * Updated FSF address in the copyright files + + * debian/aspell.lintian: added "aspell: + package-has-a-duplicate-relation" + + * debian/patches/02_u-deva_common_data.dpatch: new patch to add + u-deva.cset and u-deva.cmap data files, needed by aspell-hi and + aspell-mr + + * debian/control: have aspell replace versions of aspell-hi and + aspell-mr that contained the u-deva files + + -- Brian Nelson <pyro@debian.org> Mon, 2 Jan 2006 20:57:57 -0800 + +aspell (0.60.4-1) unstable; urgency=low + + * New upstream release + + * debian/patches/10_autotools: regenerated + + -- Brian Nelson <pyro@debian.org> Tue, 25 Oct 2005 23:43:21 -0700 + +aspell (0.60.3-5) unstable; urgency=low + + * Moved the 01_autotools patch to 10_autotools + + * debian/patches/01_debctrl: wrote a patch for a Debian packaging + control file filter (Closes: #111929) + + * debian/patches/10_autotools: reran autotools to update build system so + that it builds the debctrl filter + + * Updated aspell.1 manual to document the new debctrl filter + + -- Brian Nelson <pyro@debian.org> Mon, 1 Aug 2005 23:56:49 -0700 + +aspell (0.60.3-4) unstable; urgency=low + + * manual/aspell.1: removed a stray ')' character + + * debian/control: renamed libaspell15c2 back to libaspell15, and + replaced libaspell15c2 with a dummy package depending upon + libaspell15. This effectively undoes the GCC 4.0 transition. + libaspell, like libGLU, is written in C++ but only publicly exports a + C interface so the transition is not necessary. + (Closes: #317873, #318187) + + * debian/control: made libaspell15 conflict with earlier versions of + aspell-bin, since /usr/bin/aspell uses C++ linkage to libaspell and + thus cannot be used with the libaspell15 built with GCC 4.0. + + * Don't install the spell and ispell compatibility scripts in + /usr/lib/aspell. Instead install them in + /usr/share/doc/aspell/examples so that they're easier to find. + (Closes: #273761) + + * Added support for using dpatch. + + * Created an autotools build system dpatch that contains updated gettext + macros, which should fix build failures on some arches. + (Closes: #316666) + + -- Brian Nelson <pyro@debian.org> Thu, 21 Jul 2005 16:13:03 -0700 + +aspell (0.60.3-3) unstable; urgency=low + + * New release to fully support autobuilding dictionary hashes + * Install a /usr/share/aspell/aspell.compat file containing a + compatibility string used by aspell-autobuildhash from + dictionaries-common + * debian/aspell.postinst: run aspell-autobuildhash if the binary is + available + * debian/control: add a dependency on dictionaries-common (>> 0.40) + * debian/control: no longer conflict with "aspell-dictionary", but + instead add it to the |'d list of supported virtual dictionary + packages. Pre-sarge, the aspell-dictionary package was used for + dictionaries supporting aspell 0.50.x and earlier. Post-sarge, it + will represent dictionaries with autobuilt hash files. + + -- Brian Nelson <pyro@debian.org> Fri, 8 Jul 2005 07:47:03 -0700 + +aspell (0.60.3-2) unstable; urgency=low + + * debian/control: renamed libaspell15 to libaspell15c2 for the GCC 4.0 + ABI change transition + * debian/control: dropped a ton of old cruft in the conflicts/replaces + lines + * debian/rules: pass configure flags to change pkglibdir and pkgdatadir + from /usr/lib/aspell-0.60 to /usr/lib/aspell, which is needed to make + dictionary auto-hash-building transitions to newer Aspell versions + less painful. Note that this breaks all current aspell dictionary + packages which install into /usr/lib/aspell-0.60. + * debian/control: conflict with aspell6-dictionary packages, depend on + aspell6a-dictionary packages instead + * debian/control: merged aspell-bin back into aspell, since there really + isn't any point in distinguishing between the two, especially when + dictionary auto-hash-building becomes the norm. It also eliminates a + cyclical dependency on dictionaries that depend directly on aspell. + * Added a NEWS.Debian.gz file documenting the dictionary transition + details. + + -- Brian Nelson <pyro@debian.org> Wed, 6 Jul 2005 23:47:11 -0700 + +aspell (0.60.3-1) unstable; urgency=low + + * New upstream release + - Fixes a prompt in French transition to be o/n, not y/n + (Closes: #310140) + - Change of '-l' in aspell to mean '--lang' instead of '--list' as in + 0.50 now documented in upstream's README (Closes: #310911) + * manual/aspell.1: removed documentation of "--ignore-accents" since + it's not supported in 0.60 + * debian/control: bumped Standards-Version to 3.6.2 + * manual/aspell.1: applied patch from Jose Da Silva to fix some + grammatical errors + * Install manual/aspell.html/ChangeLog.html as the upstream changelog, + since the root ChangeLog was removed + + -- Brian Nelson <pyro@debian.org> Thu, 30 Jun 2005 18:15:41 +0300 + +aspell (0.60.2+20050121-3) unstable; urgency=low + + * debian/control: made aspell-bin depend on the Source-Version of + libaspell15. The /usr/bin/aspell binary uses some symbols that aren't + exposed in the public aspell.h interface, so it requires a stricter + version of the library than provides by shlibs. (Closes: #307481) + * modules/speller/default/suggest.cpp: applied patch from upstream to + fix the problem with ultra or fast not returing any suggestions with + some languages + * common/string.cpp: applied patch from upstream to fix a faulty sanity + check in String::vprintf() + * examples/example-c.c: applied patch from upstream with minor cleanups + and bug fixes + + -- Brian Nelson <pyro@debian.org> Sun, 22 May 2005 12:27:34 -0700 + +aspell (0.60.2+20050121-2) unstable; urgency=low + + * manual/aspell.1: '-l' is a synonym for '--lang', not 'list' + (Closes: #301026) + * debian/control: made aspell-doc suggest aspell (>> 0.60). This is + basically for documentation purposes to indicate which aspell version + to which aspell-doc applies. Inspired by but doesn't really fix + #301201. + + -- Brian Nelson <pyro@debian.org> Sun, 27 Mar 2005 21:39:00 -0800 + +aspell (0.60.2+20050121-1) unstable; urgency=low + + * New upstream pre-release + - Fixes the 'Unhandled Error: The method "clear" is unimplemented in + "WritableDict"' bug (Closes: #295748, #296397) + + -- Brian Nelson <pyro@debian.org> Tue, 22 Feb 2005 16:44:14 -0800 + +aspell (0.60.2-2) unstable; urgency=low + + * Build-depend on libncursesw5-dev instead of libncurses5-dev, since + Aspell needs the wide character support to properly display UTF-8 + documents. Pointed out by Kevin Atkinson. + + -- Brian Nelson <pyro@debian.org> Wed, 16 Feb 2005 16:10:07 -0800 + +aspell (0.60.2-1) unstable; urgency=low + + * New upstream release (Closes: #274514) + - support for UTF-8 and other encodings (Closes: #131328, #170458) + - affix compression support + - manual converted to texinfo + - loadable filter support + - fixes --conf and --per-conf options (Closes: #228237) + - fixes abort when --extra-dicts is used (Closes: #236823) + - fixes infinite loop when trying to replace a word with the identical + text (Closes: #261589) + * debian/rules: converted to use cdbs + * debian/control: added build-dep on cdbs + * debian/control: removed Build-Depends-Indep because the manual no + longer needs to be generated + * Removed Debian-specific manpages, as these have now been included + upstream. + * debian/control: Depend on aspell-en | aspell6-dictionary, since the + dictionary format has changed again. Made libaspell15 conflict with + aspell-dictionary, since dictionaries in that format are no longer + usable. + * Removed doc-base support since only the texinfo manuals are installed + now. Upstream still includes html documentation, though it's not + installed in the install target, so it would be possible to resurrect + if there's demand for it. + * Eased the shlibs dependency tightness on libaspell15 by specifying a + dependency of >= 0.60, instead of the full 0.60.x version. Upstream + uses proper versioning and won't change the API in 0.60.x releases, so + this should be a safe setting. + + -- Brian Nelson <pyro@debian.org> Sun, 13 Feb 2005 10:12:39 -0800 + +aspell (0.50.5-5) unstable; urgency=low + + * Included the contents of the GFDL license in the copyright file of the + aspell-doc package to conform with policy. Removed the separate FDL + document. + * Updated the manpages with newer ones from Aspell 0.60. + + -- Brian Nelson <pyro@debian.org> Sat, 4 Dec 2004 13:14:38 -0800 + +aspell (0.50.5-4) unstable; urgency=low + + * debian/control: made libpspell-dev conflict with and replace + libpspell4 since otherwise it may break upgrades from woody to sarge, + apparently (Closes: #278166) + + -- Brian Nelson <pyro@debian.org> Mon, 25 Oct 2004 09:35:02 -0700 + +aspell (0.50.5-3) unstable; urgency=medium + + * Applied a patch from upstream to fix a buffer overflow in the + word-list-compress utility. This is a minor security hole, so bumped + the urgency to medium. + * debian/rules: Don't pass a version value with "dh_makeshlibs -V". The + default is fine. + * debian/rules: Don't set CC=g++ when running configure. This was a + hack to work around an old broken libtool and is no longer necessary. + + -- Brian Nelson <pyro@debian.org> Fri, 25 Jun 2004 15:47:48 -0700 + +aspell (0.50.5-2) unstable; urgency=low + + * libaspell15 "Replaces: aspell-bg (<= 3.0-1)" due to that package + erroneously including /usr/share/aspell/cp* files that are the domain + of libaspell15. (Closes: #233511) + + -- Brian Nelson <pyro@debian.org> Thu, 19 Feb 2004 12:24:51 -0800 + +aspell (0.50.5-1) unstable; urgency=low + + * New upstream release + * Fixed spelling error in description (Closes: #222868) + * Updated and improved the debian/copyright + + -- Brian Nelson <pyro@debian.org> Wed, 11 Feb 2004 22:23:03 -0800 + +aspell (0.50.4.1-1) unstable; urgency=low + + * New upstream version + - Integrates fix introduced in 0.50.4-2 + + -- Brian Nelson <pyro@debian.org> Sat, 15 Nov 2003 23:38:40 -0800 + +aspell (0.50.4-2) unstable; urgency=low + + * Applied patch from upstream to fix a bug causing Aspell to drop the + last character in a word when saving the word to the personal + dictionary, in some situations. + + -- Brian Nelson <pyro@debian.org> Tue, 7 Oct 2003 18:47:04 -0700 + +aspell (0.50.4-1) unstable; urgency=low + + * New upstream release + - Complain instead of doing nothing or aborting for unimplemented + functions in Aspell utility, especially 'aspell filter'. + (Closes: #189759) + - Aspell API documentation fixes (Closes: #187290) + * Integrate upstream fixes to #185142 as well as g++ 3.3 fixes. + * Upstream now uses newer, less broken libtool, so there's no longer a + need to rerun the autotool chain and include it in the .diff.gz. + + -- Brian Nelson <pyro@debian.org> Sat, 4 Oct 2003 10:11:09 -0700 + +aspell (0.50.3-13) unstable; urgency=low + + * Added tetex-extra, gs-common, and psutils to the Build-Depends-Indep + so that the postscript documents generated actually contain something + (Closes: #206236) + * Bumped up standards version to 3.6.1 + + -- Brian Nelson <pyro@debian.org> Sat, 23 Aug 2003 20:42:10 -0700 + +aspell (0.50.3-12) unstable; urgency=low + + * debian/rules: Use "DESTDIR" instead of "prefix" in install target, and + pass configure --sysconfdir=/etc. This will properly set the conf-dir + to /etc instead of /usr/etc. (Closes: #194480) + * prog/checker_string.cpp: added an #include <cassert> to fix + a failure-to-build with g++ 3.3. + + -- Brian Nelson <pyro@debian.org> Fri, 23 May 2003 13:16:36 -0700 + +aspell (0.50.3-11) unstable; urgency=low + + * Removed unnecessary dh_testroot from debian/rules clean target. + * Bumped up standards version. + * Changed section of -dev packages to libdevel. + * Fixed some minor mistakes in the aspell.1 manpage. + * Reran autotools stuff and included in diff; don't run them at build + time nor build-depend on them. + + -- Brian Nelson <pyro@debian.org> Mon, 28 Apr 2003 10:12:02 -0700 + +aspell (0.50.3-10) unstable; urgency=low + + * Added a fix to prevent segfaults in the trim_wspace function in + aspell.cpp. (Closes: #185142) + + -- Brian Nelson <pyro@debian.org> Mon, 17 Mar 2003 13:04:29 -0800 + +aspell (0.50.3-9) unstable; urgency=low + + * Rewrote the aspell.1 manpage to get in sync with upstream's user manual. + * Corrected an erroneous example in the aspell.1 that incorrectly + documented use of the "lang" option. This caused confusion on how to + use this option. Also, noted the correct usage in README.Debian. + (Closes: #182077) + * Added a copy of the FDL to reference from the aspell.1 manpage. + * Added a debian/aspell-doc.copyright that notes the true license (FDL) + of the aspell documentation. + * Added libcurses5-dev as alternative to libcurses-dev in build-depends. + * Added lintian overrides for false positives on spelling errors. + + -- Brian Nelson <pyro@debian.org> Thu, 13 Mar 2003 01:49:10 -0800 + +aspell (0.50.3-8) unstable; urgency=low + + * Use debian/compat instead of DH_COMPAT=n in debian/rules. + * Added the homepage to the description. + * Disabled the static libraries again. According to upstream, libtool + static C++ libraries don't work properly. + * Added version info to shlibs. + + -- Brian Nelson <pyro@debian.org> Wed, 5 Mar 2003 19:18:30 -0800 + +aspell (0.50.3-7) unstable; urgency=low + + * Fixed error in aspell-doc.doc-base.dev file path. (Closes: #183162) + * Compress all .txt files in aspell-doc/man-text. + + -- Brian Nelson <pyro@debian.org> Mon, 3 Mar 2003 20:30:19 -0800 + +aspell (0.50.3-6) unstable; urgency=low + + * Updated the copyright file. + * Added doc-base support for aspell-doc's documentation. + * Removed .tex, .lyx, .dvi, and dev-html/index.txt from aspell-doc. + * Produce PostScript documentation in the build-indep target. + * Added tetex-bin to Build-Depends-Indep. + + -- Brian Nelson <pyro@debian.org> Thu, 27 Feb 2003 22:37:07 -0800 + +aspell (0.50.3-5) unstable; urgency=low + + * libaspell15 now Conflicts/Replaces with all of the old libaspell's to + ensure they aren't left lying around from old installations. + (Closes: #179466) + * Commented out the AC_DISABLE_STATIC macro in configure.ac so that the + static library is built, as required by Policy 11.2. + * Updated maintainer email address. + + -- Brian Nelson <pyro@debian.org> Wed, 19 Feb 2003 18:05:18 -0800 + +aspell (0.50.3-4) unstable; urgency=low + + * Moved /usr/share/aspell/* from aspell-bin back to libaspell where they + belong. (Closes: #179173) + + -- Brian Nelson <nelson@bignachos.com> Fri, 31 Jan 2003 08:54:28 -0800 + +aspell (0.50.3-3) unstable; urgency=low + + * Bumped up Build-depends to automake1.7, since this is what upstream + uses. Modified debian/rules accordingly. + * Install upstream's changelog. + * Conflict with aspell-bg (<= 2.0-2.2). + * Moved pspell-config and its manpage to libpspell-dev. It had + inadvertently been moved from libpspell to aspell-bin. (Closes: #178637) + * Improved the package descriptions. Thanks Filip Van Raemdonck + <mechanix@debian.org> for the suggestions. (Closes: #177528) + * Things to note that were not mentioned in changelog for the 0.33.x to + 0.50.x release: + - The library sonames changed, so no explicit action was necessary for + the GCC 3.2 transition. + - libaspell15 explicitly conflicts with every old aspell-dictionary + package. Since the dictionary format changed, libaspell15 is unable + to coexist with older libaspell libraries as the libraries would not + be able to share dictionaries (and quiet breakage would occur). + + -- Brian Nelson <nelson@bignachos.com> Tue, 28 Jan 2003 16:58:30 -0800 + +aspell (0.50.3-2) unstable; urgency=low + + * Added a Conflicts with libpspell4c102. + * Moved libpspell15 library to libaspell11 package since it's only a 3k + library. + * Renamed libaspell11 to libaspell15 to match the library's soname. + + -- Brian Nelson <nelson@bignachos.com> Wed, 15 Jan 2003 13:27:05 -0800 + +aspell (0.50.3-1) unstable; urgency=low + + * New upstream release (Closes: #163989, #169890) + * Updated copyright file + * Set CC=g++ when running configure to work around a bug causing the + libraries to not build and link properly. + * Removed build-dep on libltdl is since it is no longer used + (Closes: #172098) + * Made aspell a meta-package that depends on aspell-bin and an + dictionary (Closes: #140183) + * The libpspell_aspell library is obsolete and no longer included in the + package (Closes: #160453) + * Updated for Debian policy version 3.5.8.0 + * Wrote a new manpage for aspell-import + * aspell-en is now distributed in a separate package + * Remove the .aux temporary files from aspell-doc (Closes: #156686) + + -- Brian Nelson <nelson@bignachos.com> Mon, 9 Dec 2002 22:22:47 -0800 + +aspell (0.33.7.1-12) unstable; urgency=low + + * New maintainer + * Changed Architecture fields to "any" now that the libtool bug causing + the FTBFS on hppa has hopefully been fixed (Closes: #139515) + * Add the correct copyright file to aspell-en + + -- Brian Nelson <nelson@bignachos.com> Tue, 26 Nov 2002 23:52:53 -0800 + +aspell (0.33.7.1-11) unstable; urgency=low + + * New Maintainer (Closes: #148990) + * Remove bashism from debian/rules. + + -- Peter Makholm <peter@makholm.net> Thu, 1 Aug 2002 12:15:17 +0200 + +aspell (0.33.7.1-10) unstable; urgency=low + + * Adjusted Architecture fields in order to build only on systems that + do not use gcc 3.0 as the default compiler. These actually are hppa. + + -- Domenico Andreoli <cavok@debian.org> Mon, 22 Apr 2002 18:35:28 +0200 + +aspell (0.33.7.1-9) unstable; urgency=low + + * Started using aspell-dictionary virtual package. + * Added spellutils to Suggests. + * Added autotools-dev to Build-Depends. config.{guess,sub} are now + updated from /usr/share/misc at build time. + + -- Domenico Andreoli <cavok@debian.org> Thu, 21 Mar 2002 12:28:24 +0100 + +aspell (0.33.7.1-8) unstable; urgency=low + + * Updated config.{guess,sub} to allow (maybe) building on mipsel + (Closes: #132351). + * libpspell4 minimum required version for build is now 0.12.2-5. + + -- Domenico Andreoli <cavok@debian.org> Tue, 5 Feb 2002 18:58:44 +0100 + +aspell (0.33.7.1-7) unstable; urgency=low + + * aspell-en Replaces older libaspell10 packages (Closes: #131408). + * libaspell10 is back Recommends-ing at least one of the available + dictionaries. This breaks the dependency loop introduced in -5 + (Closes: #131290). + + -- Domenico Andreoli <cavok@debian.org> Tue, 29 Jan 2002 18:43:26 +0100 + +aspell (0.33.7.1-6) unstable; urgency=low + + * Fixed aspell-en dependencies to cope with older libaspell packages + (Closes: #130306, #130454). + + -- Domenico Andreoli <cavok@debian.org> Wed, 23 Jan 2002 20:09:59 +0100 + +aspell (0.33.7.1-5) unstable; urgency=low + + * At least one dictionary is now required instead of being only + recommended, as it was until this release (Closes: #126594). + + -- Domenico Andreoli <cavok@debian.org> Mon, 7 Jan 2002 22:58:36 +0100 + +aspell (0.33.7.1-4) unstable; urgency=low + + * Strictened aspell-en dependencies. Now libaspell10 (>= 0.33.7.1-3) + is required (Closes: #121840). + * libaspell10 now suggests aspell (as it was before 0.33.7.1-1). + * Standards version is now 3.5.6. + + -- Domenico Andreoli <cavok@debian.org> Sun, 2 Dec 2001 13:26:03 +0100 + +aspell (0.33.7.1-3) unstable; urgency=low + + * More language dictionaries are available (Closes: #82880). aspell + recommends (but not strictly requires) at least one of them. + * Now separate aspell-en package is generated, just in case one didn't + want to install it. + * Added support for DVORAK keyboard (closes: #114048). + * Fixed ./configure, now it uses "lt_cv_deplibs_check_method=pass_all" + also on ARM arch (Closes: #120395). + + -- Domenico Andreoli <cavok@debian.org> Sun, 18 Nov 2001 18:57:49 +0100 + +aspell (0.33.7.1-2) unstable; urgency=low + + * Fixed pointers to /usr/doc (now /usr/share/doc) in aspell man page + and all the pointers to /usr/share/doc/aspell-doc/man-txt (now + /usr/share/doc/aspell-doc/man-text) in man pages (Closes: #111931). + * Added pointers to /usr/share/doc/aspell-doc documentation in + word-list-compress man page. + + -- Domenico Andreoli <cavok@debian.org> Sun, 16 Sep 2001 22:50:47 +0200 + +aspell (0.33.7.1-1) unstable; urgency=low + + * New upstream version. + * Reworked package relationships: + - added libstdc++-dev to Build-Depends + - added aspell-da to aspell's Suggests + - removed Suggests from libaspell10 + - removed aspell from libaspell-dev's Suggests + + -- Domenico Andreoli <cavok@debian.org> Sat, 1 Sep 2001 13:59:25 +0200 + +aspell (0.33.7-2) unstable; urgency=low + + * Strictened build dependencies on libpspell-dev (Closes: #109777). + * Moved libpspell_aspell.la from libaspell-dev to libaspell10 (Closes: #86914). + + -- Domenico Andreoli <cavok@debian.org> Mon, 27 Aug 2001 17:02:16 +0200 + +aspell (0.33.7-1) unstable; urgency=low + + * New upstream version, it compiles with gcc 3.0 (Closes: #106443). + * New maintainer + (Closes: #107416, #107417, #107418, #107419, #107420, #107422, #107423). + * Acknowledged NMUs + (Closes: #83853, #94597, #98685, #104372, #90437, #101450, #101770). + * Fixed pointers to /usr/doc (now /usr/share/doc) in run-with-aspell + man page, patch courtesy of Stephen Stafford (Closes: #103172). + + -- Domenico Andreoli <cavok@debian.org> Tue, 14 Aug 2001 01:37:19 +0200 + +aspell (0.32.6-3.4) unstable; urgency=low + + * Non Maintainer Upload. + * Fixed missing libtool in Build-Depends (Closes: #104372). + + -- Domenico Andreoli <cavok@debian.org> Fri, 13 Jul 2001 18:21:22 +0200 + +aspell (0.32.6-3.3) unstable; urgency=low + + * Non Maintainer Upload. + * libtool stuff has been upgraded (Closes: #94597). + + -- Domenico Andreoli <cavok@debian.org> Tue, 10 Jul 2001 15:42:07 +0200 + +aspell (0.32.6-3.2) unstable; urgency=low + + * Non Maintainer Upload. + * Fixed Build-Depends, now uses libltdl3-dev (instead of libltdl0-dev). + * Recompiled with more recent packages (Closes: #98685). + * libpspell-impl seems to be loaded ok now (Closes: #90437). + * Added man page for word-list-compress, patch courtesy of Aaron Lehmann + (Closes: #101450). + * Added entry in libaspell8.shlibs for libpspell_aspell library. + + -- Domenico Andreoli <cavok@debian.org> Thu, 14 Jun 2001 01:13:30 +0200 + +aspell (0.32.6-3.1) unstable; urgency=low + + * Non Maintainer Upload. + * Added the missing build dependencies on libpspell-dev and libltdl0-dev + (Closes: #83853). + * Standards-Version: 3.1.1 + + -- Adrian Bunk <bunk@fs.tum.de> Sat, 24 Feb 2001 02:13:58 +0100 + +aspell (0.32.6-3) unstable; urgency=low + + * Fixing bug # 75914 + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Wed, 17 Jan 2001 17:45:52 -0800 + +aspell (0.32.6-2) unstable; urgency=low + + * Fixed .shlibs file, it was pointing to libaspell6. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Tue, 16 Jan 2001 18:01:58 -0800 + +aspell (0.32.6-1) unstable; urgency=low + + * New upstream version. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Fri, 5 Jan 2001 13:56:36 -0800 + +aspell (0.31-1) unstable; urgency=low + + * New upstream version. This version works with libpspell2. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Wed, 14 Jun 2000 17:30:00 -0700 + +aspell (0.30.1-1) unstable; urgency=low + + * New upstream version. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Mon, 1 May 2000 17:18:09 -0700 + +aspell (0.30-1) unstable; urgency=low + + * New upstream version. + * aspell now uses the pspell (separate Debian package) spell library. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Tue, 4 Apr 2000 14:04:18 -0700 + +aspell (0.29.1-2) unstable; urgency=low + + * Compiling for release into woody + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Tue, 14 Mar 2000 17:31:08 -0800 + +aspell (0.29.1-1) frozen; urgency=high + + * New upstream version. + * On the packaging side: + - Fixed crash on powerpc (Closes: #58358) + - Fixed empty README.Debian (Closes: #54378) + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Mon, 21 Feb 2000 11:24:24 -0800 + +aspell (0.29-1) unstable; urgency=low + + * New upstream version. Changes includes: + - Rudimentary filter support for HTML, TeX etc. + - Reworked replacement suggestion code for better results + - Table driven phonetic code + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Tue, 8 Feb 2000 13:33:38 -0800 + +aspell (0.28.3-2) unstable; urgency=low + + * Fixing bug # 54378 + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Mon, 10 Jan 2000 11:55:54 -0800 + +aspell (0.28.3-1) unstable; urgency=low + + * New upstream version. Changes includes: + - Fixed a bug that caused aspell to crash when spell checking words over 60 + characters long. + - Reworked ``aspell check'' so that + 1. You no longer have to hit enter when making a choice. + 2. It will now overwrite the original file instead of creating a + new file. An optional backup can be made by using the -b + option. + - Fixed a few bugs in data.cc. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Tue, 23 Nov 1999 10:51:10 -0800 + +aspell (0.28.2.1-3) unstable; urgency=low + + * Fixing file conflict (Closes: #47294, #47316). + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Wed, 13 Oct 1999 11:53:27 -0700 + +aspell (0.28.2.1-2) unstable; urgency=low + + * Moved /usr/share/aspell from aspell package to the libaspell one (Closes: #46472). + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Mon, 11 Oct 1999 11:13:57 -0700 + +aspell (0.28.2.1-1) unstable; urgency=low + + * New upstream version. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Mon, 27 Sep 1999 13:47:13 -0700 + +aspell (0.28.1-3) unstable; urgency=low + + * Fixing bug # 42652. Made call to ldconfig conditional in + libaspell?.postinst + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Mon, 9 Aug 1999 18:04:49 -0700 + +aspell (0.28.1-2) unstable; urgency=low + + * Fixing bugs #42193 and #42194 + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Fri, 30 Jul 1999 10:08:06 -0700 + +aspell (0.28.1-1) unstable; urgency=low + + * New upstream version, fixes minor bugs. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Wed, 28 Jul 1999 09:43:41 -0700 + +aspell (0.28-1) unstable; urgency=low + + * New upstream version. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Mon, 26 Jul 1999 17:52:02 -0700 + +aspell (0.27.2-2) unstable; urgency=low + + * Fixed bug #38006. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Wed, 21 Jul 1999 14:20:19 -0700 + +aspell (0.27.2-1) unstable; urgency=low + + * New upstream version (Closes: #34441, #35575). + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Wed, 14 Apr 1999 14:42:47 -0700 + +aspell (0.27-3) unstable; urgency=low + + * Moved libaspell1 to section libs from section devel. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Tue, 9 Mar 1999 14:35:14 -0800 + +aspell (0.27-2) unstable; urgency=low + + * Fixed path in SEE ALSO section of the man page (Closes: #34176). + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Mon, 8 Mar 1999 10:15:56 -0800 + +aspell (0.27-1) unstable; urgency=low + + * New upstream version. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Wed, 24 Feb 1999 13:41:15 -0800 + +aspell (0.26.2-2) unstable; urgency=low + + * Fixed copyright. aspell is licensed under LGPL and not GPL. Also corrected + the description of the various packages in the control file. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Tue, 16 Feb 1999 11:24:30 -0800 + +aspell (0.26.2-1) unstable; urgency=low + + * Initial Release. + + -- Sudhakar Chandrasekharan <thaths@netscape.com> Mon, 8 Feb 1999 14:49:01 -0800 --- aspell-0.60.5.orig/debian/docs +++ aspell-0.60.5/debian/docs @@ -0,0 +1 @@ +README --- aspell-0.60.5.orig/debian/rules +++ aspell-0.60.5/debian/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/dpatch.mk + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V'libaspell15 (>= 0.60)' + +DEB_DH_INSTALL_SOURCEDIR := debian/tmp +DEB_INSTALL_CHANGELOGS_ALL := manual/aspell.html/ChangeLog.html +DEB_CONFIGURE_EXTRA_FLAGS := --enable-pkgdatadir=/usr/lib/aspell --enable-pkglibdir=/usr/lib/aspell + +_P=) +GCC_VERSION := $(shell gcc --version | sed -n "/^gcc/s/^[^$(_P)]*$(_P) \(.\..\).*/\1/p") +ifeq ($(GCC_VERSION),4.3) + CXX = g++ -fpermissive +endif + +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 + +binary-install/libaspell15:: +# The spell and ispell compatibility scripts don't belong in +# /usr/lib/aspell, dammit. + rm -f debian/libaspell15/usr/lib/aspell/spell \ + debian/libaspell15/usr/lib/aspell/ispell + +# Hack to fix dpatch-edit-patch +unpatch: deapply-dpatches --- aspell-0.60.5.orig/debian/libaspell-dev.install +++ aspell-0.60.5/debian/libaspell-dev.install @@ -0,0 +1,3 @@ +usr/lib/libaspell.la +usr/lib/libaspell.so +usr/include/aspell.h --- aspell-0.60.5.orig/debian/aspell-doc.install +++ aspell-0.60.5/debian/aspell-doc.install @@ -0,0 +1 @@ +usr/share/doc/aspell/* usr/share/doc/aspell-doc --- aspell-0.60.5.orig/debian/libpspell-dev.manpages +++ aspell-0.60.5/debian/libpspell-dev.manpages @@ -0,0 +1 @@ +manual/pspell-config.1 --- aspell-0.60.5.orig/debian/aspell-doc.copyright +++ aspell-0.60.5/debian/aspell-doc.copyright @@ -0,0 +1,415 @@ +This package was debianized by Sudhakar Chandrasekharan +thaths@netscape.com on Wed, 3 Feb 1999 10:27:13 -0800. It is now +maintained by Brian Nelson <pyro@debian.org>. + +It was downloaded from ftp://ftp.gnu.org/gnu/aspell + +Upstream Author: Kevin Atkinson <kevina@gnu.org> + +Copyright (c) Kevin Atkinson <kevina@gnu.org>, 2002 + +The Aspell manuals are Copyright (c) 2002 Kevin Atkinson. Permission is +granted to copy, distribute and/or modify this document under the terms +of the GNU Free Documentation License, Version 1.1 or any later version +published by the Free Software Foundation; with no Invariant Sections, +no Front-Cover Texts. and no Back-Cover Texts. + +A copy of this license follows: + + GNU Free Documentation License + Version 1.2, November 2002 + + + Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall subject +(or to related matters) and contains nothing that could fall directly +within that overall subject. (Thus, if the Document is in part a +textbook of mathematics, a Secondary Section may not explain any +mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no other +conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to give +them a chance to provide you with an updated version of the Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. +O. Preserve any Warranty Disclaimers. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other documents +released under this License, and replace the individual copies of this +License in the various documents with a single copy that is included in +the collection, provided that you follow the rules of this License for +verbatim copying of each of the documents in all other respects. + +You may extract a single document from such a collection, and distribute +it individually under this License, provided you insert a copy of this +License into the extracted document, and follow this License in all +other respects regarding verbatim copying of that document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document except +as expressly provided for under this License. Any other attempt to +copy, modify, sublicense or distribute the Document is void, and will +automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions +of the GNU Free Documentation License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. See +http://www.gnu.org/copyleft/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. --- aspell-0.60.5.orig/debian/NEWS +++ aspell-0.60.5/debian/NEWS @@ -0,0 +1,29 @@ +aspell (0.60.3-5) unstable; urgency=low + + The Debian aspell package now contains a "debctrl" filter to make it + easier to spell-check package descriptions. It filters out control + fields so that only the long description part is checked. To enable + it, run "aspell --mode=debctrl check ..." or "aspell -D check ..." + + -- Brian Nelson <pyro@debian.org> Mon, 1 Aug 2005 23:13:47 -0700 + +aspell (0.60.3-2) unstable; urgency=low + + This release begins a transition to support building the dictionary + binary hashes at install-time. As part of the transition, the + location aspell looks for dictionaries has changed from + /usr/lib/aspell-0.60 to /usr/lib/aspell, and thus all dictionary + packages need to be rebuilt. + + For dictionary package maintainers wishing to rebuild their packages + immediately to support this aspell, you should make your dictionaries + provide aspell6a-dictionary and depend upon aspell (>= 0.60.3-2) (and + not libaspell15c2--see #310590). + + For more patient dictionary package maintainers, you may wish to hold + off rebuilding your package until auto-building the binary hashes is + fully supported in hopefully a few days. See the + dict-common-dev@lists.alioth.debian.org mailing list for progress of + this support. + + -- Brian Nelson <pyro@debian.org> Wed, 6 Jul 2005 23:43:25 -0700 --- aspell-0.60.5.orig/debian/aspell.compat +++ aspell-0.60.5/debian/aspell.compat @@ -0,0 +1 @@ +0.60_c1 --- aspell-0.60.5.orig/debian/copyright +++ aspell-0.60.5/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Sudhakar Chandrasekharan +thaths@netscape.com on Wed, 3 Feb 1999 10:27:13 -0800. It is now +maintained by Brian Nelson <pyro@debian.org>. + +It was downloaded from ftp://ftp.gnu.org/gnu/aspell + +Upstream Author: Kevin Atkinson <kevina@gnu.org> + +Copyright (c) 2002, 2003, 2004 Kevin Atkinson <kevina@gnu.org> + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- aspell-0.60.5.orig/debian/libpspell-dev.install +++ aspell-0.60.5/debian/libpspell-dev.install @@ -0,0 +1,4 @@ +usr/include/pspell +usr/lib/libpspell.so +usr/lib/libpspell.la +usr/bin/pspell-config --- aspell-0.60.5.orig/debian/aspell.manpages +++ aspell-0.60.5/debian/aspell.manpages @@ -0,0 +1,5 @@ +manual/aspell.1 +manual/run-with-aspell.1 +manual/word-list-compress.1 +manual/aspell-import.1 +manual/prezip-bin.1 --- aspell-0.60.5.orig/debian/aspell-doc.info +++ aspell-0.60.5/debian/aspell-doc.info @@ -0,0 +1,2 @@ +manual/aspell.info +manual/aspell-dev.info --- aspell-0.60.5.orig/debian/aspell.lintian +++ aspell-0.60.5/debian/aspell.lintian @@ -0,0 +1,2 @@ +aspell: spelling-error-in-readme-debian german German +aspell: package-has-a-duplicate-relation --- aspell-0.60.5.orig/debian/README.Debian +++ aspell-0.60.5/debian/README.Debian @@ -0,0 +1,23 @@ +Prior to aspell-0.50.3-8, the aspell(1) manpage provided an erroneous +example of the usage of the "lang" option. The example should have +read: + + For example the following line will set the default language to + German: + + lang de + +Alternatively, you may specify the dictionary to use directly by using +the "master" option. To select the German dictionary this way: + + master german + +Using the "master" option will override any "lang" settings. Unless you +know specifically which dictionary you wish to use, you should select +dictionaries using "lang" rather than "master". + +For more information, please consult either the aspell(1) manpage or the +Aspell User's Manual found in the aspell-doc package. + +Brian Nelson <pyro@debian.org> +March 13, 2003