releasing version 2.36

diff --git a/Makefile b/Makefile
index 4742a5a74d6661d46c13040dda5d973f575ece76..56e64aa9d186b4375c810ef57507c44d8d94b0c7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 LEX    = flex
 BUILD  = jethro kraut cockney jive nyc ken ky00te newspeak nethackify
 LEX    = flex
 BUILD  = jethro kraut cockney jive nyc ken ky00te newspeak nethackify

-OTHER  = eleet b1ff chef jibberish upside-down rasterman studly fudd censor spammer uniencode
+OTHER  = eleet b1ff chef jibberish upside-down rasterman studly fudd \
+         censor spammer uniencode pirate

 CFLAGS = -O2 -lfl
 INSTALL_PROGRAM = install
 
 CFLAGS = -O2 -lfl
 INSTALL_PROGRAM = install
 

diff --git a/debian/changelog b/debian/changelog
index 6941649d054fd0cb21e067a5fc468b9eb8db388c..3e64da562da1c6ee8c35f07f48fe94dd366cecb2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-filters (2.36) UNRELEASED; urgency=low
+filters (2.36) unstable; urgency=low

 
 

-  * Added pirate filter. TODO: copyright, man page integration, makefile int
+  * Impress all yer maties on talk like a pirate day with th' new priate
+    filter, by Dougal Campbell, to be sure.
+  * Retroactively spiced up th' changelog. Shiver me timbers! 

 
  -- Joey Hess <joeyh@debian.org>  Thu, 25 Aug 2005 23:28:25 -0400
 
 filters (2.35) unstable; urgency=low
 
 
  -- Joey Hess <joeyh@debian.org>  Thu, 25 Aug 2005 23:28:25 -0400
 
 filters (2.35) unstable; urgency=low
 

-  * Add nethackify filter. Closes: #317656
+  * Ad| nethackify filtcr. Closes: #317656

   * Add automatic webpage update gunk.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 25 Aug 2005 22:24:29 -0400
   * Add automatic webpage update gunk.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 25 Aug 2005 22:24:29 -0400


@@ -123,7 +125,7 @@ filters (2.20) unstable; urgency=low
 
   * Woo hoo! JWZ has placed newspeak under a BSD-ish license, so it moves
     in from filters-nonfree. Which is now empty, and will be removed.
 
   * Woo hoo! JWZ has placed newspeak under a BSD-ish license, so it moves
     in from filters-nonfree. Which is now empty, and will be removed.

-  * Added studly caps filter by Nick Phillips <nwp@lemon-computing.com>.
+  * AdDed StudLy cAps FiltEr bY NiCk PHillIps <nwp@lemon-computing.com>.

 
  -- Joey Hess <joeyh@debian.org>  Mon,  6 Aug 2001 20:38:49 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Mon,  6 Aug 2001 20:38:49 -0400
 


@@ -163,8 +165,8 @@ filters (2.15) unstable; urgency=low
 
 filters (2.14) unstable; urgency=low
 
 
 filters (2.14) unstable; urgency=low
 

-  * Hahaha. Added a rasterman filter. (Not just "raster" as I worry about
-    namespace pollution.)
+  * hahaha. addde a rasterman filter. (nto just "raster" as i woryr about
+      namespaec pollution.)

 
  -- Joey Hess <joeyh@debian.org>  Mon, 27 Nov 2000 20:00:28 -0800
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 27 Nov 2000 20:00:28 -0800
 


@@ -252,7 +254,7 @@ filters (2.2) unstable; urgency=low
 
 filters (2.1) unstable; urgency=low
 
 
 filters (2.1) unstable; urgency=low
 

-  * Added upside down filter, which well, turns text upside down.
+  'umop ap!sdn fxaf sujnf `77am y)!ym `jaf7!j umop ap!sdn pappe *  

 
  -- Joey Hess <joeyh@debian.org>  Sat, 20 Feb 1999 18:22:43 -0800
 
 
  -- Joey Hess <joeyh@debian.org>  Sat, 20 Feb 1999 18:22:43 -0800
 


@@ -280,7 +282,7 @@ filters (1.7) unstable; urgency=low
 
 filters (1.6) unstable; urgency=low
 
 
 filters (1.6) unstable; urgency=low
 

-  * Added eleet filter, thanks to Jeremy Worrells <jworrell@priacc.com>.
+  * 4dd3d 3l33t f1lt3r, th4nk5 t0 j3r3my w0rr3ll5 <jworrell@priacc.com>.

 
  -- Joey Hess <joeyh@debian.org>  Fri,  6 Mar 1998 11:41:29 -0800
 
 
  -- Joey Hess <joeyh@debian.org>  Fri,  6 Mar 1998 11:41:29 -0800
 

diff --git a/debian/copyright b/debian/copyright
index 762b40bc254850d0caa3e3430e25eee7249b6781..10b0fcdf541d10e38841891c53850c49456a5458 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -98,6 +98,9 @@ has the following license statement:
 The nethackify filter is copyright 2004 by G�kan Seng�
 <gurkan@linuks.mine.nu> and is released under the gpl.
 
 The nethackify filter is copyright 2004 by G�kan Seng�
 <gurkan@linuks.mine.nu> and is released under the gpl.
 

+The pirate filter was converted from a php version in the funfilters, which
+are Copyright 2003 by Dougal Campbell and are licensed under the GPL.
+

 Everything else is copyright 1999-2005 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.
 Everything else is copyright 1999-2005 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.

diff --git a/filters.6 b/filters.6
index cbba0f4af40d4a7f23d8aefd7063303688851b2a..96fdec322314991aaf8c96d445dd8c79b333bf2f 100644 (file)
--- a/filters.6
+++ b/filters.6
@@ -1,6 +1,6 @@
 .TH FILTERS 6
 .SH NAME
 .TH FILTERS 6
 .SH NAME

-ken, b1ff, censor, chef, cockney, eleet, fudd, jethro, jibberish, jive, kraut, ky00te, newspeak, nyc, rasterman, spammer, studly, uniencode, upside\-down \- assorted text filters
+ken, b1ff, censor, chef, cockney, eleet, fudd, jethro, jibberish, jive, kraut, ky00te, nethack, newspeak, nyc, pirate, rasterman, spammer, studly, uniencode, upside\-down \- assorted text filters

 .SH SYNOPSIS
  $SHELL | chef
  
 .SH SYNOPSIS
  $SHELL | chef
  


@@ -11,7 +11,8 @@ ken, b1ff, censor, chef, cockney, eleet, fudd, jethro, jibberish, jive, kraut, k
  b1ff | ircII | censor
 .SH "DESCRIPTION"
 All of these programs are filters to do all sorts of strange things to text.
  b1ff | ircII | censor
 .SH "DESCRIPTION"
 All of these programs are filters to do all sorts of strange things to text.

-No personal, racial, societal slurs are intended. For amusement only.
+No personal, racial, religious or 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.


@@ -48,6 +49,8 @@ A-la-1984
 CDA-ize text
 .IP nyc
 Brooklyn English
 CDA-ize text
 .IP nyc
 Brooklyn English

+.IP pirate
+Talk like a pirate.

 .IP rasterman
 Makes text look like it came from the keyboard of Carsten Haitzler.
 .IP spammer
 .IP rasterman
 Makes text look like it came from the keyboard of Carsten Haitzler.
 .IP spammer


@@ -69,5 +72,6 @@ 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 by Jamie Zawinski
 <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 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>, 
+G�kan Seng� <gurkan@linuks.mine.nu> wrote nethackify, Dougal Campbell
+<dougal@gunters.org> wrote pirate, and kraut is by John Sparks. 

diff --git a/jibberish b/jibberish
index b4f219d799a6a61a32fe48d544cc6759bded3a2e..af0ea16a34a7019558967a8eb0237232c02599bf 100755 (executable)
--- a/jibberish
+++ b/jibberish
@@ -12,6 +12,7 @@ upside-down
 kraut
 cockney
 jive
 kraut
 cockney
 jive

+pirate

 nyc
 ken
 ky00te
 nyc
 ken
 ky00te

diff --git a/pirate b/pirate
index d35b1387b27144ac79567a35c3239a7efd69ccfb..33fe86188b76d243fc473f52aa2c1f95d64e1fb1 100755 (executable)
--- a/pirate
+++ b/pirate
@@ -84,8 +84,8 @@ while (@trans_table) {
 
 s/ing\b/in'/g;
 s/ings\b/in's/g;
 
 s/ing\b/in'/g;
 s/ings\b/in's/g;

-s/(\.[ \t])/avast($1,3)/eg;
-s/([!\?][ \t])/avast($1,2)/eg; # Greater chance after exclamation
+s/(\.( |\t|$))/avast($1,3)/eg;
+s/([!\?]( \t|$))/avast($1,2)/eg; # Greater chance after exclamation

 
 sub avast {
        my $stub=shift;
 
 sub avast {
        my $stub=shift;