7 files changed, 99 insertions, 134 deletions
diff --git a/pbm/ChangeLog b/pbm/ChangeLog
index 65afe89..7a5c861 100644
--- a/pbm/ChangeLog
+++ b/pbm/ChangeLog
@@ -1,41 +1,3 @@
-Sat Aug  7 11:51:41 1993  Karl Berry  (karl@cs.umb.edu)
+DEPRECATED - USE ROOT CHANGELOG
 
-	* libpbm1.c: c-ctype.h now in kpathsea.
-
-Fri Dec 11 15:06:54 1992  Karl Berry  (karl@cs.umb.edu)
-
-	* libpbm1.c (pm_keymatch): Change ctype references to use
-	uppercase macros.
-
-Tue Oct 27 12:56:21 1992  Karl Berry  (karl@cs.umb.edu)
-
-	* Version 0.6.
-
-Tue Sep 15 08:39:17 1992  Karl Berry  (karl@hayley)
-
-        * libpbm1.c (malloc, free, exit): don't declare these, rely on
-          config.h.
-
-Thu Sep  3 09:31:14 1992  Karl Berry  (karl@hayley)
-
-        * Version 0.5.
-
-Wed Apr 15 09:01:07 1992  Karl Berry  (karl@hayley)
-
-        * pbmascii.c: new file for debugging.
-
-Sat Mar 28 07:49:22 1992  Karl Berry  (karl at hayley)
-
-        * Version 0.4.
-
-        * Change copyright years to 1992 only.
-
-Sat Mar  7 10:00:47 1992  Karl Berry  (karl at hayley)
-
-        * GNUmakefile (files, headers, sources): replace with `c_and_h', etc.
-
-        * libpbm1.c: use #if __STDC__, not #ifdef.
-
-Thu Mar  5 07:53:37 1992  Karl Berry  (karl at hayley)
-
-        * Created.
+For historical purposes you can view ChangeLog.old.
diff --git a/pbm/GNUmakefile b/pbm/GNUmakefile
index 81cfc8c..0c162e1 100644
--- a/pbm/GNUmakefile
+++ b/pbm/GNUmakefile
@@ -2,10 +2,10 @@
 # 
 # Copyright (C) 1992, 2011 Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,9 +13,10 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+
+
 library = pbm
 
 h_only = libpbm
diff --git a/pbm/libpbm.h b/pbm/libpbm.h
index 1cd1075..6299314 100644
--- a/pbm/libpbm.h
+++ b/pbm/libpbm.h
@@ -1,19 +1,20 @@
-/* libpbm.h - internal header file for libpbm portable bitmap library
-Copyright (C) 2011 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
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+# libpbm.h: internal header file for libpbm portable bitmap library
+#
+# Copyright (C) 2011 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 #ifndef _LIBPBM_H_
 #define _LIBPBM_H_
@@ -29,4 +30,3 @@ int pbm_readmagicnumber ARGS(( FILE* file ));
 void pbm_readpbminitrest ARGS(( FILE* file, int* colsP, int* rowsP ));
 
 #endif /*_LIBPBM_H_*/
-
diff --git a/pbm/libpbm1.c b/pbm/libpbm1.c
index c7bf4e9..bc216af 100644
--- a/pbm/libpbm1.c
+++ b/pbm/libpbm1.c
@@ -1,25 +1,24 @@
-/* libpbm1.c - pbm utility library part 1
-** $Id: libpbm1.c,v 1.5 2011/02/08 02:41:51 styluseater Exp $
+# libpbm1.c: pbm utility library part 1
+** $Id: libpbm1.c,v 1.6 2011/02/26 05:18:43 styluseater Exp $
+#
+# Copyright (C) 1988, 2004 by Jef Poskanzer.
+# Copyright (C) 2011 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Minor configuration changes for GNU --karl.
 
-Copyright (C) 1988, 2004 by Jef Poskanzer.
-Copyright (C) 2011 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
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
-
- Minor configuration changes for GNU --karl.
-*/
 
 #include "pbm.h"
 #include "libpbm.h"
diff --git a/pbm/libpbm2.c b/pbm/libpbm2.c
index 03a224c..e9390e5 100644
--- a/pbm/libpbm2.c
+++ b/pbm/libpbm2.c
@@ -1,21 +1,22 @@
-/* libpbm2.c - pbm utility library part 2
+# libpbm2.c: pbm utility library part 2
+#
+# Copyright (C) 1988 by Jef Poskanzer.
+# Copyright (C) 2011 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
-Copyright (C) 1988 by Jef Poskanzer.
-Copyright (C) 2011 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
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "pbmplus.h"
 #include "pbm.h"
diff --git a/pbm/libpbm4.c b/pbm/libpbm4.c
index f67b233..e8b6040 100644
--- a/pbm/libpbm4.c
+++ b/pbm/libpbm4.c
@@ -1,21 +1,22 @@
-/* libpbm4.c - pbm utility library part 4
+# libpbm4.c: pbm utility library part 4
+#
+# Copyright (C) 1988 by Jef Poskanzer.
+# Copyright (C) 2011 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
-Copyright (C) 1988 by Jef Poskanzer.
-Copyright (C) 2011 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
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "pbm.h"
 #include "libpbm.h"
diff --git a/pbm/pbmascii.c b/pbm/pbmascii.c
index f963f02..c7fe2b7 100644
--- a/pbm/pbmascii.c
+++ b/pbm/pbmascii.c
@@ -1,20 +1,21 @@
-/* pbmascii -- dump a PBM file (from stdin) on stdout. 
+# pbmascii: dump a PBM file (from stdin) on stdout. 
+#
+# Copyright (C) 2011 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
-Copyright (C) 2011 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
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,7 +46,7 @@ main (int argc, char *argv[])
   return 0;
 }
 
-
+
 /*
 Local variables:
 compile-command: "gcc -g -posix -o pbmascii pbmascii.c pbm.a"