* Deal with the new flex 2.5.31 as follows:

     - Add main and yywrap functions, though they were not needed before.
     - Call yyunput instead of unput macro, as the macro uses yytext_ptr,
       which flex undefes before the bottom set of functions are defined.
     Closes: #189040
   * Various other fixes to build without warnings.

diff --git a/cockney.l b/cockney.l
index e6c0bdae91e4d1a25cdf7b96c064453dab24ce77..823af7e98d609d3067590a7c72799d1ce5580c04 100644 (file)
--- a/cockney.l
+++ b/cockney.l
@@ -94,12 +94,22 @@ eos()
     if (yytext[yyleng-1] == '.')
        dintI();
     else
     if (yytext[yyleng-1] == '.')
        dintI();
     else

-       unput(yytext[yyleng-1]);
+       yyunput(yytext[yyleng-1], yytext);

 }
 
 plastc()
 {
 }
 
 plastc()
 {

-    unput(yytext[yyleng-1]);
+    yyunput(yytext[yyleng-1], yytext);
+}
+
+main()
+{
+        yylex();
+}
+
+int yywrap()
+{
+       return 1;

 }
 
 caseify(c)
 }
 
 caseify(c)

diff --git a/debian/TODO b/debian/TODO
index a1a7bfcf34d6cc32e52bdf24765a6c429e181c47..ad4e968cdacd83dd28aad2c05b6f9cae11d50e78 100644 (file)
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,3 +1,4 @@
 * continue to make the chef filter more similar to the old one
 * write and collect more filters
 * does anyone have an asci-art cow font?
 * continue to make the chef filter more similar to the old one
 * write and collect more filters
 * does anyone have an asci-art cow font?

+* rms filter, though vrms already does a good job..

diff --git a/debian/changelog b/debian/changelog
index dfdd0bf356a9d5a9eea16d27f9919d8434f49c68..8079bbce962f65d40c6061f550b4f7d987cc66a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+filters (2.32) unstable; urgency=low
+
+  * Deal with the new flex 2.5.31 as follows:
+    - Add main and yywrap functions, though they were not needed before.
+    - Call yyunput instead of unput macro, as the macro uses yytext_ptr,
+      which flex undefes before the bottom set of functions are defined.
+    Closes: #189040
+  * Various other fixes to build without warnings.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 14 Apr 2003 23:39:26 -0400
+

 filters (2.31) unstable; urgency=low
 
   * censor: corrected spelling of pyvgbevf, Closes: #172976
 filters (2.31) unstable; urgency=low
 
   * censor: corrected spelling of pyvgbevf, Closes: #172976

diff --git a/debian/control b/debian/control
index 65116c5187bb0b60c9e5c6af5d8bc12fd15e1800..64551229a9a0f9294e361c59038df6829e8287da 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Build-Depends: debhelper (>= 4), flex, bison | byacc | btyacc, dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
 Priority: optional
 Build-Depends: debhelper (>= 4), flex, bison | byacc | btyacc, dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>

-Standards-Version: 3.5.8.0
+Standards-Version: 3.5.9.0

 
 Package: filters
 Architecture: any
 
 Package: filters
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index cd0bfa4132659fb920297addf24a4cac1e9c33e1..f5269a5997bf6a3a4d826bee9617f5121179e8da 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-This is a Debian prepackaged version of the filters package.
+This is the Debian filters package.

 
 This package was put together and debianized by Joey Hess
 <joeyh@debian.org>, using sources from all over.
 
 This package was put together and debianized by Joey Hess
 <joeyh@debian.org>, using sources from all over.


@@ -95,6 +95,6 @@ has the following license statement:
 
 # just for reference, you may do whatever you like with this file.
 
 
 # just for reference, you may do whatever you like with this file.
 

-Everything else is copyright 1999-2002 by Joey Hess, under the terms of GPL.
+Everything else is copyright 1999-2003 by Joey Hess, under the terms of GPL.

 The full text of the GNU GPL can be found in /usr/share/common-licenses/GPL
 on Debian systems.
 The full text of the GNU GPL can be found in /usr/share/common-licenses/GPL
 on Debian systems.

diff --git a/filters.6 b/filters.6
index 279ec0d928ba7e8b1dbaf803b2f7beaaa1f61f8e..2308046ef2738263d28a329fb2041c45d426aa48 100644 (file)
--- a/filters.6
+++ b/filters.6
@@ -8,10 +8,10 @@ ken, b1ff, censor, chef, cockney, eleet, fudd, jethro, jibberish, jive, kraut, k
 
  eleet | wall # b1ff works well too
 
 
  eleet | wall # b1ff works well too
 

- b1ff | bitchx | censor
+ b1ff | ircII | censor

 .SH "DESCRIPTION"
 All of these programs are filters to do all sorts of strange things to text.
 .SH "DESCRIPTION"
 All of these programs are filters to do all sorts of strange things to text.

-No racial or societal slurs are intended. For amusement only.
+No personal, racial, societal slurs are intended. For amusement only.

 .P
 All the filters read input from stdin, change it, and write the filtered
 text to stdout.
 .P
 All the filters read input from stdin, change it, and write the filtered
 text to stdout.


@@ -63,6 +63,6 @@ Joey Hess <joey@kitenet.net>. Daniel V Klein <dvk@lonewolf.com> wrote the
 cockney, jive, and nyc filters. jibberish is by Raul Miller
 <rdm@test.legislate.com>, jethro is by Duane Paulson
 <ci922@cleveland.freenet.edu>, rasterman is by Zachary Beane, ken is by
 cockney, jive, and nyc filters. jibberish is by Raul Miller
 <rdm@test.legislate.com>, jethro is by Duane Paulson
 <ci922@cleveland.freenet.edu>, rasterman is by Zachary Beane, ken is by

-Stephen K Mulrine <skm@eqsn.net>, newspeak is authored by Jamie Zawinski
+Stephen K Mulrine <skm@eqsn.net>, newspeak is by Jamie Zawinski

 <jwz@jwz.org>, studly is by Nick Phillips <nwp@lemon-computing.com>, and
 kraut is by John Sparks.
 <jwz@jwz.org>, studly is by Nick Phillips <nwp@lemon-computing.com>, and
 kraut is by John Sparks.

diff --git a/jethro.l b/jethro.l
index 1ea0f79a655e028dfdc05cf544cf76bb1b785152..89ed150e84ddb071e1699318958dd6cc198ff618 100644 (file)
--- a/jethro.l
+++ b/jethro.l
@@ -206,7 +206,6 @@ char WhAt[]="@(#)Duane Paulson's hillbilly text filter. (jethro)\n@(#)$Header: j
 {SW}[Aa]t{BW}all{EW}   *(yytext+1)=(char)'A'; SESUB("A tall");
 
 {SW}[Aa]m{EW}          |
 {SW}[Aa]t{BW}all{EW}   *(yytext+1)=(char)'A'; SESUB("A tall");
 
 {SW}[Aa]m{EW}          |

-{SW}[Aa]re{EW}         SESUB("Is");

 {SW}[Ww]as{EW}         |
 {SW}[Ww]ere{EW}                SESUB("Wuz");
 {SW}[Ww]asn't{EW}      SESUB("Wasunt");
 {SW}[Ww]as{EW}         |
 {SW}[Ww]ere{EW}                SESUB("Wuz");
 {SW}[Ww]asn't{EW}      SESUB("Wasunt");


@@ -231,7 +230,6 @@ ing                 SUB("in");
 {SW}[Tt]oo{EW}         SESUB("Besides");
 {SW}[Tt]o{EW}          SESUB("Tuh");
 {SW}[Aa][n]?{EW}       SESUB("Ah");
 {SW}[Tt]oo{EW}         SESUB("Besides");
 {SW}[Tt]o{EW}          SESUB("Tuh");
 {SW}[Aa][n]?{EW}       SESUB("Ah");

-{SW}[Aa]re{EW}         |

 {SW}[Oo]ur{EW}         |
 {SW}[Oo]r{EW}          SESUB("Ore");
 {SW}[Oo]f{EW}          SESUB("Uv");
 {SW}[Oo]ur{EW}         |
 {SW}[Oo]r{EW}          SESUB("Ore");
 {SW}[Oo]f{EW}          SESUB("Uv");


@@ -271,3 +269,7 @@ main()
        yylex();
 }
 
        yylex();
 }
 

+int yywrap()
+{
+       return 1;
+}

diff --git a/jive.l b/jive.l
index dcb99240b2bfcc52d71eab532eeb189e6b93c10e..750b3cdb9a5921db2c605cf0f0313a2d3383718a 100644 (file)
--- a/jive.l
+++ b/jive.l
@@ -7,6 +7,7 @@
  *
  *     Reproduction permitted so long as this notice is retained.
  */
  *
  *     Reproduction permitted so long as this notice is retained.
  */

+

 %}
 %e 1700
 %p 4000
 %}
 %e 1700
 %p 4000


@@ -196,7 +197,7 @@ cally                               printf("c'l");
 %%
 plastc()
 {
 %%
 plastc()
 {

-       unput(yytext[yyleng-1]);
+       yyunput(yytext[yyleng-1], yytext);

 }
 
 caseify(c)
 }
 
 caseify(c)


@@ -242,6 +243,16 @@ expletive()
                }
 }
 
                }
 }
 

+main()
+{
+       yylex();
+}
+
+int yywrap()
+{
+       return 1;
+}
+

 /*
  * Bugs:
  *
 /*
  * Bugs:
  *

diff --git a/ken.l b/ken.l
index 784db92fff917573244708e62058451265719ff3..6c6788c9a27190b8cdafa5ad3f12e62deee6ac76 100644 (file)
--- a/ken.l
+++ b/ken.l
@@ -292,3 +292,8 @@ main()
        srand(getpid());
        yylex();
 }
        srand(getpid());
        yylex();
 }

+
+int yywrap()
+{
+       return 1;
+}

diff --git a/ky00te.dir/ky00te.yacc b/ky00te.dir/ky00te.yacc
index ac49c06586da378becda72e0a7121629c4bb908f..4254394bcfb1c9761eb56e3c649cf28925c2eb6f 100644 (file)
--- a/ky00te.dir/ky00te.yacc
+++ b/ky00te.dir/ky00te.yacc
@@ -119,7 +119,7 @@ t:  CUTE   { printf("ky00te!"); }
 
 extern char mylval;
 
 
 extern char mylval;
 

-void yyerror(char *s) {
+int yyerror(char *s) {

        printf("%s\n",s);
 }
 
        printf("%s\n",s);
 }
 

diff --git a/makesample.sh b/makesample.sh
index ce38c2ef661abad37e91b778d23d9bd05994a6e9..dc1f0453271d3e7509c12167cfee0190947c87d4 100644 (file)
--- a/makesample.sh
+++ b/makesample.sh
@@ -2,6 +2,6 @@
 chmod +x $1
 echo $1 >>SAMPLES
 echo "-------------" >>SAMPLES
 chmod +x $1
 echo $1 >>SAMPLES
 echo "-------------" >>SAMPLES

-printf "Here's how this filter sounds, in everyday use.\nThis line is another sample of this filter's output." | ./$1 >>SAMPLES
+printf "Here's how this filter sounds, in everyday use.\nNow is the time for all good men to come to the aid of their country." | ./$1 >>SAMPLES

 echo "" >>SAMPLES
 echo "" >>SAMPLES
 echo "" >>SAMPLES
 echo "" >>SAMPLES

diff --git a/newspeak.l b/newspeak.l
index 51333abd1034927d31f785ae344897f0ba6cfa9f..20524e550b7f1ef83a4fcd831fad558e08fca350 100644 (file)
--- a/newspeak.l
+++ b/newspeak.l
@@ -13,7 +13,6 @@
  *      for any purpose.  It is provided "as is" without express or
  *      implied warranty.
  *
  *      for any purpose.  It is provided "as is" without express or
  *      implied warranty.
  *

- *     Permissiom granted for noncommercial use and redistribution.

  *     To compile:
  *
  *     flex newspeak.l
  *     To compile:
  *
  *     flex newspeak.l

diff --git a/nyc.l b/nyc.l
index 8505c1652ab79b3e21793130e5aad149db369104..e6546b276951410176b34cfa999e708a396af680 100644 (file)
--- a/nyc.l
+++ b/nyc.l
@@ -68,7 +68,7 @@ negro                         printf("spade");
 %%
 plastc()
 {
 %%
 plastc()
 {

-       unput(yytext[yyleng-1]);
+       yyunput(yytext[yyleng-1], yytext);

 }
 
 caseify(c)
 }
 
 caseify(c)


@@ -95,3 +95,13 @@ expletive()
                        }
                }
 }
                        }
                }
 }

+
+main()
+{
+       yylex();
+}
+
+int yywrap()
+{
+       return 1;
+}