From f4eab085b5b0fe9a8c6ebca53ef1f84d12b6bce5 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 10:33:17 +0000
Subject: [PATCH] auto-import changelog data from pnm2ppa-1.04-1.src.rpm Mon
 Dec 11 2000 Crutcher Dunnavant <crutcher@redhat.com> - Upgrade to 1.04,
 editied the pbm2ppa patch to add <string.h> - to pbmtpg.c, which uses strmp,
 edited the redhat patch to - apply cleanly.

---
 .cvsignore            |  2 +-
 pbm2ppa-20000205.diff |  3 ++-
 pnm2ppa-redhat.patch  | 12 +++++++-----
 sources               |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d7fd10a..c49f9d3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-pnm2ppa-1.0.tar.gz
+pnm2ppa-1.04.tar.gz
 ppa-0.8.6.tar.gz
diff --git a/pbm2ppa-20000205.diff b/pbm2ppa-20000205.diff
index 116f3fd..c688c2b 100644
--- a/pbm2ppa-20000205.diff
+++ b/pbm2ppa-20000205.diff
@@ -813,9 +813,10 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp820 pbm2ppa-20000205/pbm2ppa.conf.hp820
 diff -uNr pbm2ppa-0.8.6/pbmtpg.c pbm2ppa-20000205/pbmtpg.c
 --- pbm2ppa-0.8.6/pbmtpg.c	Tue Sep 15 20:00:28 1998
 +++ pbm2ppa-20000205/pbmtpg.c	Sat Feb  5 04:34:45 2000
-@@ -2,12 +2,17 @@
+@@ -2,12 +2,18 @@
  #include <stdio.h>
  #include <stdlib.h>
++#include <string.h>
  
 -/* Support both US and A4. */
 +/* Support  US Letter, Legal,  and A4. */
diff --git a/pnm2ppa-redhat.patch b/pnm2ppa-redhat.patch
index d930060..ce08819 100644
--- a/pnm2ppa-redhat.patch
+++ b/pnm2ppa-redhat.patch
@@ -1,12 +1,11 @@
 diff -uNr pnm2ppa-0.99pre3/pnm2ppa.conf pnm2ppa-0.99pre3-redhat/pnm2ppa.conf
 --- pnm2ppa-0.99pre3/pnm2ppa.conf	Fri May 26 01:35:52 2000
 +++ pnm2ppa-0.99pre3-redhat/pnm2ppa.conf	Fri May 26 04:03:56 2000
-@@ -10,7 +10,7 @@
- # if there's more than one version, the last "version" will be used
- # 
+@@ -12,7 +12,6 @@
+ # will be used.   The printer version can also be set with the command line
+ # option e.g., "-v 720".
  
--version   ERROR
-+
+-version   ERROR    # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!!
  #version  720	# 710, 712, 722 also acceptable
  #version  820
  #version 1000
@@ -30,3 +29,6 @@ diff -uNr pnm2ppa-0.99pre3/pnm2ppa.conf pnm2ppa-0.99pre3-redhat/pnm2ppa.conf
  LDFLAGS=-lm
  OBJS = pnm2ppa.o ppa.o image.o dither.o cutswath.o hash_ink.o
  SRC =  pnm3ppa.c ppa.c image.c dither.c cutswath.c hash_ink.c
+--- pnm2ppa.conf	Tue Dec 12 05:13:59 2000
++++ foo	Tue Dec 12 05:15:57 2000
+
diff --git a/sources b/sources
index d17e272..873edfc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5a92147c87a7c6e4955c8542a9af11e5  pnm2ppa-1.0.tar.gz
+8db1f0dcdb3cf86d8ccb9a34007b9e21  pnm2ppa-1.04.tar.gz
 fb40576435d5979db64fbea305ec224b  ppa-0.8.6.tar.gz