Contents of /trunk/rcs/patches/rcs-5.7-debian-25.patch
Parent Directory | Revision Log
Revision 1010 -
(show annotations)
(download)
Sun Mar 7 18:59:19 2010 UTC (14 years, 6 months ago) by niro
File size: 36440 byte(s)
Sun Mar 7 18:59:19 2010 UTC (14 years, 6 months ago) by niro
File size: 36440 byte(s)
pulled newest version
1 | --- rcs-5.7.orig/debian/rules |
2 | +++ rcs-5.7/debian/rules |
3 | @@ -0,0 +1,80 @@ |
4 | +#!/usr/bin/make -f |
5 | + |
6 | +CFLAGS = -g |
7 | + |
8 | +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) |
9 | +CFLAGS += -O0 |
10 | +else |
11 | +CFLAGS += -O2 |
12 | +endif |
13 | + |
14 | +refresh-patches: |
15 | + @dh_testdir |
16 | + @echo 'refreshing debian/patches:' |
17 | + @rm -rf '$(CURDIR)'/debian/patches |
18 | + @mkdir -p '$(CURDIR)'/debian/patches |
19 | + @cd '$(CURDIR)'/debian/patches && \ |
20 | + git format-patch -N upstream..upstream+patches |
21 | + @echo . |
22 | + |
23 | +PATCH_OPTS := -p1 -E --no-backup-if-mismatch |
24 | + |
25 | +patch: patch-stamp |
26 | +patch-stamp: |
27 | + dh_testdir |
28 | + set -e; [ -f patch-stamp ] || \ |
29 | + for f in `ls -1 debian/patches/*.patch || :`; do \ |
30 | + patch $(PATCH_OPTS) <$$f >/dev/null; \ |
31 | + done |
32 | + touch $@ |
33 | + |
34 | +unpatch: |
35 | + dh_testdir |
36 | + set -e; [ ! -f patch-stamp ] || \ |
37 | + for f in `ls -1r debian/patches/*.patch || :`; do \ |
38 | + patch -R $(PATCH_OPTS) <$$f >/dev/null; \ |
39 | + done |
40 | + rm -f patch-stamp |
41 | + |
42 | +build-arch: build-arch-stamp |
43 | +build-arch-stamp: patch |
44 | + dh_testdir |
45 | + ./configure --prefix=/usr --with-diffutils |
46 | + $(MAKE) CFLAGS="$(CFLAGS)" |
47 | + touch $@ |
48 | + |
49 | +clean: unpatch really-clean |
50 | +really-clean: |
51 | + dh_testdir |
52 | + dh_testroot |
53 | + [ ! -f Makefile ] || $(MAKE) -i distclean |
54 | + dh_clean -XTAGS |
55 | + |
56 | +install-arch: build-arch |
57 | + dh_testdir |
58 | + dh_testroot |
59 | + dh_prep |
60 | + $(MAKE) prefix=$(CURDIR)/debian/rcs/usr install |
61 | + |
62 | +build-indep: |
63 | +install-indep: build-indep |
64 | +binary-indep: build-indep install-indep |
65 | + |
66 | +binary-arch: build-arch install-arch |
67 | + dh_testdir |
68 | + dh_testroot |
69 | + dh_installdocs |
70 | + dh_installchangelogs ChangeLog |
71 | + dh_link |
72 | + dh_strip |
73 | + dh_compress |
74 | + dh_fixperms |
75 | + dh_installdeb |
76 | + dh_shlibdeps |
77 | + dh_gencontrol |
78 | + dh_md5sums |
79 | + dh_builddeb |
80 | + |
81 | +binary: binary-indep binary-arch |
82 | + |
83 | +.PHONY: build build-arch clean binary-arch binary-indep binary install |
84 | --- rcs-5.7.orig/debian/rcs.docs |
85 | +++ rcs-5.7/debian/rcs.docs |
86 | @@ -0,0 +1 @@ |
87 | +rcs.ps |
88 | --- rcs-5.7.orig/debian/clean |
89 | +++ rcs-5.7/debian/clean |
90 | @@ -0,0 +1 @@ |
91 | +rcs.ps |
92 | --- rcs-5.7.orig/debian/control |
93 | +++ rcs-5.7/debian/control |
94 | @@ -0,0 +1,23 @@ |
95 | +Source: rcs |
96 | +Section: vcs |
97 | +Priority: optional |
98 | +Maintainer: Romain Francoise <rfrancoise@debian.org> |
99 | +Standards-Version: 3.8.1 |
100 | +Build-Depends: debhelper (>= 7), groff, autoconf |
101 | +Homepage: http://www.gnu.org/software/rcs/ |
102 | +Vcs-Browser: http://git.debian.org/?p=users/rfrancoise/rcs.git |
103 | +Vcs-Git: git://git.debian.org/git/users/rfrancoise/rcs.git |
104 | + |
105 | +Package: rcs |
106 | +Architecture: any |
107 | +Depends: ${shlibs:Depends} |
108 | +Description: The GNU Revision Control System |
109 | + The Revision Control System (RCS) manages multiple |
110 | + revisions of files. RCS automates the storing, retrieval, |
111 | + logging, identification, and merging of revisions. RCS is |
112 | + useful for text that is revised frequently, for example |
113 | + programs, documentation, graphics, papers, and form letters. |
114 | + . |
115 | + Note: this package contains certain general-purpose commands |
116 | + (such as merge or ident) which may used by other programs |
117 | + installed on your system. |
118 | --- rcs-5.7.orig/debian/compat |
119 | +++ rcs-5.7/debian/compat |
120 | @@ -0,0 +1 @@ |
121 | +7 |
122 | --- rcs-5.7.orig/debian/copyright |
123 | +++ rcs-5.7/debian/copyright |
124 | @@ -0,0 +1,28 @@ |
125 | +This is Debian GNU/Linux's prepackaged version of the FSF's Revision |
126 | +Control System (RCS) utilities. These utilities allow you to keep |
127 | +multiple revisions of one or more files in a very compact manner. RCS |
128 | +is similar to, and in most respects better than, the non-free Source |
129 | +Code Control System (SCCS). |
130 | + |
131 | +This package was assembled by Sven Rudolph <sr1@inf.tu-dresden.de> |
132 | +from the GNU sources available from prep.ai.mit.edu (and its numerous |
133 | +mirrors) as /pub/gnu/rcs-5.7.tar.gz. It is currently maintained by |
134 | +Romain Francoise <rfrancoise@debian.org>. |
135 | + |
136 | +The upstream URL is: http://www.gnu.org/software/rcs/ |
137 | + |
138 | +Copyright (C) 1991,1992,1993 Free Software Foundation, Inc. |
139 | + |
140 | +RCS is free software; you can redistribute it and/or modify |
141 | +it under the terms of the GNU General Public License as published by |
142 | +the Free Software Foundation; either version 2, or (at your option) |
143 | +any later version. |
144 | + |
145 | +RCS is distributed in the hope that it will be useful, |
146 | +but WITHOUT ANY WARRANTY; without even the implied warranty of |
147 | +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
148 | +GNU General Public License for more details. |
149 | + |
150 | +On Debian GNU/Linux systems, the complete text of the GNU General |
151 | +Public License can be found in `/usr/share/common-licenses/GPL'. |
152 | + |
153 | --- rcs-5.7.orig/debian/changelog |
154 | +++ rcs-5.7/debian/changelog |
155 | @@ -0,0 +1,278 @@ |
156 | +rcs (5.7-25) unstable; urgency=low |
157 | + |
158 | + * The "dogs that love the rain and chasing trains" release. |
159 | + |
160 | + * debian/control: |
161 | + + Set section to 'vcs' to follow override. |
162 | + + Set Standards-Version to 3.8.1. |
163 | + * debian/rules: |
164 | + + Use `dh_prep' instead of `dh_clean -k'. |
165 | + + Don't number exported patches. |
166 | + |
167 | + * Drop Debian change added in rcs 5.7-13 (Nov 1999) which modifies the |
168 | + first line of pic's output. As far as I can tell it's fine as-is, and |
169 | + the change results in an extraneous line at the top of the page |
170 | + (closes: #525291). |
171 | + |
172 | + -- Romain Francoise <rfrancoise@debian.org> Tue, 16 Jun 2009 20:20:11 +0200 |
173 | + |
174 | +rcs (5.7-24) unstable; urgency=low |
175 | + |
176 | + * The "Pour all of your souls like magma into the caverns" release. |
177 | + |
178 | + * debian/compat: Switch to debhelper compatibility level 7. |
179 | + * debian/rules: |
180 | + + Don't delete *-stamp manually. |
181 | + + Reverse clean/unpatch order. |
182 | + * debian/clean: New file, clean up rcs.ps. |
183 | + * debian/control: |
184 | + + Build-depend on debhelper (>= 7). |
185 | + + Set Standards-Version to 3.8.0, no changes needed. |
186 | + + Mention merge program in long description (closes: #498736). |
187 | + |
188 | + -- Romain Francoise <rfrancoise@debian.org> Sat, 13 Sep 2008 16:31:30 +0200 |
189 | + |
190 | +rcs (5.7-23) unstable; urgency=low |
191 | + |
192 | + * The "fourteen degrees below" release. |
193 | + |
194 | + * Repackage with debhelper and a patch system. |
195 | + * debian/control: Build-depend on debhelper (>= 6). |
196 | + * debian/rules: Rewrite using debhelper. |
197 | + * debian/{compat,rcs.docs}: New files. |
198 | + * debian/patches/: New directory, contains patches split off the previous |
199 | + monolithic Debian diff. |
200 | + |
201 | + * Include patch by Justin Pryzby <justinpryzby@users.sourceforge.net> |
202 | + fixing minor formatting errors in merge.1 (closes: #471243). |
203 | + |
204 | + -- Romain Francoise <rfrancoise@debian.org> Sun, 23 Mar 2008 12:48:22 +0100 |
205 | + |
206 | +rcs (5.7-22) unstable; urgency=low |
207 | + |
208 | + * debian/control: Set Standards-Version to 3.7.3, no changes needed. |
209 | + |
210 | + -- Romain Francoise <rfrancoise@debian.org> Sat, 26 Jan 2008 19:45:24 +0100 |
211 | + |
212 | +rcs (5.7-21) unstable; urgency=low |
213 | + |
214 | + * debian/control: Add Homepage, Vcs-Git and Vcs-Browser fields. |
215 | + |
216 | + -- Romain Francoise <rfrancoise@debian.org> Sat, 03 Nov 2007 13:04:07 +0100 |
217 | + |
218 | +rcs (5.7-20) unstable; urgency=low |
219 | + |
220 | + * debian/control: Add support for DEB_BUILD_OPTIONS (closes: #437885). |
221 | + |
222 | + -- Romain Francoise <rfrancoise@debian.org> Tue, 14 Aug 2007 21:24:54 +0200 |
223 | + |
224 | +rcs (5.7-19) unstable; urgency=low |
225 | + |
226 | + * debian/control: Bump Standards-Version to 3.7.2, no changes needed. |
227 | + * debian/copyright: Mention the current upstream URL (closes: #436739). |
228 | + * debian/rules: |
229 | + + Don't ignore errors from 'make distclean'. |
230 | + + Generate DEBIAN/md5sums. |
231 | + * Apply patch from Brendan O'Dea <bod@debian.org> adding support for |
232 | + diff's '-U' option to rcsdiff (closes: #428445). |
233 | + |
234 | + -- Romain Francoise <rfrancoise@debian.org> Sun, 12 Aug 2007 18:40:04 +0200 |
235 | + |
236 | +rcs (5.7-18) unstable; urgency=low |
237 | + |
238 | + * Apply patch from Mark D. Baushke <mdb@gnu.org> adding support for the |
239 | + new 'commitid' phrase used by newer version of CVS and CVSNT. Note |
240 | + that this patch does not include support for *generating* the ids at |
241 | + check in time; it only makes RCS recognize them (closes: #352527). |
242 | + |
243 | + -- Romain Francoise <rfrancoise@debian.org> Tue, 14 Feb 2006 22:41:33 +0100 |
244 | + |
245 | +rcs (5.7-17) unstable; urgency=low |
246 | + |
247 | + * Apply patch from Aaron S. Hawley making the diff strategy of rcsdiff a |
248 | + bit more subtle: previously rcsdiff considered any long option as a |
249 | + case where diff(1) can produce output when the revisions are |
250 | + identical, when in fact it is only the case if either the |
251 | + --side-by-side or --ifdef options are used (closes: #334004). |
252 | + |
253 | + * Patch man/co.1 to not use 'asteriskmath', thanks to LI Daobing |
254 | + (closes: #345507). |
255 | + |
256 | + * debian/control: Bump Standards-Version to 3.6.2.2, no changes needed. |
257 | + * debian/changelog: Change formatting of entries from 1995 and 1996 to |
258 | + avoid lintian warnings. |
259 | + * debian/rules: `install' no longer strips .comment sections from |
260 | + binaries (since version 5.93-1), so revert previous fix and strip these |
261 | + sections manually. |
262 | + |
263 | + -- Romain Francoise <rfrancoise@debian.org> Sun, 5 Feb 2006 16:34:21 +0100 |
264 | + |
265 | +rcs (5.7-16) unstable; urgency=low |
266 | + |
267 | + * Tenth anniversary release: RCS 5.7 was released on June 16th, 1995. |
268 | + |
269 | + * rcs.c: Check delta pointer in scanlogtext() before dereferencing it to |
270 | + prevent a segmentation fault in some rare cases (discovered while |
271 | + investigating #69193). |
272 | + |
273 | + * Ship docs in PostScript format (instead of DVI). Drop the ``Functions |
274 | + of RCS'' paper since it's quite obsolete nowadays. |
275 | + |
276 | + * debian/rules: Delete substvars file in clean target. |
277 | + * debian/changelog: Facelift previous entry. |
278 | + |
279 | + -- Romain Francoise <rfrancoise@debian.org> Thu, 16 Jun 2005 08:14:01 +0200 |
280 | + |
281 | +rcs (5.7-15) unstable; urgency=low |
282 | + |
283 | + * Adopting this package with Mark's blessing. |
284 | + * debian/control: |
285 | + + Bump Standard-Version to 3.6.1.0. |
286 | + + Update maintainer contact info. |
287 | + * debian/copyright: Ditto. |
288 | + * debian/rules: |
289 | + + Adjust CFLAGS to include -g and remove useless -I directive. |
290 | + + Remove LDFLAGS. |
291 | + |
292 | + * Patch upstream Makefile.in to use install -s (which has the nice |
293 | + effect of also deleting .comment sections from the binaries). |
294 | + |
295 | + * Patch man/rlog.1 to document option -q which does nothing, it's |
296 | + provided for consistency with other commands (closes: #69257). |
297 | + |
298 | + * Remove a few unneeded files from the Debian diff (.orig files, Emacs |
299 | + lock files). |
300 | + |
301 | + -- Romain Francoise <rfrancoise@debian.org> Wed, 11 May 2005 17:51:01 +0200 |
302 | + |
303 | +rcs (5.7-14) unstable; urgency=high |
304 | + |
305 | + * Fixes tmp file race (patch from OpenBSD) (Closes: #291542) |
306 | + |
307 | + -- Mark Baker <mark@mnb.org.uk> Fri, 21 Jan 2005 18:16:20 +0000 |
308 | + |
309 | +rcs (5.7-13.3) unstable; urgency=high |
310 | + |
311 | + * NMU |
312 | + * Add build-dep on autoconf. Closes: #246566. |
313 | + * Fix up quoting in src/Makefile.in to make $SHELL not complain, as \" |
314 | + is not interpolated inside single-quoted strings. |
315 | + * Make ident accept numbers as well as letters in identifiers. |
316 | + Closes: #157891 |
317 | + * Remove emacs variables from the changelog as they are no longer |
318 | + needed. |
319 | + * Add -isp to the dpkg-gencontrol call in debian/rules to get Section |
320 | + and Priority included. Closes: #190383. |
321 | + |
322 | + -- Tollef Fog Heen <tfheen@debian.org> Thu, 29 Jul 2004 19:09:32 +0200 |
323 | + |
324 | +rcs (5.7-13.2) unstable; urgency=low |
325 | + |
326 | + * NMU |
327 | + * can build now as root. Closes: #249106 |
328 | + * priority dumped down to optional. Closes: #64438 |
329 | + * fixed spelling error in debian/copyright, and location of the GPL. |
330 | + |
331 | + -- Andreas Barth <aba@not.so.argh.org> Wed, 26 May 2004 22:21:05 +0200 |
332 | + |
333 | +rcs (5.7-13.1) unstable; urgency=low |
334 | + |
335 | + * NMU. |
336 | + * Rebuild so that the .dsc file will have Build-Depends. |
337 | + Closes: #187853, #176344. |
338 | + * Remove /usr/doc symlink. |
339 | + |
340 | + -- Daniel Schepler <schepler@debian.org> Mon, 28 Jul 2003 16:28:32 -0700 |
341 | + |
342 | +rcs (5.7-13) unstable; urgency=low |
343 | + |
344 | + * debian/rules: install docs and manpages in /usr/share, as in FHS |
345 | + * debian/control: standards version 3.1.0 |
346 | + * debian/rules: format docs into dvi instead of leaving groff source. I |
347 | + chose dvi as it is easier to view on screen than PS (Closes: 42277) |
348 | + |
349 | + -- Mark Baker <mbaker@iee.org> Sun, 28 Nov 1999 18:31:21 +0000 |
350 | + |
351 | +rcs (5.7-12) unstable; urgency=low |
352 | + |
353 | + * man/Makefile: use sed filter to fix .lf requests on output of pic, |
354 | + so zsoelim doesn't complain about them (#26150) |
355 | + * debian/rules: clean target deletes rcsfile.5 so it is always rebuilt |
356 | + using fix above |
357 | + |
358 | + -- Mark Baker <mbaker@iee.org> Mon, 5 Jul 1999 23:24:17 +0100 |
359 | + |
360 | +rcs (5.7-11) unstable; urgency=low |
361 | + |
362 | + * Fixed temp file security hole in rcsfreeze script (#27845) |
363 | + |
364 | + -- Mark Baker <mbaker@iee.org> Wed, 14 Oct 1998 22:43:47 +0100 |
365 | + |
366 | +rcs (5.7-10) unstable; urgency=low |
367 | + |
368 | + * Included rcsfreeze script (#26743) |
369 | + |
370 | + -- Mark Baker <mbaker@iee.org> Wed, 16 Sep 1998 20:57:00 +0000 |
371 | + |
372 | +rcs (5.7-9) unstable; urgency=low |
373 | + |
374 | + * Fixed permissions |
375 | + |
376 | + -- Mark Baker <mbaker@iee.org> Mon, 16 Feb 1998 00:07:52 +0000 |
377 | + |
378 | +rcs (5.7-8) unstable; urgency=low |
379 | + |
380 | + * Updated standards-version to 2.4.0.0 (no changes) |
381 | + |
382 | + -- Mark Baker <mbaker@iee.org> Tue, 10 Feb 1998 10:54:36 +0000 |
383 | + |
384 | +rcs (5.7-7) unstable; urgency=low |
385 | + |
386 | + * Corrected maintainer field in debian/control |
387 | + * Flushed configure cache and recompiled, to fix bug #11305/#11308) |
388 | + |
389 | + -- Mark Baker <mbaker@iee.org> Thu, 17 Jul 1997 10:54:36 +0100 |
390 | + |
391 | +rcs (5.7-6) unstable; urgency=low |
392 | + |
393 | + * Renamed changelog.upstream to changelog, as per policy (fixes #9657) |
394 | + |
395 | + -- Mark Baker <mbaker@iee.org> Sat, 12 Jul 1997 16:55:37 +0100 |
396 | + |
397 | +rcs (5.7-5) unstable; urgency=low |
398 | + |
399 | + * New maintainer |
400 | + * Compiled with libc6 |
401 | + * Use canonical path for sendmail (configure.in changed) |
402 | + |
403 | + -- Mark Baker <mbaker@iee.org> Fri, 11 Jul 1997 21:24:48 +0100 |
404 | + |
405 | +rcs (5.7-4) unstable; urgency=low |
406 | + |
407 | + * Updated to Standards-Version 2.1.2.2. |
408 | + |
409 | + -- Sven Rudolph <sr1@inf.tu-dresden.de> Sun, 26 Jan 1997 22:34:57 +0100 |
410 | + |
411 | +rcs (5.7-3) unstable; urgency=low |
412 | + |
413 | + * debian.rules: added multi-architecture support |
414 | + |
415 | + * debian.control: added Priority: and Section: |
416 | + |
417 | + * debian.control: corrected extended description (Bug#3619) |
418 | + |
419 | + -- Sven Rudolph <sr1@inf.tu-dresden.de> Wed, 24 Jul 1996 23:48:20 +0100 |
420 | + |
421 | +rcs (5.7-2) unstable; urgency=low |
422 | + |
423 | + * rebuilt for elf |
424 | + |
425 | + -- Sven Rudolph <sr1@inf.tu-dresden.de> Thu, 23 Nov 1995 23:27:13 +0100 |
426 | + |
427 | +rcs (5.7-1) unstable; urgency=low |
428 | + |
429 | + * created new Debian GNU/Linux package maintenance system files |
430 | + * updated from rcs5.6.0.1 to rcs-5.7 |
431 | + * received this package from Robert Sanders <Robert.Sanders@linux.org> |
432 | + |
433 | + -- Sven Rudolph <sr1@inf.tu-dresden.de> Tue, 5 Sep 1995 04:38:07 +0100 |
434 | --- rcs-5.7.orig/debian/patches/0005-rcsdiff-option-parsing-updates.patch |
435 | +++ rcs-5.7/debian/patches/0005-rcsdiff-option-parsing-updates.patch |
436 | @@ -0,0 +1,32 @@ |
437 | +From c75a7855a54a5990c0094be57c0d3b7a4bc99e16 Mon Sep 17 00:00:00 2001 |
438 | +From: Romain Francoise <rfrancoise@debian.org> |
439 | +Date: Sun, 23 Mar 2008 00:52:42 +0100 |
440 | +Subject: [PATCH] rcsdiff option parsing updates |
441 | + |
442 | +--- |
443 | + src/rcsdiff.c | 8 ++++++-- |
444 | + 1 files changed, 6 insertions(+), 2 deletions(-) |
445 | + |
446 | +diff --git a/src/rcsdiff.c b/src/rcsdiff.c |
447 | +index 26b29c2..3ac97e4 100644 |
448 | +--- a/src/rcsdiff.c |
449 | ++++ b/src/rcsdiff.c |
450 | +@@ -212,9 +212,13 @@ mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 5.19 1995/06/16 06:19:24 eggert |
451 | + } |
452 | + goto option_handled; |
453 | + case '-': case 'D': |
454 | +- no_diff_means_no_output = false; |
455 | ++ if (c == 'D' |
456 | ++ || strcmp(*argv, "--side-by-side") == 0 |
457 | ++ || strcmp(*argv, "--ifdef") == 0) { |
458 | ++ no_diff_means_no_output = false; |
459 | ++ } |
460 | + /* fall into */ |
461 | +- case 'C': case 'F': case 'I': case 'L': case 'W': |
462 | ++ case 'C': case 'F': case 'I': case 'L': case 'U': case 'W': |
463 | + #if DIFF_L |
464 | + if (c == 'L' && ++file_labels == 2) |
465 | + faterror("too many -L options"); |
466 | +-- |
467 | +1.6.3.2.306.g4f4fa |
468 | + |
469 | --- rcs-5.7.orig/debian/patches/0003-Add-support-for-the-commitid-phrase.patch |
470 | +++ rcs-5.7/debian/patches/0003-Add-support-for-the-commitid-phrase.patch |
471 | @@ -0,0 +1,159 @@ |
472 | +From 13566af7a876e058a96f4ae3617541b3b1e5400d Mon Sep 17 00:00:00 2001 |
473 | +From: Romain Francoise <rfrancoise@debian.org> |
474 | +Date: Sun, 23 Mar 2008 00:50:39 +0100 |
475 | +Subject: [PATCH] Add support for the commitid phrase |
476 | + |
477 | +By Mark D. Baushke <mdb@gnu.org>. |
478 | + |
479 | +Note that this patch does not include support for generating the ids at |
480 | +check in time; it only makes RCS recognize them. |
481 | +--- |
482 | + man/rcsfile.5 | 13 +++++++++++++ |
483 | + man/rcsfile.5in | 13 +++++++++++++ |
484 | + src/rcsbase.h | 2 ++ |
485 | + src/rcsgen.c | 3 +++ |
486 | + src/rcssyn.c | 9 +++++++++ |
487 | + src/rlog.c | 4 ++++ |
488 | + 6 files changed, 44 insertions(+), 0 deletions(-) |
489 | + |
490 | +diff --git a/man/rcsfile.5 b/man/rcsfile.5 |
491 | +index bc47f7d..1f2de7c 100644 |
492 | +--- a/man/rcsfile.5 |
493 | ++++ b/man/rcsfile.5 |
494 | +@@ -69,6 +69,7 @@ nonterminal symbols are in |
495 | + \f3state\fP {\f2id\fP}\f3;\fP |
496 | + \f3branches\fP {\f2num\fP}*\f3;\fP |
497 | + \f3next\fP {\f2num\fP}\f3;\fP |
498 | ++ { \f3commitid\fP \f2id\fP\f3;\fP } |
499 | + { \f2newphrase\fP }* |
500 | + .LP |
501 | + \f2desc\fP ::= \f3desc\fP \f2string\fP |
502 | +@@ -128,6 +129,18 @@ and all the digits of years thereafter. |
503 | + Dates use the Gregorian calendar; times use UTC. |
504 | + .PP |
505 | + The |
506 | ++.I commitid |
507 | ++is followed by an |
508 | ++.I id |
509 | ++token. This token is intended to be unique across |
510 | ++multiple files and is used to help group files as |
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 |
515 | ++commitids in this file. |
516 | ++.PP |
517 | ++The |
518 | + .I newphrase |
519 | + productions in the grammar are reserved for future extensions |
520 | + to the format of \*r files. |
521 | +diff --git a/man/rcsfile.5in b/man/rcsfile.5in |
522 | +index 72930e1..d6118c7 100644 |
523 | +--- a/man/rcsfile.5in |
524 | ++++ b/man/rcsfile.5in |
525 | +@@ -68,6 +68,7 @@ nonterminal symbols are in |
526 | + \f3state\fP {\f2id\fP}\f3;\fP |
527 | + \f3branches\fP {\f2num\fP}*\f3;\fP |
528 | + \f3next\fP {\f2num\fP}\f3;\fP |
529 | ++ { \f3commitid\fP \f2id\fP\f3;\fP } |
530 | + { \f2newphrase\fP }* |
531 | + .LP |
532 | + \f2desc\fP ::= \f3desc\fP \f2string\fP |
533 | +@@ -127,6 +128,18 @@ and all the digits of years thereafter. |
534 | + Dates use the Gregorian calendar; times use UTC. |
535 | + .PP |
536 | + The |
537 | ++.I commitid |
538 | ++is followed by an |
539 | ++.I id |
540 | ++token. This token is intended to be unique across |
541 | ++multiple files and is used to help group files as |
542 | ++being a part of the same logical commit. |
543 | ++This token must uniquely identify the commit |
544 | ++operation that was applied to a set of RCS files. |
545 | ++In particular, it must be unique among all the |
546 | ++commitids in this file. |
547 | ++.PP |
548 | ++The |
549 | + .I newphrase |
550 | + productions in the grammar are reserved for future extensions |
551 | + to the format of \*r files. |
552 | +diff --git a/src/rcsbase.h b/src/rcsbase.h |
553 | +index 147f7d7..23ed4fe 100644 |
554 | +--- a/src/rcsbase.h |
555 | ++++ b/src/rcsbase.h |
556 | +@@ -358,6 +358,7 @@ struct hshentry { |
557 | + char const * lockedby; /* who locks the revision */ |
558 | + char const * state; /* state of revision (Exp by default) */ |
559 | + char const * name; /* name (if any) by which retrieved */ |
560 | ++ char const * commitid; /* text string to associate commits */ |
561 | + struct cbuf log; /* log message requested at checkin */ |
562 | + struct branchhead * branches; /* list of first revisions on branches*/ |
563 | + struct cbuf ig; /* ignored phrases in admin part */ |
564 | +@@ -662,6 +663,7 @@ extern int TotalDeltas; |
565 | + extern char const *const expand_names[]; |
566 | + extern char const |
567 | + Kaccess[], Kauthor[], Kbranch[], Kcomment[], |
568 | ++ Kcommitid[], |
569 | + Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[], |
570 | + Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[]; |
571 | + void unexpected_EOF P((void)) exiting; |
572 | +diff --git a/src/rcsgen.c b/src/rcsgen.c |
573 | +index a87257e..7eb14f1 100644 |
574 | +--- a/src/rcsgen.c |
575 | ++++ b/src/rcsgen.c |
576 | +@@ -547,6 +547,9 @@ putdelta(node, fout) |
577 | + |
578 | + aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:""); |
579 | + awrite(node->ig.string, node->ig.size, fout); |
580 | ++ |
581 | ++ if (node->commitid) |
582 | ++ aprintf(fout, "%s\t%s;\n", Kcommitid, node->commitid); |
583 | + } |
584 | + |
585 | + |
586 | +diff --git a/src/rcssyn.c b/src/rcssyn.c |
587 | +index f254bf7..d21d0d8 100644 |
588 | +--- a/src/rcssyn.c |
589 | ++++ b/src/rcssyn.c |
590 | +@@ -171,6 +171,7 @@ char const |
591 | + Kauthor[] = "author", |
592 | + Kbranch[] = "branch", |
593 | + Kcomment[] = "comment", |
594 | ++ Kcommitid[] = "commitid", |
595 | + Kdate[] = "date", |
596 | + Kdesc[] = "desc", |
597 | + Kexpand[] = "expand", |
598 | +@@ -433,6 +434,14 @@ getdelta() |
599 | + Delta->lockedby = 0; |
600 | + Delta->log.string = 0; |
601 | + Delta->selector = true; |
602 | ++ |
603 | ++ if (getkeyopt(Kcommitid)) { |
604 | ++ Delta->commitid = NextString; |
605 | ++ nextlex(); |
606 | ++ getsemi(Kcommitid); |
607 | ++ } else |
608 | ++ Delta->commitid = NULL; |
609 | ++ |
610 | + Delta->ig = getphrases(Kdesc); |
611 | + TotalDeltas++; |
612 | + return (true); |
613 | +diff --git a/src/rlog.c b/src/rlog.c |
614 | +index 7fb9b4d..4ee79e7 100644 |
615 | +--- a/src/rlog.c |
616 | ++++ b/src/rlog.c |
617 | +@@ -591,6 +591,10 @@ putadelta(node,editscript,trunk) |
618 | + aprintf(out, insDelFormat, |
619 | + editscript->insertlns, editscript->deletelns); |
620 | + |
621 | ++ if ( node->commitid ) |
622 | ++ aprintf(out, "%s commitid: %s", (editscript) ? ";" : "", |
623 | ++ node->commitid); |
624 | ++ |
625 | + newbranch = node->branches; |
626 | + if ( newbranch ) { |
627 | + bufautobegin(&branchnum); |
628 | +-- |
629 | +1.6.3.2.306.g4f4fa |
630 | + |
631 | --- rcs-5.7.orig/debian/patches/0008-Various-build-tweaks.patch |
632 | +++ rcs-5.7/debian/patches/0008-Various-build-tweaks.patch |
633 | @@ -0,0 +1,114 @@ |
634 | +From 2a814cf24019073a05f64c306a39b3202efe40ab Mon Sep 17 00:00:00 2001 |
635 | +From: Romain Francoise <rfrancoise@debian.org> |
636 | +Date: Sun, 23 Mar 2008 00:57:09 +0100 |
637 | +Subject: [PATCH] Various build tweaks |
638 | + |
639 | +Including: |
640 | +- allow building as root |
641 | +- install rcsfreeze and its man page |
642 | +- pass CFLAGS properly |
643 | +- install man pages in /usr/share/man |
644 | +- tweak default PATH when looking for sendmail |
645 | +--- |
646 | + configure.in | 2 +- |
647 | + man/Makefile.in | 7 ++++--- |
648 | + src/Makefile.in | 6 ++++-- |
649 | + src/conf.sh | 11 ----------- |
650 | + 4 files changed, 9 insertions(+), 17 deletions(-) |
651 | + |
652 | +diff --git a/configure.in b/configure.in |
653 | +index b6dd5d2..3c6aed3 100644 |
654 | +--- a/configure.in |
655 | ++++ b/configure.in |
656 | +@@ -243,7 +243,7 @@ rm -f conftest* |
657 | + AC_PATH_PROG(ED, ed, ed) |
658 | + |
659 | + ac_save_path=$PATH |
660 | +-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH |
661 | ++PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH |
662 | + AC_PATH_PROGS(SENDMAIL, sendmail mail mailx) |
663 | + PATH=$ac_save_path |
664 | + case $SENDMAIL in |
665 | +diff --git a/man/Makefile.in b/man/Makefile.in |
666 | +index 8ff25df..ffc8c7c 100644 |
667 | +--- a/man/Makefile.in |
668 | ++++ b/man/Makefile.in |
669 | +@@ -34,8 +34,8 @@ INSTALL_DATA = @INSTALL_DATA@ |
670 | + PIC = @PIC@ |
671 | + |
672 | + prefix = @prefix@ |
673 | +-man1dir = $(prefix)/man/man1 |
674 | +-man5dir = $(prefix)/man/man5 |
675 | ++man1dir = $(prefix)/share/man/man1 |
676 | ++man5dir = $(prefix)/share/man/man5 |
677 | + man1ext = .1 |
678 | + man5ext = .5 |
679 | + |
680 | +@@ -51,7 +51,8 @@ check dvi info TAGS :: |
681 | + installdirs :: ../mkinstalldirs |
682 | + -$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir) |
683 | + |
684 | +-man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog |
685 | ++man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \ |
686 | ++ rcsfreeze |
687 | + |
688 | + install :: installdirs |
689 | + -for m in $(man1pages); do \ |
690 | +diff --git a/src/Makefile.in b/src/Makefile.in |
691 | +index c27af21..5bc2147 100644 |
692 | +--- a/src/Makefile.in |
693 | ++++ b/src/Makefile.in |
694 | +@@ -116,16 +116,18 @@ install :: all installdirs |
695 | + for p in $(PROGRAMS); do \ |
696 | + $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \ |
697 | + done |
698 | ++ $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze |
699 | + |
700 | + uninstall :: |
701 | + for p in $(PROGRAMS); do \ |
702 | + $(REMOVE) $(bindir)/$$p; \ |
703 | + done |
704 | ++ $(REMOVE) $(bindir)/rcsfreeze |
705 | + |
706 | + # Install RCS and (if applicable) GNU diff before running these tests. |
707 | + # To test RCS before installing it, see the file INSTALL.RCS. |
708 | + RCSTEST = \ |
709 | +- ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \ |
710 | ++ ALL_CFLAGS="$(ALL_CFLAGS)" CC='$(CC)' DIFF='$(DIFF)' \ |
711 | + LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \ |
712 | + PATH=$(bindir):$$PATH \ |
713 | + sh $(srcdir)/rcstest |
714 | +@@ -153,7 +155,7 @@ maintainer-clean :: distclean |
715 | + #(Unix |
716 | + conf.h : conf.sh Makefile |
717 | + $(REMOVE) a.* |
718 | +- ALL_CFLAGS='$(ALL_CFLAGS)' \ |
719 | ++ ALL_CFLAGS="$(ALL_CFLAGS)" \ |
720 | + CC='$(CC)' \ |
721 | + COMPAT2='$(COMPAT2)' \ |
722 | + DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \ |
723 | +diff --git a/src/conf.sh b/src/conf.sh |
724 | +index c9bf0b3..b28a504 100644 |
725 | +--- a/src/conf.sh |
726 | ++++ b/src/conf.sh |
727 | +@@ -73,17 +73,6 @@ case `echo -n` in |
728 | + ech='echo -n' dots='... ' |
729 | + esac |
730 | + |
731 | +-$ech >&3 "$0: testing permissions $dots" |
732 | +-rm -f a.d && |
733 | +-date >a.d && |
734 | +-chmod 0 a.d && |
735 | +-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { |
736 | +- echo >&3 "$n$0: This command should not be run with superuser permissions." |
737 | +- exit 1 |
738 | +-} |
739 | +-echo >&3 OK |
740 | +-rm -f a.d || exit |
741 | +- |
742 | + $ech >&3 "$0: testing compiler for plausibility $dots" |
743 | + echo 'main() { return 0; }' >a.c |
744 | + rm -f a.exe a.out || exit |
745 | +-- |
746 | +1.6.3.2.306.g4f4fa |
747 | + |
748 | --- rcs-5.7.orig/debian/patches/0004-Security-fixes.patch |
749 | +++ rcs-5.7/debian/patches/0004-Security-fixes.patch |
750 | @@ -0,0 +1,85 @@ |
751 | +From 8b4a5ad3c28026799548219fcc25bb1d0063ade8 Mon Sep 17 00:00:00 2001 |
752 | +From: Romain Francoise <rfrancoise@debian.org> |
753 | +Date: Sun, 23 Mar 2008 00:52:03 +0100 |
754 | +Subject: [PATCH] Security fixes |
755 | + |
756 | +From various contributors, see debian/changelog for detailed list. |
757 | +--- |
758 | + src/rcsedit.c | 7 ++++++- |
759 | + src/rcsfnms.c | 7 ++++++- |
760 | + src/rcsfreeze.sh | 3 +-- |
761 | + 3 files changed, 13 insertions(+), 4 deletions(-) |
762 | + |
763 | +diff --git a/src/rcsedit.c b/src/rcsedit.c |
764 | +index 6000a68..b99249a 100644 |
765 | +--- a/src/rcsedit.c |
766 | ++++ b/src/rcsedit.c |
767 | +@@ -1503,6 +1503,9 @@ makedirtemp(isworkfile) |
768 | + register size_t dl; |
769 | + register struct buf *bn; |
770 | + register char const *name = isworkfile ? workname : RCSname; |
771 | ++# if has_mktemp |
772 | ++ int fd; |
773 | ++# endif |
774 | + |
775 | + dl = basefilename(name) - name; |
776 | + bn = &dirtpname[newRCSdirtp_index + isworkfile]; |
777 | +@@ -1521,10 +1524,12 @@ makedirtemp(isworkfile) |
778 | + catchints(); |
779 | + # if has_mktemp |
780 | + VOID strcpy(tp, "XXXXXX"); |
781 | +- if (!mktemp(np) || !*np) |
782 | ++ fd = mkstemp(np); |
783 | ++ if (fd < 0 || !*np) |
784 | + faterror("can't make temporary pathname `%.*s_%cXXXXXX'", |
785 | + (int)dl, name, '0'+isworkfile |
786 | + ); |
787 | ++ close(fd); |
788 | + # else |
789 | + /* |
790 | + * Posix 1003.1-1990 has no reliable way |
791 | +diff --git a/src/rcsfnms.c b/src/rcsfnms.c |
792 | +index e3b4f71..5edb6b4 100644 |
793 | +--- a/src/rcsfnms.c |
794 | ++++ b/src/rcsfnms.c |
795 | +@@ -285,6 +285,9 @@ maketemp(n) |
796 | + { |
797 | + char *p; |
798 | + char const *t = tpnames[n]; |
799 | ++# if has_mktemp |
800 | ++ int fd; |
801 | ++# endif |
802 | + |
803 | + if (t) |
804 | + return t; |
805 | +@@ -296,10 +299,12 @@ maketemp(n) |
806 | + size_t tplen = dir_useful_len(tp); |
807 | + p = testalloc(tplen + 10); |
808 | + VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n); |
809 | +- if (!mktemp(p) || !*p) |
810 | ++ fd = mkstemp(p); |
811 | ++ if (fd < 0 || !*p) |
812 | + faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'", |
813 | + (int)tplen, tp, SLASH, '0'+n |
814 | + ); |
815 | ++ close(fd); |
816 | + # else |
817 | + static char tpnamebuf[TEMPNAMES][L_tmpnam]; |
818 | + p = tpnamebuf[n]; |
819 | +diff --git a/src/rcsfreeze.sh b/src/rcsfreeze.sh |
820 | +index 96954f0..ea58c00 100644 |
821 | +--- a/src/rcsfreeze.sh |
822 | ++++ b/src/rcsfreeze.sh |
823 | +@@ -59,8 +59,7 @@ rcsfreeze: give log message, summarizing changes (end with EOF or single '.')" \ |
824 | + |
825 | + # Stamp the logfile. Because we order the logfile the most recent |
826 | + # first we will have to save everything right now in a temporary file. |
827 | +-TMPLOG=/tmp/rcsfrz$$ |
828 | +-trap 'rm -f $TMPLOG; exit 1' 1 2 13 15 |
829 | ++TMPLOG=$(tempfile) |
830 | + # Now ask for a log message, continously add to the log file |
831 | + ( |
832 | + echo "Version: $SYMREVNAME($SYMREV), Date: $DATE |
833 | +-- |
834 | +1.6.3.2.306.g4f4fa |
835 | + |
836 | --- rcs-5.7.orig/debian/patches/0007-Fix-crasher-bug-in-scanlogtext.patch |
837 | +++ rcs-5.7/debian/patches/0007-Fix-crasher-bug-in-scanlogtext.patch |
838 | @@ -0,0 +1,30 @@ |
839 | +From d741c63ce2c9730850825192b675cd6cdb767029 Mon Sep 17 00:00:00 2001 |
840 | +From: Romain Francoise <rfrancoise@debian.org> |
841 | +Date: Sun, 23 Mar 2008 00:54:51 +0100 |
842 | +Subject: [PATCH] Fix crasher bug in scanlogtext() |
843 | + |
844 | +--- |
845 | + src/rcs.c | 5 +++-- |
846 | + 1 files changed, 3 insertions(+), 2 deletions(-) |
847 | + |
848 | +diff --git a/src/rcs.c b/src/rcs.c |
849 | +index 526667d..2b99ad1 100644 |
850 | +--- a/src/rcs.c |
851 | ++++ b/src/rcs.c |
852 | +@@ -916,10 +916,11 @@ scanlogtext(delta,edit) |
853 | + getkeystring(Klog); |
854 | + if (nextdelta == cuttail) { |
855 | + cb = savestring(&curlogbuf); |
856 | +- if (!delta->log.string) |
857 | ++ if (delta && !delta->log.string) |
858 | + delta->log = cleanlogmsg(curlogbuf.string, cb.size); |
859 | + nextlex(); |
860 | +- delta->igtext = getphrases(Ktext); |
861 | ++ if (delta) |
862 | ++ delta->igtext = getphrases(Ktext); |
863 | + } else { |
864 | + if (nextdelta->log.string && nextdelta->selector) { |
865 | + foutptr = 0; |
866 | +-- |
867 | +1.6.3.2.306.g4f4fa |
868 | + |
869 | --- rcs-5.7.orig/debian/patches/0002-Various-man-page-fixes.patch |
870 | +++ rcs-5.7/debian/patches/0002-Various-man-page-fixes.patch |
871 | @@ -0,0 +1,220 @@ |
872 | +From 04ae787718fa7e034f49eb3b7fabb2677129df10 Mon Sep 17 00:00:00 2001 |
873 | +From: Romain Francoise <rfrancoise@debian.org> |
874 | +Date: Sun, 23 Mar 2008 00:47:13 +0100 |
875 | +Subject: [PATCH] Various man page fixes |
876 | + |
877 | +From various contributors, see debian/changelog for detailed list. |
878 | +--- |
879 | + man/co.1 | 12 ++++++------ |
880 | + man/merge.1 | 8 ++++++-- |
881 | + man/rcsfile.5 | 28 ++++++++++++++-------------- |
882 | + man/rlog.1 | 4 ++++ |
883 | + 4 files changed, 30 insertions(+), 22 deletions(-) |
884 | + |
885 | +diff --git a/man/co.1 b/man/co.1 |
886 | +index 8d0a6e7..5951123 100644 |
887 | +--- a/man/co.1 |
888 | ++++ b/man/co.1 |
889 | +@@ -597,7 +597,7 @@ line is |
890 | + .RB \*(lq "//\ " \*(rq. |
891 | + This is useful for languages with comments that go to the end of the line. |
892 | + The convention for other languages is to use a |
893 | +-.RB \*(lq " \(** " \(rq |
894 | ++.RB \*(lq " * " \(rq |
895 | + prefix inside a multiline comment. |
896 | + For example, the initial log comment of a C program |
897 | + conventionally is of the following form: |
898 | +@@ -606,19 +606,19 @@ conventionally is of the following form: |
899 | + .nf |
900 | + .ft 3 |
901 | + .ne 3 |
902 | +-/\(** |
903 | ++/* |
904 | + .in +\w'/'u |
905 | +-\(** $\&Log$ |
906 | +-\(**/ |
907 | ++* $\&Log$ |
908 | ++*/ |
909 | + .in |
910 | + .ft |
911 | + .fi |
912 | + .RE |
913 | + .LP |
914 | + For backwards compatibility with older versions of \*r, if the log prefix is |
915 | +-.B /\(** |
916 | ++.B /* |
917 | + or |
918 | +-.B (\(** |
919 | ++.B (* |
920 | + surrounded by optional white space, inserted log lines contain a space |
921 | + instead of |
922 | + .B / |
923 | +diff --git a/man/merge.1 b/man/merge.1 |
924 | +index e4860d2..c6f6f9f 100644 |
925 | +--- a/man/merge.1 |
926 | ++++ b/man/merge.1 |
927 | +@@ -114,8 +114,9 @@ Send results to standard output instead of overwriting |
928 | + .TP |
929 | + .BI \-q |
930 | + Quiet; do not warn about conflicts. |
931 | ++.TP |
932 | + .BI \-V |
933 | +-Print \*r's version number. |
934 | ++Print version number. |
935 | + .SH DIAGNOSTICS |
936 | + Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble. |
937 | + .SH IDENTIFICATION |
938 | +@@ -127,7 +128,10 @@ Copyright \(co 1982, 1988, 1989 Walter F. Tichy. |
939 | + .br |
940 | + Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert. |
941 | + .SH SEE ALSO |
942 | +-diff3(1), diff(1), rcsmerge(1), co(1). |
943 | ++.BR diff3 (1), |
944 | ++.BR diff (1), |
945 | ++.BR rcsmerge (1), |
946 | ++.BR co(1) . |
947 | + .SH BUGS |
948 | + It normally does not make sense to merge binary files as if they were text, but |
949 | + .B merge |
950 | +diff --git a/man/rcsfile.5 b/man/rcsfile.5 |
951 | +index 5a1929f..bc47f7d 100644 |
952 | +--- a/man/rcsfile.5 |
953 | ++++ b/man/rcsfile.5 |
954 | +@@ -230,7 +230,7 @@ The following diagram shows an example of an \*r file's organization. |
955 | + .fi |
956 | + .\} |
957 | + .if \np \{\ |
958 | +-.lf 232 |
959 | ++.lf 245 |
960 | + .PS 4.250i 3.812i |
961 | + .\" -2.0625 -4.25 1.75 0 |
962 | + .\" 0.000i 4.250i 3.812i 0.000i |
963 | +@@ -239,7 +239,7 @@ The following diagram shows an example of an \*r file's organization. |
964 | + .nr 0x 1 |
965 | + \h'3.812i' |
966 | + .sp -1 |
967 | +-.lf 242 |
968 | ++.lf 255 |
969 | + \h'2.062i-(\w'Head'u/2u)'\v'0.125i-(0v/2u)+0v+0.22m'Head |
970 | + .sp -1 |
971 | + \h'2.062i'\v'0.250i'\D'l0.000i 0.500i' |
972 | +@@ -256,7 +256,7 @@ The following diagram shows an example of an \*r file's organization. |
973 | + .sp -1 |
974 | + \h'1.688i'\v'0.750i'\D'l0.000i 0.500i' |
975 | + .sp -1 |
976 | +-.lf 244 |
977 | ++.lf 257 |
978 | + \h'2.062i-(\w'2.1'u/2u)'\v'1.000i-(0v/2u)+0v+0.22m'2.1 |
979 | + .sp -1 |
980 | + \h'2.062i'\v'1.250i'\D'l0.000i 0.500i' |
981 | +@@ -265,7 +265,7 @@ The following diagram shows an example of an \*r file's organization. |
982 | + .sp -1 |
983 | + \h'2.062i'\v'1.750i'\D'l-0.025i -0.100i' |
984 | + .sp -1 |
985 | +-.lf 246 |
986 | ++.lf 259 |
987 | + \h'2.062i-(\w'1.3'u/2u)'\v'2.000i-(1v/2u)+0v+0.22m'1.3 |
988 | + .sp -1 |
989 | + \h'2.062i'\v'2.250i'\D'l-0.375i -0.500i' |
990 | +@@ -280,7 +280,7 @@ The following diagram shows an example of an \*r file's organization. |
991 | + .sp -1 |
992 | + \h'1.375i'\v'1.500i'\D'l0.025i 0.100i' |
993 | + .sp -1 |
994 | +-.lf 249 |
995 | ++.lf 262 |
996 | + \h'1.375i-(\w'1.3.1.1'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.3.1.1 |
997 | + .sp -1 |
998 | + \h'1.375i'\v'1.000i'\D'l-0.375i 0.500i' |
999 | +@@ -295,7 +295,7 @@ The following diagram shows an example of an \*r file's organization. |
1000 | + .sp -1 |
1001 | + \h'2.062i'\v'2.750i'\D'l-0.025i -0.100i' |
1002 | + .sp -1 |
1003 | +-.lf 252 |
1004 | ++.lf 265 |
1005 | + \h'2.062i-(\w'1.2'u/2u)'\v'3.000i-(1v/2u)+0v+0.22m'1.2 |
1006 | + .sp -1 |
1007 | + \h'2.062i'\v'3.250i'\D'l-0.375i -0.500i' |
1008 | +@@ -310,7 +310,7 @@ The following diagram shows an example of an \*r file's organization. |
1009 | + .sp -1 |
1010 | + \h'0.375i'\v'2.500i'\D'l0.025i 0.100i' |
1011 | + .sp -1 |
1012 | +-.lf 255 |
1013 | ++.lf 268 |
1014 | + \h'0.375i-(\w'1.2.1.1'u/2u)'\v'2.250i-(1v/2u)+1v+0.22m'1.2.1.1 |
1015 | + .sp -1 |
1016 | + \h'0.375i'\v'2.000i'\D'l-0.375i 0.500i' |
1017 | +@@ -325,7 +325,7 @@ The following diagram shows an example of an \*r file's organization. |
1018 | + .sp -1 |
1019 | + \h'0.375i'\v'1.500i'\D'l0.025i 0.100i' |
1020 | + .sp -1 |
1021 | +-.lf 257 |
1022 | ++.lf 270 |
1023 | + \h'0.375i-(\w'1.2.1.3'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.2.1.3 |
1024 | + .sp -1 |
1025 | + \h'0.375i'\v'1.000i'\D'l-0.375i 0.500i' |
1026 | +@@ -340,7 +340,7 @@ The following diagram shows an example of an \*r file's organization. |
1027 | + .sp -1 |
1028 | + \h'2.750i'\v'2.500i'\D'l0.025i 0.100i' |
1029 | + .sp -1 |
1030 | +-.lf 261 |
1031 | ++.lf 274 |
1032 | + \h'2.750i-(\w'1.2.2.1'u/2u)'\v'2.250i-(1v/2u)+1v+0.22m'1.2.2.1 |
1033 | + .sp -1 |
1034 | + \h'2.750i'\v'2.000i'\D'l-0.375i 0.500i' |
1035 | +@@ -355,7 +355,7 @@ The following diagram shows an example of an \*r file's organization. |
1036 | + .sp -1 |
1037 | + \h'3.438i'\v'1.250i'\D'l0.025i 0.100i' |
1038 | + .sp -1 |
1039 | +-.lf 264 |
1040 | ++.lf 277 |
1041 | + \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 |
1042 | + .sp -1 |
1043 | + \h'3.438i'\v'0.750i'\D'l-0.375i 0.500i' |
1044 | +@@ -370,7 +370,7 @@ The following diagram shows an example of an \*r file's organization. |
1045 | + .sp -1 |
1046 | + \h'2.750i'\v'1.500i'\D'l0.025i 0.100i' |
1047 | + .sp -1 |
1048 | +-.lf 267 |
1049 | ++.lf 280 |
1050 | + \h'2.750i-(\w'1.2.2.2'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.2.2.2 |
1051 | + .sp -1 |
1052 | + \h'2.750i'\v'1.000i'\D'l-0.375i 0.500i' |
1053 | +@@ -385,7 +385,7 @@ The following diagram shows an example of an \*r file's organization. |
1054 | + .sp -1 |
1055 | + \h'2.062i'\v'3.750i'\D'l-0.025i -0.100i' |
1056 | + .sp -1 |
1057 | +-.lf 270 |
1058 | ++.lf 283 |
1059 | + \h'2.062i-(\w'1.1'u/2u)'\v'4.000i-(1v/2u)+0v+0.22m'1.1 |
1060 | + .sp -1 |
1061 | + \h'2.062i'\v'4.250i'\D'l-0.375i -0.500i' |
1062 | +@@ -398,9 +398,9 @@ The following diagram shows an example of an \*r file's organization. |
1063 | + .if \n(00 .fi |
1064 | + .br |
1065 | + .nr 0x 0 |
1066 | +-.lf 271 |
1067 | ++.lf 284 |
1068 | + .PE |
1069 | +-.lf 272 |
1070 | ++.lf 285 |
1071 | + .\} |
1072 | + .PP |
1073 | + .SH IDENTIFICATION |
1074 | +diff --git a/man/rlog.1 b/man/rlog.1 |
1075 | +index cc4b45c..68a75a6 100644 |
1076 | +--- a/man/rlog.1 |
1077 | ++++ b/man/rlog.1 |
1078 | +@@ -187,6 +187,10 @@ If |
1079 | + .I logins |
1080 | + is omitted, the user's login is assumed. |
1081 | + .TP |
1082 | ++.B \-q |
1083 | ++This option has no effect; |
1084 | ++it is provided for consistency with other commands. |
1085 | ++.TP |
1086 | + .B \-T |
1087 | + This option has no effect; |
1088 | + it is present for compatibility with other \*r commands. |
1089 | +-- |
1090 | +1.6.3.2.306.g4f4fa |
1091 | + |
1092 | --- rcs-5.7.orig/debian/patches/0006-Make-ident-accept-numbers-in-identifiers.patch |
1093 | +++ rcs-5.7/debian/patches/0006-Make-ident-accept-numbers-in-identifiers.patch |
1094 | @@ -0,0 +1,26 @@ |
1095 | +From 0e4ca382022f1be7d6e006743337d4ece48fa185 Mon Sep 17 00:00:00 2001 |
1096 | +From: Romain Francoise <rfrancoise@debian.org> |
1097 | +Date: Sun, 23 Mar 2008 00:54:00 +0100 |
1098 | +Subject: [PATCH] Make ident accept numbers in identifiers |
1099 | + |
1100 | +Debian bug #157891. |
1101 | +--- |
1102 | + src/ident.c | 2 +- |
1103 | + 1 files changed, 1 insertions(+), 1 deletions(-) |
1104 | + |
1105 | +diff --git a/src/ident.c b/src/ident.c |
1106 | +index 612544c..67954f3 100644 |
1107 | +--- a/src/ident.c |
1108 | ++++ b/src/ident.c |
1109 | +@@ -234,7 +234,7 @@ match(fp) /* group substring between two KDELIM's; then do pattern match */ |
1110 | + if (c == EOF && feof(fp) | ferror(fp)) |
1111 | + return c; |
1112 | + switch (ctab[c]) { |
1113 | +- case LETTER: case Letter: |
1114 | ++ case LETTER: case Letter: case DIGIT: |
1115 | + *tp++ = c; |
1116 | + if (tp < line+sizeof(line)-4) |
1117 | + break; |
1118 | +-- |
1119 | +1.6.3.2.306.g4f4fa |
1120 | + |
1121 | --- rcs-5.7.orig/debian/patches/0001-Build-PostScript-documentation.patch |
1122 | +++ rcs-5.7/debian/patches/0001-Build-PostScript-documentation.patch |
1123 | @@ -0,0 +1,34 @@ |
1124 | +From aee3457a5dc38b9d157266099ea7bfe402a8bafd Mon Sep 17 00:00:00 2001 |
1125 | +From: Romain Francoise <rfrancoise@debian.org> |
1126 | +Date: Sun, 23 Mar 2008 00:44:22 +0100 |
1127 | +Subject: [PATCH] Build PostScript documentation |
1128 | + |
1129 | +This is the "RCS-A System for Version Control" paper by Walter F. Tichy. |
1130 | +--- |
1131 | + Makefile.in | 3 ++- |
1132 | + 1 files changed, 2 insertions(+), 1 deletions(-) |
1133 | + |
1134 | +diff --git a/Makefile.in b/Makefile.in |
1135 | +index 7518f35..7dfad89 100644 |
1136 | +--- a/Makefile.in |
1137 | ++++ b/Makefile.in |
1138 | +@@ -43,6 +43,7 @@ maintainer-clean :: |
1139 | + @echo "it deletes files that may require special tools to rebuild." |
1140 | + |
1141 | + $(standard_GNU_targets) installcheck installdebug :: |
1142 | ++ groff -t -p -Tps -ms rcs.ms >rcs.ps |
1143 | + cd man && $(MAKE) $@ |
1144 | + cd src && $(MAKE) $@ |
1145 | + |
1146 | +@@ -77,7 +78,7 @@ Makefile : Makefile.in config.status |
1147 | + |
1148 | + clean :: clean. |
1149 | + clean. :: |
1150 | +- rm -f confdefs* conftest* core core.* *.core |
1151 | ++ rm -f confdefs* conftest* core core.* *.core *.ps |
1152 | + |
1153 | + distclean maintainer-clean :: distclean. |
1154 | + distclean. :: clean. |
1155 | +-- |
1156 | +1.6.3.2.306.g4f4fa |
1157 | + |