[Pkg-cvs-commits] r19 - in /trunk: changelog patches/12_rcs2log_POSIX_sort

[zakame-guest at users.alioth.debian.org]

Author: zakame-guest
Date: Fri May 26 07:36:17 2006
New Revision: 19

URL: http://svn.debian.org/wsvn/?sc=1&rev=19
Log:
Make rcs2log use POSIX 1003.1-2001 sort (fixes #368909)

Added:
    trunk/patches/12_rcs2log_POSIX_sort
Modified:
    trunk/changelog

Modified: trunk/changelog
URL: http://svn.debian.org/wsvn/trunk/changelog?rev=19&op=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Fri May 26 07:36:17 2006
@@ -3,9 +3,11 @@ cvs (1:1.12.13-3) unstable; urgency=low
   [ Zak B. Elep ]
   * debian/patches:
     + Add 95_flag_conflicted_copies to avoid broken commits if
-      people don't notice it in time. (Closes: #368681).
+      people don't notice it in time. (Closes: #368681)
+    + Add 12_rcs2log_POSIX_sort to let rcs2log use unambigous sort
+      flags. (Closes: #368909)
 
- -- Zak B. Elep <zakame at spunge.org>  Fri, 26 May 2006 00:26:57 +0800
+ -- Zak B. Elep <zakame at spunge.org>  Fri, 26 May 2006 15:22:46 +0800
 
 cvs (1:1.12.13-2) unstable; urgency=low
 

Added: trunk/patches/12_rcs2log_POSIX_sort
URL: http://svn.debian.org/wsvn/trunk/patches/12_rcs2log_POSIX_sort?rev=19&op=file
==============================================================================
--- trunk/patches/12_rcs2log_POSIX_sort (added)
+++ trunk/patches/12_rcs2log_POSIX_sort Fri May 26 07:36:17 2006
@@ -0,0 +1,15 @@
+# Make rcs2log use POSIX 1003.1-2001 compliant `sort'. Closes: #368909
+# Patch taken from http://cvs.pld.org.pl/SOURCES/cvs-POSIX.patch?rev=1.1 ,
+# Thanks to the PLD Team.
+diff -Nru ../build-tree.old/cvs-1.12.13/contrib/rcs2log.sh ./cvs-1.12.13/contrib/rcs2log.sh
+--- ../build-tree.old/cvs-1.12.13/contrib/rcs2log.sh	2006-05-26 15:16:54.000000000 +0800
++++ ./cvs-1.12.13/contrib/rcs2log.sh	2006-05-26 15:16:35.000000000 +0800
+@@ -649,7 +649,7 @@
+ # Sort the log entries, first by date+time (in reverse order),
+ # then by author, then by log entry, and finally by file name and revision
+ # (just in case).
+-sort -t"$SOH" +2 -4r +4 +0 |
++sort -t"$SOH" -k 3,4r -k 5 -k 1 |
+ 
+ # Finally, reformat the sorted log entries.
+ $AWK -F"$SOH" '