summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2004-08-22 02:50:38 +0000
committerSven Wegener <swegener@gentoo.org>2004-08-22 02:50:38 +0000
commit5540a376c4a5ca3414d4601c01aceba8cfc2d1f6 (patch)
treeb72d133ddcfbeedb50df6be040e38c117347b9a8
parentMarked stable on x86. (Manifest recommit) (diff)
downloadgentoo-2-5540a376c4a5ca3414d4601c01aceba8cfc2d1f6.tar.gz
gentoo-2-5540a376c4a5ca3414d4601c01aceba8cfc2d1f6.tar.bz2
gentoo-2-5540a376c4a5ca3414d4601c01aceba8cfc2d1f6.zip
Modified patch to not include CVS keyword replacements. Closes bug #61118.
-rw-r--r--sys-apps/buffer/ChangeLog5
-rw-r--r--sys-apps/buffer/files/1.19-deb-gentoo.patch4
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-apps/buffer/ChangeLog b/sys-apps/buffer/ChangeLog
index 31e050a75edf..30feb3f5594a 100644
--- a/sys-apps/buffer/ChangeLog
+++ b/sys-apps/buffer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/buffer
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/buffer/ChangeLog,v 1.6 2004/08/21 05:53:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/buffer/ChangeLog,v 1.7 2004/08/22 02:50:38 swegener Exp $
+
+ 22 Aug 2004; Sven Wegener <swegener@gentoo.org> files/1.19-deb-gentoo.patch:
+ Modified patch to not include CVS keyword replacements. Closes bug #61118.
*buffer-1.19-r2 (21 Aug 2004)
diff --git a/sys-apps/buffer/files/1.19-deb-gentoo.patch b/sys-apps/buffer/files/1.19-deb-gentoo.patch
index 6bd96c17a2e1..66ea66433bc6 100644
--- a/sys-apps/buffer/files/1.19-deb-gentoo.patch
+++ b/sys-apps/buffer/files/1.19-deb-gentoo.patch
@@ -11,7 +11,7 @@ diff -ur buffer-1.19.orig/buffer.c buffer-1.19/buffer.c
#include <unistd.h>
#include <stdio.h>
#include <signal.h>
-@@ -120,15 +123,16 @@
+@@ -120,6 +123,7 @@
#include <sys/shm.h>
#include <sys/sem.h>
#include <sys/wait.h>
@@ -19,7 +19,7 @@ diff -ur buffer-1.19.orig/buffer.c buffer-1.19/buffer.c
#include "sem.h"
#ifndef lint
- static char *rcsid = "$Header: /var/cvsroot/gentoo-x86/sys-apps/buffer/files/1.19-deb-gentoo.patch,v 1.1 2004/08/21 05:53:45 vapier Exp $";
+@@ -127,8 +131,8 @@
#endif
-#ifndef __alpha