[gs-cvs] rev 7923 - in branches: . gs-esp-gpl-merger/doc gs-esp-gpl-merger/jbig2dec gs-esp-gpl-merger/lib gs-esp-gpl-merger/src gs-esp-gpl-merger/toolbin

[till at ghostscript.com]

Author: till
Date: 2007-05-08 14:32:20 -0700 (Tue, 08 May 2007)
New Revision: 7923

Added:
   branches/gs-esp-gpl-merger/
Modified:
   branches/gs-esp-gpl-merger/doc/gsdoc.el
   branches/gs-esp-gpl-merger/jbig2dec/configure.ac
   branches/gs-esp-gpl-merger/lib/jobseparator.ps
   branches/gs-esp-gpl-merger/src/md5.c
   branches/gs-esp-gpl-merger/src/md5.h
   branches/gs-esp-gpl-merger/toolbin/gen_ldf_jb2.py
Log:
Created branch gs-esp-gpl-merger to test the merger of ESP Ghostscript 8.15.4
with GPL Ghostscript 8.58.


Copied: branches/gs-esp-gpl-merger (from rev 7922, trunk/gs)

Modified: branches/gs-esp-gpl-merger/doc/gsdoc.el
===================================================================
--- trunk/gs/doc/gsdoc.el	2007-05-08 19:47:48 UTC (rev 7922)
+++ branches/gs-esp-gpl-merger/doc/gsdoc.el	2007-05-08 21:32:20 UTC (rev 7923)
@@ -522,14 +522,14 @@
 ;; Replace the RCS $Id if one can be found in exactly the right format, and
 ;; otherwise insert one just after the title, along with a warning message.
 
-(if (re-search-forward "<!-- $Id: *\\([^ ]*\\) $ -->" nil t)
+(if (re-search-forward "<!-- $Id$ -->" nil t)
     (progn
       (setq Original (buffer-substring (match-beginning 1) (match-end 1)))
       (replace-match g~thisfile t t nil 1)
       )
     (progn
       (search-forward "</title>" nil t) (end-of-line)
-      (insert (concat "\n<!-- $Id: " g~thisfile " $ -->"))
+      (insert (concat "\n<!-- $Id$ -->"))
       (setq Original "(UNSET by gs-structure)")
       )
     )

Modified: branches/gs-esp-gpl-merger/jbig2dec/configure.ac
===================================================================
--- trunk/gs/jbig2dec/configure.ac	2007-05-08 19:47:48 UTC (rev 7922)
+++ branches/gs-esp-gpl-merger/jbig2dec/configure.ac	2007-05-08 21:32:20 UTC (rev 7923)
@@ -7,7 +7,7 @@
 AM_INIT_AUTOMAKE([-Wall])
 AM_CONFIG_HEADER(config.h)
 
-dnl AC_REVISION([$Rev: 408 $])
+dnl AC_REVISION([$Rev$])
 
 # Checks for programs.
 AC_PROG_CC

Modified: branches/gs-esp-gpl-merger/lib/jobseparator.ps
===================================================================
--- trunk/gs/lib/jobseparator.ps	2007-05-08 19:47:48 UTC (rev 7922)
+++ branches/gs-esp-gpl-merger/lib/jobseparator.ps	2007-05-08 21:32:20 UTC (rev 7923)
@@ -1,4 +1,4 @@
 % Execute the "real" system version of the ^D to separate jobs
 % when -dJOBDSERVER is being used.
-% $Id:$
+% $Id$
 <04> cvn .systemvar exec

Modified: branches/gs-esp-gpl-merger/src/md5.c
===================================================================
--- trunk/gs/src/md5.c	2007-05-08 19:47:48 UTC (rev 7922)
+++ branches/gs-esp-gpl-merger/src/md5.c	2007-05-08 21:32:20 UTC (rev 7923)
@@ -21,7 +21,7 @@
   ghost at aladdin.com
 
  */
-/* $Id:$ */
+/* $Id$ */
 /*
   Independent implementation of MD5 (RFC 1321).
 

Modified: branches/gs-esp-gpl-merger/src/md5.h
===================================================================
--- trunk/gs/src/md5.h	2007-05-08 19:47:48 UTC (rev 7922)
+++ branches/gs-esp-gpl-merger/src/md5.h	2007-05-08 21:32:20 UTC (rev 7923)
@@ -21,7 +21,7 @@
   ghost at aladdin.com
 
  */
-/* $Id:$ */
+/* $Id$ */
 /*
   Independent implementation of MD5 (RFC 1321).
 

Modified: branches/gs-esp-gpl-merger/toolbin/gen_ldf_jb2.py
===================================================================
--- trunk/gs/toolbin/gen_ldf_jb2.py	2007-05-08 19:47:48 UTC (rev 7922)
+++ branches/gs-esp-gpl-merger/toolbin/gen_ldf_jb2.py	2007-05-08 21:32:20 UTC (rev 7923)
@@ -3,7 +3,7 @@
 # script to generate ldf_jb2.mak
 # whose source sometimes changes
 
-# $Id: $
+# $Id$
 
 import time, glob
 import os.path
@@ -25,7 +25,7 @@
 # contact Artifex Software, Inc., 101 Lucas Valley Road #110,
 # San Rafael, CA  94903, U.S.A., +1(415)492-9861.
 
-# $Id: ldf_jb2.mak 6525 2006-01-30 09:20:34Z giles $
+# $Id$
 """ % time.gmtime().tm_year
 
 comment = """