Date: Mon, 21 Oct 2002 03:59:24 +0400 (MSD) From: "Aleksandr A. Babaylov" <babolo@aaz.links.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/44322: ports/print/cups-base has patches for rcs Ids Message-ID: <200210202359.g9KNxOHl089912@aaz.links.ru>
next in thread | raw e-mail | index | archive | help
>Number: 44322
>Category: ports
>Synopsis: ports/print/cups-base has patches for rcs Ids
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 20 17:00:10 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Aleksandr A. Babaylov
>Release: FreeBSD 4.7-STABLE i386
>Organization:
home
>Environment:
System: FreeBSD 4.7-PRERELEASE i386
fresh ports tree
>Description:
Rcs Ids in patches corrupts while go through
cvsup/cvs process
>How-To-Repeat:
cvsup and cvs up ports
try make patch in ports/print/cups-base
see rejected patches with Id in it
>Fix:
delete first chunks in
ports/print/cups-base/files/patch-backend-usb.c-1.1.16
ports/print/cups-base/files/patch-filter-pstops.c
ports/print/cups-base/files/patch-scheduler-mime.c-1.1.16
This is my cvs diff -u, but I understand it will not apply
cleanly
Index: files/patch-backend-usb.c-1.1.16
===================================================================
RCS file: /home/CVShome/FreeBSD/ports/print/cups-base/files/patch-backend-usb.c-1.1.16,v
retrieving revision 1.2
diff -u -r1.2 patch-backend-usb.c-1.1.16
--- files/patch-backend-usb.c-1.1.16 17 Aug 2002 21:59:14 -0000 1.2
+++ files/patch-backend-usb.c-1.1.16 18 Oct 2002 17:59:57 -0000
@@ -1,12 +1,5 @@
--- backend/usb.c.orig Thu May 16 09:44:50 2002
+++ backend/usb.c Sat Aug 17 17:48:21 2002
-@@ -1,5 +1,5 @@
- /*
-- * "$Id: patch-backend-usb.c-1.1.16,v 1.2 2002/08/17 21:59:14 alane Exp $"
-+ * "$Id: patch-backend-usb.c-1.1.16,v 1.2 2002/08/17 21:59:14 alane Exp $"
- *
- * USB port backend for the Common UNIX Printing System (CUPS).
- *
@@ -431,34 +431,37 @@
}
#elif defined(__sgi)
Index: files/patch-filter-pstops.c
===================================================================
RCS file: /home/CVShome/FreeBSD/ports/print/cups-base/files/patch-filter-pstops.c,v
retrieving revision 1.1
diff -u -r1.1 patch-filter-pstops.c
--- files/patch-filter-pstops.c 31 Jul 2002 08:43:03 -0000 1.1
+++ files/patch-filter-pstops.c 18 Oct 2002 18:01:07 -0000
@@ -1,12 +1,5 @@
--- filter/pstops.c Tue May 28 15:04:50 2002
+++ /home/alane/sw/src/cups/filter/pstops.c Thu Jun 27 12:31:45 2002
-@@ -1,5 +1,5 @@
- /*
-- * "$Id: patch-filter-pstops.c,v 1.1 2002/07/31 08:43:03 alane Exp $"
-+ * "$Id: patch-filter-pstops.c,v 1.1 2002/07/31 08:43:03 alane Exp $"
- *
- * PostScript filter for the Common UNIX Printing System (CUPS).
- *
@@ -60,8 +60,8 @@
#define LAYOUT_RLBT 2 /* Right to left, bottom to top */
#define LAYOUT_RLTB 3 /* Right to left, top to bottom */
Index: files/patch-scheduler-mime.c-1.1.16
===================================================================
RCS file: /home/CVShome/FreeBSD/ports/print/cups-base/files/patch-scheduler-mime.c-1.1.16,v
retrieving revision 1.1
diff -u -r1.1 patch-scheduler-mime.c-1.1.16
--- files/patch-scheduler-mime.c-1.1.16 11 Sep 2002 15:18:12 -0000 1.1
+++ files/patch-scheduler-mime.c-1.1.16 18 Oct 2002 18:01:45 -0000
@@ -6,13 +6,6 @@
diff -u -3 -r1.12 -r1.14
--- scheduler/mime.c 2002/05/16 13:45:02 1.12
+++ scheduler/mime.c 2002/08/23 01:33:46 1.14
-@@ -1,5 +1,5 @@
- /*
-- * "$Id: patch-scheduler-mime.c-1.1.16,v 1.1 2002/09/11 15:18:12 alane Exp $"
-+ * "$Id: patch-scheduler-mime.c-1.1.16,v 1.1 2002/09/11 15:18:12 alane Exp $"
- *
- * MIME database file routines for the Common UNIX Printing System (CUPS).
- *
@@ -502,17 +502,20 @@
filter = lineptr;
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210202359.g9KNxOHl089912>