1 |
--- rcs-5.7.orig/debian/rules |
diff -Naur rcs-5.7/configure.in rcs-5.7-magellan/configure.in |
2 |
+++ rcs-5.7/debian/rules |
--- rcs-5.7/configure.in 1995-06-16 08:19:24.000000000 +0200 |
3 |
@@ -0,0 +1,80 @@ |
+++ rcs-5.7-magellan/configure.in 2010-03-07 20:13:14.000000000 +0100 |
4 |
+#!/usr/bin/make -f |
@@ -243,7 +243,7 @@ |
5 |
+ |
AC_PATH_PROG(ED, ed, ed) |
6 |
+CFLAGS = -g |
|
7 |
+ |
ac_save_path=$PATH |
8 |
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) |
-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH |
9 |
+CFLAGS += -O0 |
+PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH |
10 |
+else |
AC_PATH_PROGS(SENDMAIL, sendmail mail mailx) |
11 |
+CFLAGS += -O2 |
PATH=$ac_save_path |
12 |
+endif |
case $SENDMAIL in |
13 |
+ |
diff -Naur rcs-5.7/Makefile.in rcs-5.7-magellan/Makefile.in |
14 |
+refresh-patches: |
--- rcs-5.7/Makefile.in 1995-06-16 08:19:24.000000000 +0200 |
15 |
+ @dh_testdir |
+++ rcs-5.7-magellan/Makefile.in 2010-03-07 20:12:56.000000000 +0100 |
16 |
+ @echo 'refreshing debian/patches:' |
@@ -43,6 +43,7 @@ |
17 |
+ @rm -rf '$(CURDIR)'/debian/patches |
@echo "it deletes files that may require special tools to rebuild." |
18 |
+ @mkdir -p '$(CURDIR)'/debian/patches |
|
19 |
+ @cd '$(CURDIR)'/debian/patches && \ |
$(standard_GNU_targets) installcheck installdebug :: |
20 |
+ git format-patch -N upstream..upstream+patches |
+ groff -t -p -Tps -ms rcs.ms >rcs.ps |
21 |
+ @echo . |
cd man && $(MAKE) $@ |
22 |
+ |
cd src && $(MAKE) $@ |
23 |
+PATCH_OPTS := -p1 -E --no-backup-if-mismatch |
|
24 |
+ |
@@ -77,7 +78,7 @@ |
25 |
+patch: patch-stamp |
|
26 |
+patch-stamp: |
clean :: clean. |
27 |
+ dh_testdir |
clean. :: |
28 |
+ set -e; [ -f patch-stamp ] || \ |
- rm -f confdefs* conftest* core core.* *.core |
29 |
+ for f in `ls -1 debian/patches/*.patch || :`; do \ |
+ rm -f confdefs* conftest* core core.* *.core *.ps |
30 |
+ patch $(PATCH_OPTS) <$$f >/dev/null; \ |
|
31 |
+ done |
distclean maintainer-clean :: distclean. |
32 |
+ touch $@ |
distclean. :: clean. |
33 |
+ |
diff -Naur rcs-5.7/man/co.1 rcs-5.7-magellan/man/co.1 |
34 |
+unpatch: |
--- rcs-5.7/man/co.1 1995-06-01 18:23:43.000000000 +0200 |
35 |
+ dh_testdir |
+++ rcs-5.7-magellan/man/co.1 2010-03-07 20:13:04.000000000 +0100 |
36 |
+ set -e; [ ! -f patch-stamp ] || \ |
@@ -597,7 +597,7 @@ |
37 |
+ for f in `ls -1r debian/patches/*.patch || :`; do \ |
.RB \*(lq "//\ " \*(rq. |
38 |
+ patch -R $(PATCH_OPTS) <$$f >/dev/null; \ |
This is useful for languages with comments that go to the end of the line. |
39 |
+ done |
The convention for other languages is to use a |
40 |
+ rm -f patch-stamp |
-.RB \*(lq " \(** " \(rq |
41 |
+ |
+.RB \*(lq " * " \(rq |
42 |
+build-arch: build-arch-stamp |
prefix inside a multiline comment. |
43 |
+build-arch-stamp: patch |
For example, the initial log comment of a C program |
44 |
+ dh_testdir |
conventionally is of the following form: |
45 |
+ ./configure --prefix=/usr --with-diffutils |
@@ -606,19 +606,19 @@ |
46 |
+ $(MAKE) CFLAGS="$(CFLAGS)" |
.nf |
47 |
+ touch $@ |
.ft 3 |
48 |
+ |
.ne 3 |
49 |
+clean: unpatch really-clean |
-/\(** |
50 |
+really-clean: |
+/* |
51 |
+ dh_testdir |
.in +\w'/'u |
52 |
+ dh_testroot |
-\(** $\&Log$ |
53 |
+ [ ! -f Makefile ] || $(MAKE) -i distclean |
-\(**/ |
54 |
+ dh_clean -XTAGS |
+* $\&Log$ |
55 |
+ |
+*/ |
56 |
+install-arch: build-arch |
.in |
57 |
+ dh_testdir |
.ft |
58 |
+ dh_testroot |
.fi |
59 |
+ dh_prep |
.RE |
60 |
+ $(MAKE) prefix=$(CURDIR)/debian/rcs/usr install |
.LP |
61 |
+ |
For backwards compatibility with older versions of \*r, if the log prefix is |
62 |
+build-indep: |
-.B /\(** |
63 |
+install-indep: build-indep |
+.B /* |
64 |
+binary-indep: build-indep install-indep |
or |
65 |
+ |
-.B (\(** |
66 |
+binary-arch: build-arch install-arch |
+.B (* |
67 |
+ dh_testdir |
surrounded by optional white space, inserted log lines contain a space |
68 |
+ dh_testroot |
instead of |
69 |
+ dh_installdocs |
.B / |
70 |
+ dh_installchangelogs ChangeLog |
diff -Naur rcs-5.7/man/Makefile.in rcs-5.7-magellan/man/Makefile.in |
71 |
+ dh_link |
--- rcs-5.7/man/Makefile.in 1995-06-16 08:19:24.000000000 +0200 |
72 |
+ dh_strip |
+++ rcs-5.7-magellan/man/Makefile.in 2010-03-07 20:13:14.000000000 +0100 |
73 |
+ dh_compress |
@@ -34,8 +34,8 @@ |
74 |
+ dh_fixperms |
PIC = @PIC@ |
75 |
+ dh_installdeb |
|
76 |
+ dh_shlibdeps |
prefix = @prefix@ |
77 |
+ dh_gencontrol |
-man1dir = $(prefix)/man/man1 |
78 |
+ dh_md5sums |
-man5dir = $(prefix)/man/man5 |
79 |
+ dh_builddeb |
+man1dir = $(prefix)/share/man/man1 |
80 |
+ |
+man5dir = $(prefix)/share/man/man5 |
81 |
+binary: binary-indep binary-arch |
man1ext = .1 |
82 |
+ |
man5ext = .5 |
83 |
+.PHONY: build build-arch clean binary-arch binary-indep binary install |
|
84 |
--- rcs-5.7.orig/debian/rcs.docs |
@@ -51,7 +51,8 @@ |
85 |
+++ rcs-5.7/debian/rcs.docs |
installdirs :: ../mkinstalldirs |
86 |
@@ -0,0 +1 @@ |
-$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir) |
87 |
+rcs.ps |
|
88 |
--- rcs-5.7.orig/debian/clean |
-man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog |
89 |
+++ rcs-5.7/debian/clean |
+man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \ |
90 |
@@ -0,0 +1 @@ |
+ rcsfreeze |
91 |
+rcs.ps |
|
92 |
--- rcs-5.7.orig/debian/control |
install :: installdirs |
93 |
+++ rcs-5.7/debian/control |
-for m in $(man1pages); do \ |
94 |
@@ -0,0 +1,23 @@ |
diff -Naur rcs-5.7/man/merge.1 rcs-5.7-magellan/man/merge.1 |
95 |
+Source: rcs |
--- rcs-5.7/man/merge.1 1995-06-01 18:23:43.000000000 +0200 |
96 |
+Section: vcs |
+++ rcs-5.7-magellan/man/merge.1 2010-03-07 20:13:04.000000000 +0100 |
97 |
+Priority: optional |
@@ -114,8 +114,9 @@ |
98 |
+Maintainer: Romain Francoise <rfrancoise@debian.org> |
.TP |
99 |
+Standards-Version: 3.8.1 |
.BI \-q |
100 |
+Build-Depends: debhelper (>= 7), groff, autoconf |
Quiet; do not warn about conflicts. |
101 |
+Homepage: http://www.gnu.org/software/rcs/ |
+.TP |
102 |
+Vcs-Browser: http://git.debian.org/?p=users/rfrancoise/rcs.git |
.BI \-V |
103 |
+Vcs-Git: git://git.debian.org/git/users/rfrancoise/rcs.git |
-Print \*r's version number. |
104 |
+ |
+Print version number. |
105 |
+Package: rcs |
.SH DIAGNOSTICS |
106 |
+Architecture: any |
Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble. |
107 |
+Depends: ${shlibs:Depends} |
.SH IDENTIFICATION |
108 |
+Description: The GNU Revision Control System |
@@ -127,7 +128,10 @@ |
109 |
+ The Revision Control System (RCS) manages multiple |
.br |
110 |
+ revisions of files. RCS automates the storing, retrieval, |
Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert. |
111 |
+ logging, identification, and merging of revisions. RCS is |
.SH SEE ALSO |
112 |
+ useful for text that is revised frequently, for example |
-diff3(1), diff(1), rcsmerge(1), co(1). |
113 |
+ programs, documentation, graphics, papers, and form letters. |
+.BR diff3 (1), |
114 |
+ . |
+.BR diff (1), |
115 |
+ Note: this package contains certain general-purpose commands |
+.BR rcsmerge (1), |
116 |
+ (such as merge or ident) which may used by other programs |
+.BR co(1) . |
117 |
+ installed on your system. |
.SH BUGS |
118 |
--- rcs-5.7.orig/debian/compat |
It normally does not make sense to merge binary files as if they were text, but |
119 |
+++ rcs-5.7/debian/compat |
.B merge |
120 |
@@ -0,0 +1 @@ |
diff -Naur rcs-5.7/man/rcsfile.5 rcs-5.7-magellan/man/rcsfile.5 |
121 |
+7 |
--- rcs-5.7/man/rcsfile.5 1995-06-16 08:58:26.000000000 +0200 |
122 |
--- rcs-5.7.orig/debian/copyright |
+++ rcs-5.7-magellan/man/rcsfile.5 2010-03-07 20:13:06.000000000 +0100 |
123 |
+++ rcs-5.7/debian/copyright |
@@ -69,6 +69,7 @@ |
124 |
@@ -0,0 +1,28 @@ |
\f3state\fP {\f2id\fP}\f3;\fP |
125 |
+This is Debian GNU/Linux's prepackaged version of the FSF's Revision |
\f3branches\fP {\f2num\fP}*\f3;\fP |
126 |
+Control System (RCS) utilities. These utilities allow you to keep |
\f3next\fP {\f2num\fP}\f3;\fP |
127 |
+multiple revisions of one or more files in a very compact manner. RCS |
+ { \f3commitid\fP \f2id\fP\f3;\fP } |
128 |
+is similar to, and in most respects better than, the non-free Source |
{ \f2newphrase\fP }* |
129 |
+Code Control System (SCCS). |
.LP |
130 |
+ |
\f2desc\fP ::= \f3desc\fP \f2string\fP |
131 |
+This package was assembled by Sven Rudolph <sr1@inf.tu-dresden.de> |
@@ -128,6 +129,18 @@ |
132 |
+from the GNU sources available from prep.ai.mit.edu (and its numerous |
Dates use the Gregorian calendar; times use UTC. |
133 |
+mirrors) as /pub/gnu/rcs-5.7.tar.gz. It is currently maintained by |
.PP |
134 |
+Romain Francoise <rfrancoise@debian.org>. |
The |
135 |
+ |
+.I commitid |
136 |
+The upstream URL is: http://www.gnu.org/software/rcs/ |
+is followed by an |
137 |
+ |
+.I id |
138 |
+Copyright (C) 1991,1992,1993 Free Software Foundation, Inc. |
+token. This token is intended to be unique across |
139 |
+ |
+multiple files and is used to help group files as |
140 |
+RCS is free software; you can redistribute it and/or modify |
+being a part of the same logical commit. |
141 |
+it under the terms of the GNU General Public License as published by |
+This token must uniquely identify the commit |
142 |
+the Free Software Foundation; either version 2, or (at your option) |
+operation that was applied to a set of RCS files. |
143 |
+any later version. |
+In particular, it must be unique among all the |
144 |
+ |
+commitids in this file. |
145 |
+RCS is distributed in the hope that it will be useful, |
+.PP |
146 |
+but WITHOUT ANY WARRANTY; without even the implied warranty of |
+The |
147 |
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
.I newphrase |
148 |
+GNU General Public License for more details. |
productions in the grammar are reserved for future extensions |
149 |
+ |
to the format of \*r files. |
150 |
+On Debian GNU/Linux systems, the complete text of the GNU General |
@@ -230,7 +243,7 @@ |
151 |
+Public License can be found in `/usr/share/common-licenses/GPL'. |
.fi |
152 |
+ |
.\} |
153 |
--- rcs-5.7.orig/debian/changelog |
.if \np \{\ |
154 |
+++ rcs-5.7/debian/changelog |
-.lf 232 |
155 |
@@ -0,0 +1,278 @@ |
+.lf 245 |
156 |
+rcs (5.7-25) unstable; urgency=low |
.PS 4.250i 3.812i |
157 |
+ |
.\" -2.0625 -4.25 1.75 0 |
158 |
+ * The "dogs that love the rain and chasing trains" release. |
.\" 0.000i 4.250i 3.812i 0.000i |
159 |
+ |
@@ -239,7 +252,7 @@ |
160 |
+ * debian/control: |
.nr 0x 1 |
161 |
+ + Set section to 'vcs' to follow override. |
\h'3.812i' |
162 |
+ + Set Standards-Version to 3.8.1. |
.sp -1 |
163 |
+ * debian/rules: |
-.lf 242 |
164 |
+ + Use `dh_prep' instead of `dh_clean -k'. |
+.lf 255 |
165 |
+ + Don't number exported patches. |
\h'2.062i-(\w'Head'u/2u)'\v'0.125i-(0v/2u)+0v+0.22m'Head |
166 |
+ |
.sp -1 |
167 |
+ * Drop Debian change added in rcs 5.7-13 (Nov 1999) which modifies the |
\h'2.062i'\v'0.250i'\D'l0.000i 0.500i' |
168 |
+ first line of pic's output. As far as I can tell it's fine as-is, and |
@@ -256,7 +269,7 @@ |
169 |
+ the change results in an extraneous line at the top of the page |
.sp -1 |
170 |
+ (closes: #525291). |
\h'1.688i'\v'0.750i'\D'l0.000i 0.500i' |
171 |
+ |
.sp -1 |
172 |
+ -- Romain Francoise <rfrancoise@debian.org> Tue, 16 Jun 2009 20:20:11 +0200 |
-.lf 244 |
173 |
+ |
+.lf 257 |
174 |
+rcs (5.7-24) unstable; urgency=low |
\h'2.062i-(\w'2.1'u/2u)'\v'1.000i-(0v/2u)+0v+0.22m'2.1 |
175 |
+ |
.sp -1 |
176 |
+ * The "Pour all of your souls like magma into the caverns" release. |
\h'2.062i'\v'1.250i'\D'l0.000i 0.500i' |
177 |
+ |
@@ -265,7 +278,7 @@ |
178 |
+ * debian/compat: Switch to debhelper compatibility level 7. |
.sp -1 |
179 |
+ * debian/rules: |
\h'2.062i'\v'1.750i'\D'l-0.025i -0.100i' |
180 |
+ + Don't delete *-stamp manually. |
.sp -1 |
181 |
+ + Reverse clean/unpatch order. |
-.lf 246 |
182 |
+ * debian/clean: New file, clean up rcs.ps. |
+.lf 259 |
183 |
+ * debian/control: |
\h'2.062i-(\w'1.3'u/2u)'\v'2.000i-(1v/2u)+0v+0.22m'1.3 |
184 |
+ + Build-depend on debhelper (>= 7). |
.sp -1 |
185 |
+ + Set Standards-Version to 3.8.0, no changes needed. |
\h'2.062i'\v'2.250i'\D'l-0.375i -0.500i' |
186 |
+ + Mention merge program in long description (closes: #498736). |
@@ -280,7 +293,7 @@ |
187 |
+ |
.sp -1 |
188 |
+ -- Romain Francoise <rfrancoise@debian.org> Sat, 13 Sep 2008 16:31:30 +0200 |
\h'1.375i'\v'1.500i'\D'l0.025i 0.100i' |
189 |
+ |
.sp -1 |
190 |
+rcs (5.7-23) unstable; urgency=low |
-.lf 249 |
191 |
+ |
+.lf 262 |
192 |
+ * The "fourteen degrees below" release. |
\h'1.375i-(\w'1.3.1.1'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.3.1.1 |
193 |
+ |
.sp -1 |
194 |
+ * Repackage with debhelper and a patch system. |
\h'1.375i'\v'1.000i'\D'l-0.375i 0.500i' |
195 |
+ * debian/control: Build-depend on debhelper (>= 6). |
@@ -295,7 +308,7 @@ |
196 |
+ * debian/rules: Rewrite using debhelper. |
.sp -1 |
197 |
+ * debian/{compat,rcs.docs}: New files. |
\h'2.062i'\v'2.750i'\D'l-0.025i -0.100i' |
198 |
+ * debian/patches/: New directory, contains patches split off the previous |
.sp -1 |
199 |
+ monolithic Debian diff. |
-.lf 252 |
200 |
+ |
+.lf 265 |
201 |
+ * Include patch by Justin Pryzby <justinpryzby@users.sourceforge.net> |
\h'2.062i-(\w'1.2'u/2u)'\v'3.000i-(1v/2u)+0v+0.22m'1.2 |
202 |
+ fixing minor formatting errors in merge.1 (closes: #471243). |
.sp -1 |
203 |
+ |
\h'2.062i'\v'3.250i'\D'l-0.375i -0.500i' |
204 |
+ -- Romain Francoise <rfrancoise@debian.org> Sun, 23 Mar 2008 12:48:22 +0100 |
@@ -310,7 +323,7 @@ |
205 |
+ |
.sp -1 |
206 |
+rcs (5.7-22) unstable; urgency=low |
\h'0.375i'\v'2.500i'\D'l0.025i 0.100i' |
207 |
+ |
.sp -1 |
208 |
+ * debian/control: Set Standards-Version to 3.7.3, no changes needed. |
-.lf 255 |
209 |
+ |
+.lf 268 |
210 |
+ -- Romain Francoise <rfrancoise@debian.org> Sat, 26 Jan 2008 19:45:24 +0100 |
\h'0.375i-(\w'1.2.1.1'u/2u)'\v'2.250i-(1v/2u)+1v+0.22m'1.2.1.1 |
211 |
+ |
.sp -1 |
212 |
+rcs (5.7-21) unstable; urgency=low |
\h'0.375i'\v'2.000i'\D'l-0.375i 0.500i' |
213 |
+ |
@@ -325,7 +338,7 @@ |
214 |
+ * debian/control: Add Homepage, Vcs-Git and Vcs-Browser fields. |
.sp -1 |
215 |
+ |
\h'0.375i'\v'1.500i'\D'l0.025i 0.100i' |
216 |
+ -- Romain Francoise <rfrancoise@debian.org> Sat, 03 Nov 2007 13:04:07 +0100 |
.sp -1 |
217 |
+ |
-.lf 257 |
218 |
+rcs (5.7-20) unstable; urgency=low |
+.lf 270 |
219 |
+ |
\h'0.375i-(\w'1.2.1.3'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.2.1.3 |
220 |
+ * debian/control: Add support for DEB_BUILD_OPTIONS (closes: #437885). |
.sp -1 |
221 |
+ |
\h'0.375i'\v'1.000i'\D'l-0.375i 0.500i' |
222 |
+ -- Romain Francoise <rfrancoise@debian.org> Tue, 14 Aug 2007 21:24:54 +0200 |
@@ -340,7 +353,7 @@ |
223 |
+ |
.sp -1 |
224 |
+rcs (5.7-19) unstable; urgency=low |
\h'2.750i'\v'2.500i'\D'l0.025i 0.100i' |
225 |
+ |
.sp -1 |
226 |
+ * debian/control: Bump Standards-Version to 3.7.2, no changes needed. |
-.lf 261 |
227 |
+ * debian/copyright: Mention the current upstream URL (closes: #436739). |
+.lf 274 |
228 |
+ * debian/rules: |
\h'2.750i-(\w'1.2.2.1'u/2u)'\v'2.250i-(1v/2u)+1v+0.22m'1.2.2.1 |
229 |
+ + Don't ignore errors from 'make distclean'. |
.sp -1 |
230 |
+ + Generate DEBIAN/md5sums. |
\h'2.750i'\v'2.000i'\D'l-0.375i 0.500i' |
231 |
+ * Apply patch from Brendan O'Dea <bod@debian.org> adding support for |
@@ -355,7 +368,7 @@ |
232 |
+ diff's '-U' option to rcsdiff (closes: #428445). |
.sp -1 |
233 |
+ |
\h'3.438i'\v'1.250i'\D'l0.025i 0.100i' |
234 |
+ -- Romain Francoise <rfrancoise@debian.org> Sun, 12 Aug 2007 18:40:04 +0200 |
.sp -1 |
235 |
+ |
-.lf 264 |
236 |
+rcs (5.7-18) unstable; urgency=low |
+.lf 277 |
237 |
+ |
\h'3.438i-(\w'\s-21.2.2.1.1.1\s0'u/2u)'\v'1.000i-(1v/2u)+1v+0.22m'\s-21.2.2.1.1.1\s0 |
238 |
+ * Apply patch from Mark D. Baushke <mdb@gnu.org> adding support for the |
.sp -1 |
239 |
+ new 'commitid' phrase used by newer version of CVS and CVSNT. Note |
\h'3.438i'\v'0.750i'\D'l-0.375i 0.500i' |
240 |
+ that this patch does not include support for *generating* the ids at |
@@ -370,7 +383,7 @@ |
241 |
+ check in time; it only makes RCS recognize them (closes: #352527). |
.sp -1 |
242 |
+ |
\h'2.750i'\v'1.500i'\D'l0.025i 0.100i' |
243 |
+ -- Romain Francoise <rfrancoise@debian.org> Tue, 14 Feb 2006 22:41:33 +0100 |
.sp -1 |
244 |
+ |
-.lf 267 |
245 |
+rcs (5.7-17) unstable; urgency=low |
+.lf 280 |
246 |
+ |
\h'2.750i-(\w'1.2.2.2'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.2.2.2 |
247 |
+ * Apply patch from Aaron S. Hawley making the diff strategy of rcsdiff a |
.sp -1 |
248 |
+ bit more subtle: previously rcsdiff considered any long option as a |
\h'2.750i'\v'1.000i'\D'l-0.375i 0.500i' |
249 |
+ case where diff(1) can produce output when the revisions are |
@@ -385,7 +398,7 @@ |
250 |
+ identical, when in fact it is only the case if either the |
.sp -1 |
251 |
+ --side-by-side or --ifdef options are used (closes: #334004). |
\h'2.062i'\v'3.750i'\D'l-0.025i -0.100i' |
252 |
+ |
.sp -1 |
253 |
+ * Patch man/co.1 to not use 'asteriskmath', thanks to LI Daobing |
-.lf 270 |
254 |
+ (closes: #345507). |
+.lf 283 |
255 |
+ |
\h'2.062i-(\w'1.1'u/2u)'\v'4.000i-(1v/2u)+0v+0.22m'1.1 |
256 |
+ * debian/control: Bump Standards-Version to 3.6.2.2, no changes needed. |
.sp -1 |
257 |
+ * debian/changelog: Change formatting of entries from 1995 and 1996 to |
\h'2.062i'\v'4.250i'\D'l-0.375i -0.500i' |
258 |
+ avoid lintian warnings. |
@@ -398,9 +411,9 @@ |
259 |
+ * debian/rules: `install' no longer strips .comment sections from |
.if \n(00 .fi |
260 |
+ binaries (since version 5.93-1), so revert previous fix and strip these |
.br |
261 |
+ sections manually. |
.nr 0x 0 |
262 |
+ |
-.lf 271 |
263 |
+ -- Romain Francoise <rfrancoise@debian.org> Sun, 5 Feb 2006 16:34:21 +0100 |
+.lf 284 |
264 |
+ |
.PE |
265 |
+rcs (5.7-16) unstable; urgency=low |
-.lf 272 |
266 |
+ |
+.lf 285 |
267 |
+ * Tenth anniversary release: RCS 5.7 was released on June 16th, 1995. |
.\} |
268 |
+ |
.PP |
269 |
+ * rcs.c: Check delta pointer in scanlogtext() before dereferencing it to |
.SH IDENTIFICATION |
270 |
+ prevent a segmentation fault in some rare cases (discovered while |
diff -Naur rcs-5.7/man/rcsfile.5in rcs-5.7-magellan/man/rcsfile.5in |
271 |
+ investigating #69193). |
--- rcs-5.7/man/rcsfile.5in 1995-06-05 10:28:35.000000000 +0200 |
272 |
+ |
+++ rcs-5.7-magellan/man/rcsfile.5in 2010-03-07 20:13:06.000000000 +0100 |
273 |
+ * Ship docs in PostScript format (instead of DVI). Drop the ``Functions |
@@ -68,6 +68,7 @@ |
274 |
+ of RCS'' paper since it's quite obsolete nowadays. |
\f3state\fP {\f2id\fP}\f3;\fP |
275 |
+ |
\f3branches\fP {\f2num\fP}*\f3;\fP |
276 |
+ * debian/rules: Delete substvars file in clean target. |
\f3next\fP {\f2num\fP}\f3;\fP |
277 |
+ * debian/changelog: Facelift previous entry. |
+ { \f3commitid\fP \f2id\fP\f3;\fP } |
278 |
+ |
{ \f2newphrase\fP }* |
279 |
+ -- Romain Francoise <rfrancoise@debian.org> Thu, 16 Jun 2005 08:14:01 +0200 |
.LP |
280 |
+ |
\f2desc\fP ::= \f3desc\fP \f2string\fP |
281 |
+rcs (5.7-15) unstable; urgency=low |
@@ -127,6 +128,18 @@ |
282 |
+ |
Dates use the Gregorian calendar; times use UTC. |
283 |
+ * Adopting this package with Mark's blessing. |
.PP |
284 |
+ * debian/control: |
The |
285 |
+ + Bump Standard-Version to 3.6.1.0. |
+.I commitid |
286 |
+ + Update maintainer contact info. |
+is followed by an |
287 |
+ * debian/copyright: Ditto. |
+.I id |
288 |
+ * debian/rules: |
+token. This token is intended to be unique across |
289 |
+ + Adjust CFLAGS to include -g and remove useless -I directive. |
+multiple files and is used to help group files as |
290 |
+ + Remove LDFLAGS. |
+being a part of the same logical commit. |
291 |
+ |
+This token must uniquely identify the commit |
292 |
+ * Patch upstream Makefile.in to use install -s (which has the nice |
+operation that was applied to a set of RCS files. |
293 |
+ effect of also deleting .comment sections from the binaries). |
+In particular, it must be unique among all the |
294 |
+ |
+commitids in this file. |
295 |
+ * Patch man/rlog.1 to document option -q which does nothing, it's |
+.PP |
296 |
+ provided for consistency with other commands (closes: #69257). |
+The |
297 |
+ |
.I newphrase |
298 |
+ * Remove a few unneeded files from the Debian diff (.orig files, Emacs |
productions in the grammar are reserved for future extensions |
299 |
+ lock files). |
to the format of \*r files. |
300 |
+ |
diff -Naur rcs-5.7/man/rlog.1 rcs-5.7-magellan/man/rlog.1 |
301 |
+ -- Romain Francoise <rfrancoise@debian.org> Wed, 11 May 2005 17:51:01 +0200 |
--- rcs-5.7/man/rlog.1 1995-06-16 08:19:24.000000000 +0200 |
302 |
+ |
+++ rcs-5.7-magellan/man/rlog.1 2010-03-07 20:13:04.000000000 +0100 |
303 |
+rcs (5.7-14) unstable; urgency=high |
@@ -187,6 +187,10 @@ |
304 |
+ |
.I logins |
305 |
+ * Fixes tmp file race (patch from OpenBSD) (Closes: #291542) |
is omitted, the user's login is assumed. |
306 |
+ |
.TP |
307 |
+ -- Mark Baker <mark@mnb.org.uk> Fri, 21 Jan 2005 18:16:20 +0000 |
+.B \-q |
308 |
+ |
+This option has no effect; |
309 |
+rcs (5.7-13.3) unstable; urgency=high |
+it is provided for consistency with other commands. |
310 |
+ |
+.TP |
311 |
+ * NMU |
.B \-T |
312 |
+ * Add build-dep on autoconf. Closes: #246566. |
This option has no effect; |
313 |
+ * Fix up quoting in src/Makefile.in to make $SHELL not complain, as \" |
it is present for compatibility with other \*r commands. |
314 |
+ is not interpolated inside single-quoted strings. |
diff -Naur rcs-5.7/src/conf.sh rcs-5.7-magellan/src/conf.sh |
315 |
+ * Make ident accept numbers as well as letters in identifiers. |
--- rcs-5.7/src/conf.sh 1995-06-16 08:19:24.000000000 +0200 |
316 |
+ Closes: #157891 |
+++ rcs-5.7-magellan/src/conf.sh 2010-03-07 20:13:14.000000000 +0100 |
317 |
+ * Remove emacs variables from the changelog as they are no longer |
@@ -73,17 +73,6 @@ |
318 |
+ needed. |
ech='echo -n' dots='... ' |
319 |
+ * Add -isp to the dpkg-gencontrol call in debian/rules to get Section |
esac |
320 |
+ and Priority included. Closes: #190383. |
|
321 |
+ |
-$ech >&3 "$0: testing permissions $dots" |
322 |
+ -- Tollef Fog Heen <tfheen@debian.org> Thu, 29 Jul 2004 19:09:32 +0200 |
-rm -f a.d && |
323 |
+ |
-date >a.d && |
324 |
+rcs (5.7-13.2) unstable; urgency=low |
-chmod 0 a.d && |
325 |
+ |
-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { |
326 |
+ * NMU |
- echo >&3 "$n$0: This command should not be run with superuser permissions." |
327 |
+ * can build now as root. Closes: #249106 |
- exit 1 |
328 |
+ * priority dumped down to optional. Closes: #64438 |
-} |
329 |
+ * fixed spelling error in debian/copyright, and location of the GPL. |
-echo >&3 OK |
330 |
+ |
-rm -f a.d || exit |
331 |
+ -- Andreas Barth <aba@not.so.argh.org> Wed, 26 May 2004 22:21:05 +0200 |
- |
332 |
+ |
$ech >&3 "$0: testing compiler for plausibility $dots" |
333 |
+rcs (5.7-13.1) unstable; urgency=low |
echo 'main() { return 0; }' >a.c |
334 |
+ |
rm -f a.exe a.out || exit |
335 |
+ * NMU. |
diff -Naur rcs-5.7/src/ident.c rcs-5.7-magellan/src/ident.c |
336 |
+ * Rebuild so that the .dsc file will have Build-Depends. |
--- rcs-5.7/src/ident.c 1995-06-16 08:19:24.000000000 +0200 |
337 |
+ Closes: #187853, #176344. |
+++ rcs-5.7-magellan/src/ident.c 2010-03-07 20:13:11.000000000 +0100 |
338 |
+ * Remove /usr/doc symlink. |
@@ -234,7 +234,7 @@ |
339 |
+ |
if (c == EOF && feof(fp) | ferror(fp)) |
340 |
+ -- Daniel Schepler <schepler@debian.org> Mon, 28 Jul 2003 16:28:32 -0700 |
return c; |
341 |
+ |
switch (ctab[c]) { |
342 |
+rcs (5.7-13) unstable; urgency=low |
- case LETTER: case Letter: |
343 |
+ |
+ case LETTER: case Letter: case DIGIT: |
344 |
+ * debian/rules: install docs and manpages in /usr/share, as in FHS |
*tp++ = c; |
345 |
+ * debian/control: standards version 3.1.0 |
if (tp < line+sizeof(line)-4) |
346 |
+ * debian/rules: format docs into dvi instead of leaving groff source. I |
break; |
347 |
+ chose dvi as it is easier to view on screen than PS (Closes: 42277) |
diff -Naur rcs-5.7/src/Makefile.in rcs-5.7-magellan/src/Makefile.in |
348 |
+ |
--- rcs-5.7/src/Makefile.in 1995-06-16 08:19:24.000000000 +0200 |
349 |
+ -- Mark Baker <mbaker@iee.org> Sun, 28 Nov 1999 18:31:21 +0000 |
+++ rcs-5.7-magellan/src/Makefile.in 2010-03-07 20:13:14.000000000 +0100 |
350 |
+ |
@@ -116,16 +116,18 @@ |
351 |
+rcs (5.7-12) unstable; urgency=low |
for p in $(PROGRAMS); do \ |
352 |
+ |
$(INSTALL_PROGRAM) $$p $(bindir)/$$p; \ |
353 |
+ * man/Makefile: use sed filter to fix .lf requests on output of pic, |
done |
354 |
+ so zsoelim doesn't complain about them (#26150) |
+ $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze |
355 |
+ * debian/rules: clean target deletes rcsfile.5 so it is always rebuilt |
|
356 |
+ using fix above |
uninstall :: |
357 |
+ |
for p in $(PROGRAMS); do \ |
358 |
+ -- Mark Baker <mbaker@iee.org> Mon, 5 Jul 1999 23:24:17 +0100 |
$(REMOVE) $(bindir)/$$p; \ |
359 |
+ |
done |
360 |
+rcs (5.7-11) unstable; urgency=low |
+ $(REMOVE) $(bindir)/rcsfreeze |
361 |
+ |
|
362 |
+ * Fixed temp file security hole in rcsfreeze script (#27845) |
# Install RCS and (if applicable) GNU diff before running these tests. |
363 |
+ |
# To test RCS before installing it, see the file INSTALL.RCS. |
364 |
+ -- Mark Baker <mbaker@iee.org> Wed, 14 Oct 1998 22:43:47 +0100 |
RCSTEST = \ |
365 |
+ |
- ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \ |
366 |
+rcs (5.7-10) unstable; urgency=low |
+ ALL_CFLAGS="$(ALL_CFLAGS)" CC='$(CC)' DIFF='$(DIFF)' \ |
367 |
+ |
LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \ |
368 |
+ * Included rcsfreeze script (#26743) |
PATH=$(bindir):$$PATH \ |
369 |
+ |
sh $(srcdir)/rcstest |
370 |
+ -- Mark Baker <mbaker@iee.org> Wed, 16 Sep 1998 20:57:00 +0000 |
@@ -153,7 +155,7 @@ |
371 |
+ |
#(Unix |
372 |
+rcs (5.7-9) unstable; urgency=low |
conf.h : conf.sh Makefile |
373 |
+ |
$(REMOVE) a.* |
374 |
+ * Fixed permissions |
- ALL_CFLAGS='$(ALL_CFLAGS)' \ |
375 |
+ |
+ ALL_CFLAGS="$(ALL_CFLAGS)" \ |
376 |
+ -- Mark Baker <mbaker@iee.org> Mon, 16 Feb 1998 00:07:52 +0000 |
CC='$(CC)' \ |
377 |
+ |
COMPAT2='$(COMPAT2)' \ |
378 |
+rcs (5.7-8) unstable; urgency=low |
DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \ |
379 |
+ |
diff -Naur rcs-5.7/src/rcsbase.h rcs-5.7-magellan/src/rcsbase.h |
380 |
+ * Updated standards-version to 2.4.0.0 (no changes) |
--- rcs-5.7/src/rcsbase.h 1995-06-16 08:19:24.000000000 +0200 |
381 |
+ |
+++ rcs-5.7-magellan/src/rcsbase.h 2010-03-07 20:13:06.000000000 +0100 |
382 |
+ -- Mark Baker <mbaker@iee.org> Tue, 10 Feb 1998 10:54:36 +0000 |
@@ -358,6 +358,7 @@ |
383 |
+ |
char const * lockedby; /* who locks the revision */ |
384 |
+rcs (5.7-7) unstable; urgency=low |
char const * state; /* state of revision (Exp by default) */ |
385 |
+ |
char const * name; /* name (if any) by which retrieved */ |
386 |
+ * Corrected maintainer field in debian/control |
+ char const * commitid; /* text string to associate commits */ |
387 |
+ * Flushed configure cache and recompiled, to fix bug #11305/#11308) |
struct cbuf log; /* log message requested at checkin */ |
388 |
+ |
struct branchhead * branches; /* list of first revisions on branches*/ |
389 |
+ -- Mark Baker <mbaker@iee.org> Thu, 17 Jul 1997 10:54:36 +0100 |
struct cbuf ig; /* ignored phrases in admin part */ |
390 |
+ |
@@ -662,6 +663,7 @@ |
391 |
+rcs (5.7-6) unstable; urgency=low |
extern char const *const expand_names[]; |
392 |
+ |
extern char const |
393 |
+ * Renamed changelog.upstream to changelog, as per policy (fixes #9657) |
Kaccess[], Kauthor[], Kbranch[], Kcomment[], |
394 |
+ |
+ Kcommitid[], |
395 |
+ -- Mark Baker <mbaker@iee.org> Sat, 12 Jul 1997 16:55:37 +0100 |
Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[], |
396 |
+ |
Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[]; |
397 |
+rcs (5.7-5) unstable; urgency=low |
void unexpected_EOF P((void)) exiting; |
398 |
+ |
diff -Naur rcs-5.7/src/rcs.c rcs-5.7-magellan/src/rcs.c |
399 |
+ * New maintainer |
--- rcs-5.7/src/rcs.c 1995-06-16 08:19:24.000000000 +0200 |
400 |
+ * Compiled with libc6 |
+++ rcs-5.7-magellan/src/rcs.c 2010-03-07 20:13:13.000000000 +0100 |
401 |
+ * Use canonical path for sendmail (configure.in changed) |
@@ -916,10 +916,11 @@ |
402 |
+ |
getkeystring(Klog); |
403 |
+ -- Mark Baker <mbaker@iee.org> Fri, 11 Jul 1997 21:24:48 +0100 |
if (nextdelta == cuttail) { |
404 |
+ |
cb = savestring(&curlogbuf); |
405 |
+rcs (5.7-4) unstable; urgency=low |
- if (!delta->log.string) |
406 |
+ |
+ if (delta && !delta->log.string) |
407 |
+ * Updated to Standards-Version 2.1.2.2. |
delta->log = cleanlogmsg(curlogbuf.string, cb.size); |
408 |
+ |
nextlex(); |
409 |
+ -- Sven Rudolph <sr1@inf.tu-dresden.de> Sun, 26 Jan 1997 22:34:57 +0100 |
- delta->igtext = getphrases(Ktext); |
410 |
+ |
+ if (delta) |
411 |
+rcs (5.7-3) unstable; urgency=low |
+ delta->igtext = getphrases(Ktext); |
412 |
+ |
} else { |
413 |
+ * debian.rules: added multi-architecture support |
if (nextdelta->log.string && nextdelta->selector) { |
414 |
+ |
foutptr = 0; |
415 |
+ * debian.control: added Priority: and Section: |
diff -Naur rcs-5.7/src/rcsdiff.c rcs-5.7-magellan/src/rcsdiff.c |
416 |
+ |
--- rcs-5.7/src/rcsdiff.c 1995-06-16 08:19:24.000000000 +0200 |
417 |
+ * debian.control: corrected extended description (Bug#3619) |
+++ rcs-5.7-magellan/src/rcsdiff.c 2010-03-07 20:13:10.000000000 +0100 |
418 |
+ |
@@ -212,9 +212,13 @@ |
419 |
+ -- Sven Rudolph <sr1@inf.tu-dresden.de> Wed, 24 Jul 1996 23:48:20 +0100 |
} |
420 |
+ |
goto option_handled; |
421 |
+rcs (5.7-2) unstable; urgency=low |
case '-': case 'D': |
422 |
+ |
- no_diff_means_no_output = false; |
423 |
+ * rebuilt for elf |
+ if (c == 'D' |
424 |
+ |
+ || strcmp(*argv, "--side-by-side") == 0 |
425 |
+ -- Sven Rudolph <sr1@inf.tu-dresden.de> Thu, 23 Nov 1995 23:27:13 +0100 |
+ || strcmp(*argv, "--ifdef") == 0) { |
426 |
+ |
+ no_diff_means_no_output = false; |
427 |
+rcs (5.7-1) unstable; urgency=low |
+ } |
428 |
+ |
/* fall into */ |
429 |
+ * created new Debian GNU/Linux package maintenance system files |
- case 'C': case 'F': case 'I': case 'L': case 'W': |
430 |
+ * updated from rcs5.6.0.1 to rcs-5.7 |
+ case 'C': case 'F': case 'I': case 'L': case 'U': case 'W': |
431 |
+ * received this package from Robert Sanders <Robert.Sanders@linux.org> |
#if DIFF_L |
432 |
+ |
if (c == 'L' && ++file_labels == 2) |
433 |
+ -- Sven Rudolph <sr1@inf.tu-dresden.de> Tue, 5 Sep 1995 04:38:07 +0100 |
faterror("too many -L options"); |
434 |
--- rcs-5.7.orig/debian/patches/0005-rcsdiff-option-parsing-updates.patch |
diff -Naur rcs-5.7/src/rcsedit.c rcs-5.7-magellan/src/rcsedit.c |
435 |
+++ rcs-5.7/debian/patches/0005-rcsdiff-option-parsing-updates.patch |
--- rcs-5.7/src/rcsedit.c 1995-06-16 08:19:24.000000000 +0200 |
436 |
@@ -0,0 +1,32 @@ |
+++ rcs-5.7-magellan/src/rcsedit.c 2010-03-07 20:13:08.000000000 +0100 |
437 |
+From c75a7855a54a5990c0094be57c0d3b7a4bc99e16 Mon Sep 17 00:00:00 2001 |
@@ -1503,6 +1503,9 @@ |
438 |
+From: Romain Francoise <rfrancoise@debian.org> |
register size_t dl; |
439 |
+Date: Sun, 23 Mar 2008 00:52:42 +0100 |
register struct buf *bn; |
440 |
+Subject: [PATCH] rcsdiff option parsing updates |
register char const *name = isworkfile ? workname : RCSname; |
441 |
+ |
+# if has_mktemp |
442 |
+--- |
+ int fd; |
443 |
+ src/rcsdiff.c | 8 ++++++-- |
+# endif |
444 |
+ 1 files changed, 6 insertions(+), 2 deletions(-) |
|
445 |
+ |
dl = basefilename(name) - name; |
446 |
+diff --git a/src/rcsdiff.c b/src/rcsdiff.c |
bn = &dirtpname[newRCSdirtp_index + isworkfile]; |
447 |
+index 26b29c2..3ac97e4 100644 |
@@ -1521,10 +1524,12 @@ |
448 |
+--- a/src/rcsdiff.c |
catchints(); |
449 |
++++ b/src/rcsdiff.c |
# if has_mktemp |
450 |
+@@ -212,9 +212,13 @@ mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 5.19 1995/06/16 06:19:24 eggert |
VOID strcpy(tp, "XXXXXX"); |
451 |
+ } |
- if (!mktemp(np) || !*np) |
452 |
+ goto option_handled; |
+ fd = mkstemp(np); |
453 |
+ case '-': case 'D': |
+ if (fd < 0 || !*np) |
454 |
+- no_diff_means_no_output = false; |
faterror("can't make temporary pathname `%.*s_%cXXXXXX'", |
455 |
++ if (c == 'D' |
(int)dl, name, '0'+isworkfile |
456 |
++ || strcmp(*argv, "--side-by-side") == 0 |
); |
457 |
++ || strcmp(*argv, "--ifdef") == 0) { |
+ close(fd); |
458 |
++ no_diff_means_no_output = false; |
# else |
459 |
++ } |
/* |
460 |
+ /* fall into */ |
* Posix 1003.1-1990 has no reliable way |
461 |
+- case 'C': case 'F': case 'I': case 'L': case 'W': |
diff -Naur rcs-5.7/src/rcsfnms.c rcs-5.7-magellan/src/rcsfnms.c |
462 |
++ case 'C': case 'F': case 'I': case 'L': case 'U': case 'W': |
--- rcs-5.7/src/rcsfnms.c 1995-06-16 08:19:24.000000000 +0200 |
463 |
+ #if DIFF_L |
+++ rcs-5.7-magellan/src/rcsfnms.c 2010-03-07 20:13:08.000000000 +0100 |
464 |
+ if (c == 'L' && ++file_labels == 2) |
@@ -285,6 +285,9 @@ |
465 |
+ faterror("too many -L options"); |
{ |
466 |
+-- |
char *p; |
467 |
+1.6.3.2.306.g4f4fa |
char const *t = tpnames[n]; |
468 |
+ |
+# if has_mktemp |
469 |
--- rcs-5.7.orig/debian/patches/0003-Add-support-for-the-commitid-phrase.patch |
+ int fd; |
470 |
+++ rcs-5.7/debian/patches/0003-Add-support-for-the-commitid-phrase.patch |
+# endif |
471 |
@@ -0,0 +1,159 @@ |
|
472 |
+From 13566af7a876e058a96f4ae3617541b3b1e5400d Mon Sep 17 00:00:00 2001 |
if (t) |
473 |
+From: Romain Francoise <rfrancoise@debian.org> |
return t; |
474 |
+Date: Sun, 23 Mar 2008 00:50:39 +0100 |
@@ -296,10 +299,12 @@ |
475 |
+Subject: [PATCH] Add support for the commitid phrase |
size_t tplen = dir_useful_len(tp); |
476 |
+ |
p = testalloc(tplen + 10); |
477 |
+By Mark D. Baushke <mdb@gnu.org>. |
VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n); |
478 |
+ |
- if (!mktemp(p) || !*p) |
479 |
+Note that this patch does not include support for generating the ids at |
+ fd = mkstemp(p); |
480 |
+check in time; it only makes RCS recognize them. |
+ if (fd < 0 || !*p) |
481 |
+--- |
faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'", |
482 |
+ man/rcsfile.5 | 13 +++++++++++++ |
(int)tplen, tp, SLASH, '0'+n |
483 |
+ man/rcsfile.5in | 13 +++++++++++++ |
); |
484 |
+ src/rcsbase.h | 2 ++ |
+ close(fd); |
485 |
+ src/rcsgen.c | 3 +++ |
# else |
486 |
+ src/rcssyn.c | 9 +++++++++ |
static char tpnamebuf[TEMPNAMES][L_tmpnam]; |
487 |
+ src/rlog.c | 4 ++++ |
p = tpnamebuf[n]; |
488 |
+ 6 files changed, 44 insertions(+), 0 deletions(-) |
diff -Naur rcs-5.7/src/rcsfreeze.sh rcs-5.7-magellan/src/rcsfreeze.sh |
489 |
+ |
--- rcs-5.7/src/rcsfreeze.sh 1993-11-03 18:42:27.000000000 +0100 |
490 |
+diff --git a/man/rcsfile.5 b/man/rcsfile.5 |
+++ rcs-5.7-magellan/src/rcsfreeze.sh 2010-03-07 20:13:08.000000000 +0100 |
491 |
+index bc47f7d..1f2de7c 100644 |
@@ -59,8 +59,7 @@ |
492 |
+--- a/man/rcsfile.5 |
|
493 |
++++ b/man/rcsfile.5 |
# Stamp the logfile. Because we order the logfile the most recent |
494 |
+@@ -69,6 +69,7 @@ nonterminal symbols are in |
# first we will have to save everything right now in a temporary file. |
495 |
+ \f3state\fP {\f2id\fP}\f3;\fP |
-TMPLOG=/tmp/rcsfrz$$ |
496 |
+ \f3branches\fP {\f2num\fP}*\f3;\fP |
-trap 'rm -f $TMPLOG; exit 1' 1 2 13 15 |
497 |
+ \f3next\fP {\f2num\fP}\f3;\fP |
+TMPLOG=$(tempfile) |
498 |
++ { \f3commitid\fP \f2id\fP\f3;\fP } |
# Now ask for a log message, continously add to the log file |
499 |
+ { \f2newphrase\fP }* |
( |
500 |
+ .LP |
echo "Version: $SYMREVNAME($SYMREV), Date: $DATE |
501 |
+ \f2desc\fP ::= \f3desc\fP \f2string\fP |
diff -Naur rcs-5.7/src/rcsgen.c rcs-5.7-magellan/src/rcsgen.c |
502 |
+@@ -128,6 +129,18 @@ and all the digits of years thereafter. |
--- rcs-5.7/src/rcsgen.c 1995-06-16 08:19:24.000000000 +0200 |
503 |
+ Dates use the Gregorian calendar; times use UTC. |
+++ rcs-5.7-magellan/src/rcsgen.c 2010-03-07 20:13:06.000000000 +0100 |
504 |
+ .PP |
@@ -547,6 +547,9 @@ |
505 |
+ The |
|
506 |
++.I commitid |
aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:""); |
507 |
++is followed by an |
awrite(node->ig.string, node->ig.size, fout); |
508 |
++.I id |
+ |
509 |
++token. This token is intended to be unique across |
+ if (node->commitid) |
510 |
++multiple files and is used to help group files as |
+ aprintf(fout, "%s\t%s;\n", Kcommitid, node->commitid); |
511 |
++being a part of the same logical commit. |
} |
512 |
++This token must uniquely identify the commit |
|
513 |
++operation that was applied to a set of RCS files. |
|
514 |
++In particular, it must be unique among all the |
diff -Naur rcs-5.7/src/rcssyn.c rcs-5.7-magellan/src/rcssyn.c |
515 |
++commitids in this file. |
--- rcs-5.7/src/rcssyn.c 1995-06-16 08:19:24.000000000 +0200 |
516 |
++.PP |
+++ rcs-5.7-magellan/src/rcssyn.c 2010-03-07 20:13:06.000000000 +0100 |
517 |
++The |
@@ -171,6 +171,7 @@ |
518 |
+ .I newphrase |
Kauthor[] = "author", |
519 |
+ productions in the grammar are reserved for future extensions |
Kbranch[] = "branch", |
520 |
+ to the format of \*r files. |
Kcomment[] = "comment", |
521 |
+diff --git a/man/rcsfile.5in b/man/rcsfile.5in |
+ Kcommitid[] = "commitid", |
522 |
+index 72930e1..d6118c7 100644 |
Kdate[] = "date", |
523 |
+--- a/man/rcsfile.5in |
Kdesc[] = "desc", |
524 |
++++ b/man/rcsfile.5in |
Kexpand[] = "expand", |
525 |
+@@ -68,6 +68,7 @@ nonterminal symbols are in |
@@ -433,6 +434,14 @@ |
526 |
+ \f3state\fP {\f2id\fP}\f3;\fP |
Delta->lockedby = 0; |
527 |
+ \f3branches\fP {\f2num\fP}*\f3;\fP |
Delta->log.string = 0; |
528 |
+ \f3next\fP {\f2num\fP}\f3;\fP |
Delta->selector = true; |
529 |
++ { \f3commitid\fP \f2id\fP\f3;\fP } |
+ |
530 |
+ { \f2newphrase\fP }* |
+ if (getkeyopt(Kcommitid)) { |
531 |
+ .LP |
+ Delta->commitid = NextString; |
532 |
+ \f2desc\fP ::= \f3desc\fP \f2string\fP |
+ nextlex(); |
533 |
+@@ -127,6 +128,18 @@ and all the digits of years thereafter. |
+ getsemi(Kcommitid); |
534 |
+ Dates use the Gregorian calendar; times use UTC. |
+ } else |
535 |
+ .PP |
+ Delta->commitid = NULL; |
536 |
+ The |
+ |
537 |
++.I commitid |
Delta->ig = getphrases(Kdesc); |
538 |
++is followed by an |
TotalDeltas++; |
539 |
++.I id |
return (true); |
540 |
++token. This token is intended to be unique across |
diff -Naur rcs-5.7/src/rlog.c rcs-5.7-magellan/src/rlog.c |
541 |
++multiple files and is used to help group files as |
--- rcs-5.7/src/rlog.c 1995-06-16 08:19:24.000000000 +0200 |
542 |
++being a part of the same logical commit. |
+++ rcs-5.7-magellan/src/rlog.c 2010-03-07 20:13:06.000000000 +0100 |
543 |
++This token must uniquely identify the commit |
@@ -591,6 +591,10 @@ |
544 |
++operation that was applied to a set of RCS files. |
aprintf(out, insDelFormat, |
545 |
++In particular, it must be unique among all the |
editscript->insertlns, editscript->deletelns); |
546 |
++commitids in this file. |
|
547 |
++.PP |
+ if ( node->commitid ) |
548 |
++The |
+ aprintf(out, "%s commitid: %s", (editscript) ? ";" : "", |
549 |
+ .I newphrase |
+ node->commitid); |
550 |
+ productions in the grammar are reserved for future extensions |
+ |
551 |
+ to the format of \*r files. |
newbranch = node->branches; |
552 |
+diff --git a/src/rcsbase.h b/src/rcsbase.h |
if ( newbranch ) { |
553 |
+index 147f7d7..23ed4fe 100644 |
bufautobegin(&branchnum); |
|
+--- a/src/rcsbase.h |
|
|
++++ b/src/rcsbase.h |
|
|
+@@ -358,6 +358,7 @@ struct hshentry { |
|
|
+ char const * lockedby; /* who locks the revision */ |
|
|
+ char const * state; /* state of revision (Exp by default) */ |
|
|
+ char const * name; /* name (if any) by which retrieved */ |
|
|
++ char const * commitid; /* text string to associate commits */ |
|
|
+ struct cbuf log; /* log message requested at checkin */ |
|
|
+ struct branchhead * branches; /* list of first revisions on branches*/ |
|
|
+ struct cbuf ig; /* ignored phrases in admin part */ |
|
|
+@@ -662,6 +663,7 @@ extern int TotalDeltas; |
|
|
+ extern char const *const expand_names[]; |
|
|
+ extern char const |
|
|
+ Kaccess[], Kauthor[], Kbranch[], Kcomment[], |
|
|
++ Kcommitid[], |
|
|
+ Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[], |
|
|
+ Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[]; |
|
|
+ void unexpected_EOF P((void)) exiting; |
|
|
+diff --git a/src/rcsgen.c b/src/rcsgen.c |
|
|
+index a87257e..7eb14f1 100644 |
|
|
+--- a/src/rcsgen.c |
|
|
++++ b/src/rcsgen.c |
|
|
+@@ -547,6 +547,9 @@ putdelta(node, fout) |
|
|
+ |
|
|
+ aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:""); |
|
|
+ awrite(node->ig.string, node->ig.size, fout); |
|
|
++ |
|
|
++ if (node->commitid) |
|
|
++ aprintf(fout, "%s\t%s;\n", Kcommitid, node->commitid); |
|
|
+ } |
|
|
+ |
|
|
+ |
|
|
+diff --git a/src/rcssyn.c b/src/rcssyn.c |
|
|
+index f254bf7..d21d0d8 100644 |
|
|
+--- a/src/rcssyn.c |
|
|
++++ b/src/rcssyn.c |
|
|
+@@ -171,6 +171,7 @@ char const |
|
|
+ Kauthor[] = "author", |
|
|
+ Kbranch[] = "branch", |
|
|
+ Kcomment[] = "comment", |
|
|
++ Kcommitid[] = "commitid", |
|
|
+ Kdate[] = "date", |
|
|
+ Kdesc[] = "desc", |
|
|
+ Kexpand[] = "expand", |
|
|
+@@ -433,6 +434,14 @@ getdelta() |
|
|
+ Delta->lockedby = 0; |
|
|
+ Delta->log.string = 0; |
|
|
+ Delta->selector = true; |
|
|
++ |
|
|
++ if (getkeyopt(Kcommitid)) { |
|
|
++ Delta->commitid = NextString; |
|
|
++ nextlex(); |
|
|
++ getsemi(Kcommitid); |
|
|
++ } else |
|
|
++ Delta->commitid = NULL; |
|
|
++ |
|
|
+ Delta->ig = getphrases(Kdesc); |
|
|
+ TotalDeltas++; |
|
|
+ return (true); |
|
|
+diff --git a/src/rlog.c b/src/rlog.c |
|
|
+index 7fb9b4d..4ee79e7 100644 |
|
|
+--- a/src/rlog.c |
|
|
++++ b/src/rlog.c |
|
|
+@@ -591,6 +591,10 @@ putadelta(node,editscript,trunk) |
|
|
+ aprintf(out, insDelFormat, |
|
|
+ editscript->insertlns, editscript->deletelns); |
|
|
+ |
|
|
++ if ( node->commitid ) |
|
|
++ aprintf(out, "%s commitid: %s", (editscript) ? ";" : "", |
|
|
++ node->commitid); |
|
|
++ |
|
|
+ newbranch = node->branches; |
|
|
+ if ( newbranch ) { |
|
|
+ bufautobegin(&branchnum); |
|
|
+-- |
|
|
+1.6.3.2.306.g4f4fa |
|
|
+ |
|
|
--- rcs-5.7.orig/debian/patches/0008-Various-build-tweaks.patch |
|
|
+++ rcs-5.7/debian/patches/0008-Various-build-tweaks.patch |
|
|
@@ -0,0 +1,114 @@ |
|
|
+From 2a814cf24019073a05f64c306a39b3202efe40ab Mon Sep 17 00:00:00 2001 |
|
|
+From: Romain Francoise <rfrancoise@debian.org> |
|
|
+Date: Sun, 23 Mar 2008 00:57:09 +0100 |
|
|
+Subject: [PATCH] Various build tweaks |
|
|
+ |
|
|
+Including: |
|
|
+- allow building as root |
|
|
+- install rcsfreeze and its man page |
|
|
+- pass CFLAGS properly |
|
|
+- install man pages in /usr/share/man |
|
|
+- tweak default PATH when looking for sendmail |
|
|
+--- |
|
|
+ configure.in | 2 +- |
|
|
+ man/Makefile.in | 7 ++++--- |
|
|
+ src/Makefile.in | 6 ++++-- |
|
|
+ src/conf.sh | 11 ----------- |
|
|
+ 4 files changed, 9 insertions(+), 17 deletions(-) |
|
|
+ |
|
|
+diff --git a/configure.in b/configure.in |
|
|
+index b6dd5d2..3c6aed3 100644 |
|
|
+--- a/configure.in |
|
|
++++ b/configure.in |
|
|
+@@ -243,7 +243,7 @@ rm -f conftest* |
|
|
+ AC_PATH_PROG(ED, ed, ed) |
|
|
+ |
|
|
+ ac_save_path=$PATH |
|
|
+-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH |
|
|
++PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH |
|
|
+ AC_PATH_PROGS(SENDMAIL, sendmail mail mailx) |
|
|
+ PATH=$ac_save_path |
|
|
+ case $SENDMAIL in |
|
|
+diff --git a/man/Makefile.in b/man/Makefile.in |
|
|
+index 8ff25df..ffc8c7c 100644 |
|
|
+--- a/man/Makefile.in |
|
|
++++ b/man/Makefile.in |
|
|
+@@ -34,8 +34,8 @@ INSTALL_DATA = @INSTALL_DATA@ |
|
|
+ PIC = @PIC@ |
|
|
+ |
|
|
+ prefix = @prefix@ |
|
|
+-man1dir = $(prefix)/man/man1 |
|
|
+-man5dir = $(prefix)/man/man5 |
|
|
++man1dir = $(prefix)/share/man/man1 |
|
|
++man5dir = $(prefix)/share/man/man5 |
|
|
+ man1ext = .1 |
|
|
+ man5ext = .5 |
|
|
+ |
|
|
+@@ -51,7 +51,8 @@ check dvi info TAGS :: |
|
|
+ installdirs :: ../mkinstalldirs |
|
|
+ -$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir) |
|
|
+ |
|
|
+-man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog |
|
|
++man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \ |
|
|
++ rcsfreeze |
|
|
+ |
|
|
+ install :: installdirs |
|
|
+ -for m in $(man1pages); do \ |
|
|
+diff --git a/src/Makefile.in b/src/Makefile.in |
|
|
+index c27af21..5bc2147 100644 |
|
|
+--- a/src/Makefile.in |
|
|
++++ b/src/Makefile.in |
|
|
+@@ -116,16 +116,18 @@ install :: all installdirs |
|
|
+ for p in $(PROGRAMS); do \ |
|
|
+ $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \ |
|
|
+ done |
|
|
++ $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze |
|
|
+ |
|
|
+ uninstall :: |
|
|
+ for p in $(PROGRAMS); do \ |
|
|
+ $(REMOVE) $(bindir)/$$p; \ |
|
|
+ done |
|
|
++ $(REMOVE) $(bindir)/rcsfreeze |
|
|
+ |
|
|
+ # Install RCS and (if applicable) GNU diff before running these tests. |
|
|
+ # To test RCS before installing it, see the file INSTALL.RCS. |
|
|
+ RCSTEST = \ |
|
|
+- ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \ |
|
|
++ ALL_CFLAGS="$(ALL_CFLAGS)" CC='$(CC)' DIFF='$(DIFF)' \ |
|
|
+ LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \ |
|
|
+ PATH=$(bindir):$$PATH \ |
|
|
+ sh $(srcdir)/rcstest |
|
|
+@@ -153,7 +155,7 @@ maintainer-clean :: distclean |
|
|
+ #(Unix |
|
|
+ conf.h : conf.sh Makefile |
|
|
+ $(REMOVE) a.* |
|
|
+- ALL_CFLAGS='$(ALL_CFLAGS)' \ |
|
|
++ ALL_CFLAGS="$(ALL_CFLAGS)" \ |
|
|
+ CC='$(CC)' \ |
|
|
+ COMPAT2='$(COMPAT2)' \ |
|
|
+ DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \ |
|
|
+diff --git a/src/conf.sh b/src/conf.sh |
|
|
+index c9bf0b3..b28a504 100644 |
|
|
+--- a/src/conf.sh |
|
|
++++ b/src/conf.sh |
|
|
+@@ -73,17 +73,6 @@ case `echo -n` in |
|
|
+ ech='echo -n' dots='... ' |
|
|
+ esac |
|
|
+ |
|
|
+-$ech >&3 "$0: testing permissions $dots" |
|
|
+-rm -f a.d && |
|
|
+-date >a.d && |
|
|
+-chmod 0 a.d && |
|
|
+-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { |
|
|
+- echo >&3 "$n$0: This command should not be run with superuser permissions." |
|
|
+- exit 1 |
|
|
+-} |
|
|
+-echo >&3 OK |
|
|
+-rm -f a.d || exit |
|
|
+- |
|
|
+ $ech >&3 "$0: testing compiler for plausibility $dots" |
|
|
+ echo 'main() { return 0; }' >a.c |
|
|
+ rm -f a.exe a.out || exit |
|
|
+-- |
|
|
+1.6.3.2.306.g4f4fa |
|
|
+ |
|
|
--- rcs-5.7.orig/debian/patches/0004-Security-fixes.patch |
|
|
+++ rcs-5.7/debian/patches/0004-Security-fixes.patch |
|
|
@@ -0,0 +1,85 @@ |
|
|
+From 8b4a5ad3c28026799548219fcc25bb1d0063ade8 Mon Sep 17 00:00:00 2001 |
|
|
+From: Romain Francoise <rfrancoise@debian.org> |
|
|
+Date: Sun, 23 Mar 2008 00:52:03 +0100 |
|
|
+Subject: [PATCH] Security fixes |
|
|
+ |
|
|
+From various contributors, see debian/changelog for detailed list. |
|
|
+--- |
|
|
+ src/rcsedit.c | 7 ++++++- |
|
|
+ src/rcsfnms.c | 7 ++++++- |
|
|
+ src/rcsfreeze.sh | 3 +-- |
|
|
+ 3 files changed, 13 insertions(+), 4 deletions(-) |
|
|
+ |
|
|
+diff --git a/src/rcsedit.c b/src/rcsedit.c |
|
|
+index 6000a68..b99249a 100644 |
|
|
+--- a/src/rcsedit.c |
|
|
++++ b/src/rcsedit.c |
|
|
+@@ -1503,6 +1503,9 @@ makedirtemp(isworkfile) |
|
|
+ register size_t dl; |
|
|
+ register struct buf *bn; |
|
|
+ register char const *name = isworkfile ? workname : RCSname; |
|
|
++# if has_mktemp |
|
|
++ int fd; |
|
|
++# endif |
|
|
+ |
|
|
+ dl = basefilename(name) - name; |
|
|
+ bn = &dirtpname[newRCSdirtp_index + isworkfile]; |
|
|
+@@ -1521,10 +1524,12 @@ makedirtemp(isworkfile) |
|
|
+ catchints(); |
|
|
+ # if has_mktemp |
|
|
+ VOID strcpy(tp, "XXXXXX"); |
|
|
+- if (!mktemp(np) || !*np) |
|
|
++ fd = mkstemp(np); |
|
|
++ if (fd < 0 || !*np) |
|
|
+ faterror("can't make temporary pathname `%.*s_%cXXXXXX'", |
|
|
+ (int)dl, name, '0'+isworkfile |
|
|
+ ); |
|
|
++ close(fd); |
|
|
+ # else |
|
|
+ /* |
|
|
+ * Posix 1003.1-1990 has no reliable way |
|
|
+diff --git a/src/rcsfnms.c b/src/rcsfnms.c |
|
|
+index e3b4f71..5edb6b4 100644 |
|
|
+--- a/src/rcsfnms.c |
|
|
++++ b/src/rcsfnms.c |
|
|
+@@ -285,6 +285,9 @@ maketemp(n) |
|
|
+ { |
|
|
+ char *p; |
|
|
+ char const *t = tpnames[n]; |
|
|
++# if has_mktemp |
|
|
++ int fd; |
|
|
++# endif |
|
|
+ |
|
|
+ if (t) |
|
|
+ return t; |
|
|
+@@ -296,10 +299,12 @@ maketemp(n) |
|
|
+ size_t tplen = dir_useful_len(tp); |
|
|
+ p = testalloc(tplen + 10); |
|
|
+ VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n); |
|
|
+- if (!mktemp(p) || !*p) |
|
|
++ fd = mkstemp(p); |
|
|
++ if (fd < 0 || !*p) |
|
|
+ faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'", |
|
|
+ (int)tplen, tp, SLASH, '0'+n |
|
|
+ ); |
|
|
++ close(fd); |
|
|
+ # else |
|
|
+ static char tpnamebuf[TEMPNAMES][L_tmpnam]; |
|
|
+ p = tpnamebuf[n]; |
|
|
+diff --git a/src/rcsfreeze.sh b/src/rcsfreeze.sh |
|
|
+index 96954f0..ea58c00 100644 |
|
|
+--- a/src/rcsfreeze.sh |
|
|
++++ b/src/rcsfreeze.sh |
|
|
+@@ -59,8 +59,7 @@ rcsfreeze: give log message, summarizing changes (end with EOF or single '.')" \ |
|
|
+ |
|
|
+ # Stamp the logfile. Because we order the logfile the most recent |
|
|
+ # first we will have to save everything right now in a temporary file. |
|
|
+-TMPLOG=/tmp/rcsfrz$$ |
|
|
+-trap 'rm -f $TMPLOG; exit 1' 1 2 13 15 |
|
|
++TMPLOG=$(tempfile) |
|
|
+ # Now ask for a log message, continously add to the log file |
|
|
+ ( |
|
|
+ echo "Version: $SYMREVNAME($SYMREV), Date: $DATE |
|
|
+-- |
|
|
+1.6.3.2.306.g4f4fa |
|
|
+ |
|
|
--- rcs-5.7.orig/debian/patches/0007-Fix-crasher-bug-in-scanlogtext.patch |
|
|
+++ rcs-5.7/debian/patches/0007-Fix-crasher-bug-in-scanlogtext.patch |
|
|
@@ -0,0 +1,30 @@ |
|
|
+From d741c63ce2c9730850825192b675cd6cdb767029 Mon Sep 17 00:00:00 2001 |
|
|
+From: Romain Francoise <rfrancoise@debian.org> |
|
|
+Date: Sun, 23 Mar 2008 00:54:51 +0100 |
|
|
+Subject: [PATCH] Fix crasher bug in scanlogtext() |
|
|
+ |
|
|
+--- |
|
|
+ src/rcs.c | 5 +++-- |
|
|
+ 1 files changed, 3 insertions(+), 2 deletions(-) |
|
|
+ |
|
|
+diff --git a/src/rcs.c b/src/rcs.c |
|
|
+index 526667d..2b99ad1 100644 |
|
|
+--- a/src/rcs.c |
|
|
++++ b/src/rcs.c |
|
|
+@@ -916,10 +916,11 @@ scanlogtext(delta,edit) |
|
|
+ getkeystring(Klog); |
|
|
+ if (nextdelta == cuttail) { |
|
|
+ cb = savestring(&curlogbuf); |
|
|
+- if (!delta->log.string) |
|
|
++ if (delta && !delta->log.string) |
|
|
+ delta->log = cleanlogmsg(curlogbuf.string, cb.size); |
|
|
+ nextlex(); |
|
|
+- delta->igtext = getphrases(Ktext); |
|
|
++ if (delta) |
|
|
++ delta->igtext = getphrases(Ktext); |
|
|
+ } else { |
|
|
+ if (nextdelta->log.string && nextdelta->selector) { |
|
|
+ foutptr = 0; |
|
|
+-- |
|
|
+1.6.3.2.306.g4f4fa |
|
|
+ |
|
|
--- rcs-5.7.orig/debian/patches/0002-Various-man-page-fixes.patch |
|
|
+++ rcs-5.7/debian/patches/0002-Various-man-page-fixes.patch |
|
|
@@ -0,0 +1,220 @@ |
|
|
+From 04ae787718fa7e034f49eb3b7fabb2677129df10 Mon Sep 17 00:00:00 2001 |
|
|
+From: Romain Francoise <rfrancoise@debian.org> |
|
|
+Date: Sun, 23 Mar 2008 00:47:13 +0100 |
|
|
+Subject: [PATCH] Various man page fixes |
|
|
+ |
|
|
+From various contributors, see debian/changelog for detailed list. |
|
|
+--- |
|
|
+ man/co.1 | 12 ++++++------ |
|
|
+ man/merge.1 | 8 ++++++-- |
|
|
+ man/rcsfile.5 | 28 ++++++++++++++-------------- |
|
|
+ man/rlog.1 | 4 ++++ |
|
|
+ 4 files changed, 30 insertions(+), 22 deletions(-) |
|
|
+ |
|
|
+diff --git a/man/co.1 b/man/co.1 |
|
|
+index 8d0a6e7..5951123 100644 |
|
|
+--- a/man/co.1 |
|
|
++++ b/man/co.1 |
|
|
+@@ -597,7 +597,7 @@ line is |
|
|
+ .RB \*(lq "//\ " \*(rq. |
|
|
+ This is useful for languages with comments that go to the end of the line. |
|
|
+ The convention for other languages is to use a |
|
|
+-.RB \*(lq " \(** " \(rq |
|
|
++.RB \*(lq " * " \(rq |
|
|
+ prefix inside a multiline comment. |
|
|
+ For example, the initial log comment of a C program |
|
|
+ conventionally is of the following form: |
|
|
+@@ -606,19 +606,19 @@ conventionally is of the following form: |
|
|
+ .nf |
|
|
+ .ft 3 |
|
|
+ .ne 3 |
|
|
+-/\(** |
|
|
++/* |
|
|
+ .in +\w'/'u |
|
|
+-\(** $\&Log$ |
|
|
+-\(**/ |
|
|
++* $\&Log$ |
|
|
++*/ |
|
|
+ .in |
|
|
+ .ft |
|
|
+ .fi |
|
|
+ .RE |
|
|
+ .LP |
|
|
+ For backwards compatibility with older versions of \*r, if the log prefix is |
|
|
+-.B /\(** |
|
|
++.B /* |
|
|
+ or |
|
|
+-.B (\(** |
|
|
++.B (* |
|
|
+ surrounded by optional white space, inserted log lines contain a space |
|
|
+ instead of |
|
|
+ .B / |
|
|
+diff --git a/man/merge.1 b/man/merge.1 |
|
|
+index e4860d2..c6f6f9f 100644 |
|
|
+--- a/man/merge.1 |
|
|
++++ b/man/merge.1 |
|
|
+@@ -114,8 +114,9 @@ Send results to standard output instead of overwriting |
|
|
+ .TP |
|
|
+ .BI \-q |
|
|
+ Quiet; do not warn about conflicts. |
|
|
++.TP |
|
|
+ .BI \-V |
|
|
+-Print \*r's version number. |
|
|
++Print version number. |
|
|
+ .SH DIAGNOSTICS |
|
|
+ Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble. |
|
|
+ .SH IDENTIFICATION |
|
|
+@@ -127,7 +128,10 @@ Copyright \(co 1982, 1988, 1989 Walter F. Tichy. |
|
|
+ .br |
|
|
+ Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert. |
|
|
+ .SH SEE ALSO |
|
|
+-diff3(1), diff(1), rcsmerge(1), co(1). |
|
|
++.BR diff3 (1), |
|
|
++.BR diff (1), |
|
|
++.BR rcsmerge (1), |
|
|
++.BR co(1) . |
|
|
+ .SH BUGS |
|
|
+ It normally does not make sense to merge binary files as if they were text, but |
|
|
+ .B merge |
|
|
+diff --git a/man/rcsfile.5 b/man/rcsfile.5 |
|
|
+index 5a1929f..bc47f7d 100644 |
|
|
+--- a/man/rcsfile.5 |
|
|
++++ b/man/rcsfile.5 |
|
|
+@@ -230,7 +230,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .fi |
|
|
+ .\} |
|
|
+ .if \np \{\ |
|
|
+-.lf 232 |
|
|
++.lf 245 |
|
|
+ .PS 4.250i 3.812i |
|
|
+ .\" -2.0625 -4.25 1.75 0 |
|
|
+ .\" 0.000i 4.250i 3.812i 0.000i |
|
|
+@@ -239,7 +239,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .nr 0x 1 |
|
|
+ \h'3.812i' |
|
|
+ .sp -1 |
|
|
+-.lf 242 |
|
|
++.lf 255 |
|
|
+ \h'2.062i-(\w'Head'u/2u)'\v'0.125i-(0v/2u)+0v+0.22m'Head |
|
|
+ .sp -1 |
|
|
+ \h'2.062i'\v'0.250i'\D'l0.000i 0.500i' |
|
|
+@@ -256,7 +256,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'1.688i'\v'0.750i'\D'l0.000i 0.500i' |
|
|
+ .sp -1 |
|
|
+-.lf 244 |
|
|
++.lf 257 |
|
|
+ \h'2.062i-(\w'2.1'u/2u)'\v'1.000i-(0v/2u)+0v+0.22m'2.1 |
|
|
+ .sp -1 |
|
|
+ \h'2.062i'\v'1.250i'\D'l0.000i 0.500i' |
|
|
+@@ -265,7 +265,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'2.062i'\v'1.750i'\D'l-0.025i -0.100i' |
|
|
+ .sp -1 |
|
|
+-.lf 246 |
|
|
++.lf 259 |
|
|
+ \h'2.062i-(\w'1.3'u/2u)'\v'2.000i-(1v/2u)+0v+0.22m'1.3 |
|
|
+ .sp -1 |
|
|
+ \h'2.062i'\v'2.250i'\D'l-0.375i -0.500i' |
|
|
+@@ -280,7 +280,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'1.375i'\v'1.500i'\D'l0.025i 0.100i' |
|
|
+ .sp -1 |
|
|
+-.lf 249 |
|
|
++.lf 262 |
|
|
+ \h'1.375i-(\w'1.3.1.1'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.3.1.1 |
|
|
+ .sp -1 |
|
|
+ \h'1.375i'\v'1.000i'\D'l-0.375i 0.500i' |
|
|
+@@ -295,7 +295,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'2.062i'\v'2.750i'\D'l-0.025i -0.100i' |
|
|
+ .sp -1 |
|
|
+-.lf 252 |
|
|
++.lf 265 |
|
|
+ \h'2.062i-(\w'1.2'u/2u)'\v'3.000i-(1v/2u)+0v+0.22m'1.2 |
|
|
+ .sp -1 |
|
|
+ \h'2.062i'\v'3.250i'\D'l-0.375i -0.500i' |
|
|
+@@ -310,7 +310,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'0.375i'\v'2.500i'\D'l0.025i 0.100i' |
|
|
+ .sp -1 |
|
|
+-.lf 255 |
|
|
++.lf 268 |
|
|
+ \h'0.375i-(\w'1.2.1.1'u/2u)'\v'2.250i-(1v/2u)+1v+0.22m'1.2.1.1 |
|
|
+ .sp -1 |
|
|
+ \h'0.375i'\v'2.000i'\D'l-0.375i 0.500i' |
|
|
+@@ -325,7 +325,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'0.375i'\v'1.500i'\D'l0.025i 0.100i' |
|
|
+ .sp -1 |
|
|
+-.lf 257 |
|
|
++.lf 270 |
|
|
+ \h'0.375i-(\w'1.2.1.3'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.2.1.3 |
|
|
+ .sp -1 |
|
|
+ \h'0.375i'\v'1.000i'\D'l-0.375i 0.500i' |
|
|
+@@ -340,7 +340,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'2.750i'\v'2.500i'\D'l0.025i 0.100i' |
|
|
+ .sp -1 |
|
|
+-.lf 261 |
|
|
++.lf 274 |
|
|
+ \h'2.750i-(\w'1.2.2.1'u/2u)'\v'2.250i-(1v/2u)+1v+0.22m'1.2.2.1 |
|
|
+ .sp -1 |
|
|
+ \h'2.750i'\v'2.000i'\D'l-0.375i 0.500i' |
|
|
+@@ -355,7 +355,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'3.438i'\v'1.250i'\D'l0.025i 0.100i' |
|
|
+ .sp -1 |
|
|
+-.lf 264 |
|
|
++.lf 277 |
|
|
+ \h'3.438i-(\w'\s-21.2.2.1.1.1\s0'u/2u)'\v'1.000i-(1v/2u)+1v+0.22m'\s-21.2.2.1.1.1\s0 |
|
|
+ .sp -1 |
|
|
+ \h'3.438i'\v'0.750i'\D'l-0.375i 0.500i' |
|
|
+@@ -370,7 +370,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'2.750i'\v'1.500i'\D'l0.025i 0.100i' |
|
|
+ .sp -1 |
|
|
+-.lf 267 |
|
|
++.lf 280 |
|
|
+ \h'2.750i-(\w'1.2.2.2'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.2.2.2 |
|
|
+ .sp -1 |
|
|
+ \h'2.750i'\v'1.000i'\D'l-0.375i 0.500i' |
|
|
+@@ -385,7 +385,7 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .sp -1 |
|
|
+ \h'2.062i'\v'3.750i'\D'l-0.025i -0.100i' |
|
|
+ .sp -1 |
|
|
+-.lf 270 |
|
|
++.lf 283 |
|
|
+ \h'2.062i-(\w'1.1'u/2u)'\v'4.000i-(1v/2u)+0v+0.22m'1.1 |
|
|
+ .sp -1 |
|
|
+ \h'2.062i'\v'4.250i'\D'l-0.375i -0.500i' |
|
|
+@@ -398,9 +398,9 @@ The following diagram shows an example of an \*r file's organization. |
|
|
+ .if \n(00 .fi |
|
|
+ .br |
|
|
+ .nr 0x 0 |
|
|
+-.lf 271 |
|
|
++.lf 284 |
|
|
+ .PE |
|
|
+-.lf 272 |
|
|
++.lf 285 |
|
|
+ .\} |
|
|
+ .PP |
|
|
+ .SH IDENTIFICATION |
|
|
+diff --git a/man/rlog.1 b/man/rlog.1 |
|
|
+index cc4b45c..68a75a6 100644 |
|
|
+--- a/man/rlog.1 |
|
|
++++ b/man/rlog.1 |
|
|
+@@ -187,6 +187,10 @@ If |
|
|
+ .I logins |
|
|
+ is omitted, the user's login is assumed. |
|
|
+ .TP |
|
|
++.B \-q |
|
|
++This option has no effect; |
|
|
++it is provided for consistency with other commands. |
|
|
++.TP |
|
|
+ .B \-T |
|
|
+ This option has no effect; |
|
|
+ it is present for compatibility with other \*r commands. |
|
|
+-- |
|
|
+1.6.3.2.306.g4f4fa |
|
|
+ |
|
|
--- rcs-5.7.orig/debian/patches/0006-Make-ident-accept-numbers-in-identifiers.patch |
|
|
+++ rcs-5.7/debian/patches/0006-Make-ident-accept-numbers-in-identifiers.patch |
|
|
@@ -0,0 +1,26 @@ |
|
|
+From 0e4ca382022f1be7d6e006743337d4ece48fa185 Mon Sep 17 00:00:00 2001 |
|
|
+From: Romain Francoise <rfrancoise@debian.org> |
|
|
+Date: Sun, 23 Mar 2008 00:54:00 +0100 |
|
|
+Subject: [PATCH] Make ident accept numbers in identifiers |
|
|
+ |
|
|
+Debian bug #157891. |
|
|
+--- |
|
|
+ src/ident.c | 2 +- |
|
|
+ 1 files changed, 1 insertions(+), 1 deletions(-) |
|
|
+ |
|
|
+diff --git a/src/ident.c b/src/ident.c |
|
|
+index 612544c..67954f3 100644 |
|
|
+--- a/src/ident.c |
|
|
++++ b/src/ident.c |
|
|
+@@ -234,7 +234,7 @@ match(fp) /* group substring between two KDELIM's; then do pattern match */ |
|
|
+ if (c == EOF && feof(fp) | ferror(fp)) |
|
|
+ return c; |
|
|
+ switch (ctab[c]) { |
|
|
+- case LETTER: case Letter: |
|
|
++ case LETTER: case Letter: case DIGIT: |
|
|
+ *tp++ = c; |
|
|
+ if (tp < line+sizeof(line)-4) |
|
|
+ break; |
|
|
+-- |
|
|
+1.6.3.2.306.g4f4fa |
|
|
+ |
|
|
--- rcs-5.7.orig/debian/patches/0001-Build-PostScript-documentation.patch |
|
|
+++ rcs-5.7/debian/patches/0001-Build-PostScript-documentation.patch |
|
|
@@ -0,0 +1,34 @@ |
|
|
+From aee3457a5dc38b9d157266099ea7bfe402a8bafd Mon Sep 17 00:00:00 2001 |
|
|
+From: Romain Francoise <rfrancoise@debian.org> |
|
|
+Date: Sun, 23 Mar 2008 00:44:22 +0100 |
|
|
+Subject: [PATCH] Build PostScript documentation |
|
|
+ |
|
|
+This is the "RCS-A System for Version Control" paper by Walter F. Tichy. |
|
|
+--- |
|
|
+ Makefile.in | 3 ++- |
|
|
+ 1 files changed, 2 insertions(+), 1 deletions(-) |
|
|
+ |
|
|
+diff --git a/Makefile.in b/Makefile.in |
|
|
+index 7518f35..7dfad89 100644 |
|
|
+--- a/Makefile.in |
|
|
++++ b/Makefile.in |
|
|
+@@ -43,6 +43,7 @@ maintainer-clean :: |
|
|
+ @echo "it deletes files that may require special tools to rebuild." |
|
|
+ |
|
|
+ $(standard_GNU_targets) installcheck installdebug :: |
|
|
++ groff -t -p -Tps -ms rcs.ms >rcs.ps |
|
|
+ cd man && $(MAKE) $@ |
|
|
+ cd src && $(MAKE) $@ |
|
|
+ |
|
|
+@@ -77,7 +78,7 @@ Makefile : Makefile.in config.status |
|
|
+ |
|
|
+ clean :: clean. |
|
|
+ clean. :: |
|
|
+- rm -f confdefs* conftest* core core.* *.core |
|
|
++ rm -f confdefs* conftest* core core.* *.core *.ps |
|
|
+ |
|
|
+ distclean maintainer-clean :: distclean. |
|
|
+ distclean. :: clean. |
|
|
+-- |
|
|
+1.6.3.2.306.g4f4fa |
|
|
+ |
|