[Pkg-sks-commit] r104 - sks/trunk/sks/debian/patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 14:59:04 +0000 (Thu, 19 Jun 2008)
New Revision: 104

Added:
   sks/trunk/sks/debian/patches/101_fix_vindex_alignment
   sks/trunk/sks/debian/patches/402_separate_keys_with_hr
Removed:
   sks/trunk/sks/debian/patches/201_fix_vindex_alignment
   sks/trunk/sks/debian/patches/202_separate_keys_with_hr
Log:
[project @ 105]
alignment fix got accepted, hr separator not

Original author: weasel
Date: 2003-12-11 19:26:37.621615+00:00

Copied: sks/trunk/sks/debian/patches/101_fix_vindex_alignment (from rev 103, sks/trunk/sks/debian/patches/201_fix_vindex_alignment)
===================================================================
--- sks/trunk/sks/debian/patches/101_fix_vindex_alignment	                        (rev 0)
+++ sks/trunk/sks/debian/patches/101_fix_vindex_alignment	2008-06-19 14:59:04 UTC (rev 104)
@@ -0,0 +1,33 @@
+diff -ruN sks-1.0.6-old/htmlTemplates.ml sks-1.0.6/htmlTemplates.ml
+--- sks-1.0.6-old/htmlTemplates.ml	2003-12-09 22:31:28.000000000 +0100
++++ sks-1.0.6/htmlTemplates.ml	2003-12-09 23:36:19.000000000 +0100
+@@ -69,7 +69,7 @@
+       (if revoked then " *** KEY REVOKED *** [not verified]\r\n                              " 
+        else "")
+   in
+-  let uidstr = String.concat ~sep:"\r\n                              " userids in
++  let uidstr = String.concat ~sep:"\r\n                               " userids in
+   base ^ uidstr
+ 
+ let fingerprint ~fp = 
+diff -ruN sks-1.0.6-old/index.ml sks-1.0.6/index.ml
+--- sks-1.0.6-old/index.ml	2003-12-09 22:32:55.000000000 +0100
++++ sks-1.0.6/index.ml	2003-12-09 23:34:52.000000000 +0100
+@@ -202,7 +202,7 @@
+       | 0x11 -> " sig1"
+       | 0x12 -> " sig2"
+       | 0x13 -> " sig3"
+-      | 0x20 | 0x28 | 0x30 -> "<font color=\"red\"><b>revok</b></font>"
++      | 0x20 | 0x28 | 0x30 -> "<font color=\"red\"><b>revok </b></font>"
+       | 0x1f -> "dirct"
+       | 0x18 -> "sbind"
+       | x -> sprintf " 0x%02x" x
+@@ -248,7 +248,7 @@
+ 	"no keyid"
+   in
+ 
+-  let firstline = sprintf "sig %s %s %s %s %s %s"
++  let firstline = sprintf "sig %-6s %s %s %s %s %s"
+ 		    sigtype_string keyid_string
+ 		    sig_creation_string sig_expiration_string 
+ 		    key_expiration_string

Deleted: sks/trunk/sks/debian/patches/201_fix_vindex_alignment
===================================================================
--- sks/trunk/sks/debian/patches/201_fix_vindex_alignment	2008-06-19 14:58:47 UTC (rev 103)
+++ sks/trunk/sks/debian/patches/201_fix_vindex_alignment	2008-06-19 14:59:04 UTC (rev 104)
@@ -1,33 +0,0 @@
-diff -ruN sks-1.0.6-old/htmlTemplates.ml sks-1.0.6/htmlTemplates.ml
---- sks-1.0.6-old/htmlTemplates.ml	2003-12-09 22:31:28.000000000 +0100
-+++ sks-1.0.6/htmlTemplates.ml	2003-12-09 23:36:19.000000000 +0100
-@@ -69,7 +69,7 @@
-       (if revoked then " *** KEY REVOKED *** [not verified]\r\n                              " 
-        else "")
-   in
--  let uidstr = String.concat ~sep:"\r\n                              " userids in
-+  let uidstr = String.concat ~sep:"\r\n                               " userids in
-   base ^ uidstr
- 
- let fingerprint ~fp = 
-diff -ruN sks-1.0.6-old/index.ml sks-1.0.6/index.ml
---- sks-1.0.6-old/index.ml	2003-12-09 22:32:55.000000000 +0100
-+++ sks-1.0.6/index.ml	2003-12-09 23:34:52.000000000 +0100
-@@ -202,7 +202,7 @@
-       | 0x11 -> " sig1"
-       | 0x12 -> " sig2"
-       | 0x13 -> " sig3"
--      | 0x20 | 0x28 | 0x30 -> "<font color=\"red\"><b>revok</b></font>"
-+      | 0x20 | 0x28 | 0x30 -> "<font color=\"red\"><b>revok </b></font>"
-       | 0x1f -> "dirct"
-       | 0x18 -> "sbind"
-       | x -> sprintf " 0x%02x" x
-@@ -248,7 +248,7 @@
- 	"no keyid"
-   in
- 
--  let firstline = sprintf "sig %s %s %s %s %s %s"
-+  let firstline = sprintf "sig %-6s %s %s %s %s %s"
- 		    sigtype_string keyid_string
- 		    sig_creation_string sig_expiration_string 
- 		    key_expiration_string

Deleted: sks/trunk/sks/debian/patches/202_separate_keys_with_hr
===================================================================
--- sks/trunk/sks/debian/patches/202_separate_keys_with_hr	2008-06-19 14:58:47 UTC (rev 103)
+++ sks/trunk/sks/debian/patches/202_separate_keys_with_hr	2008-06-19 14:59:04 UTC (rev 104)
@@ -1,14 +0,0 @@
---- sks-1.0.6/index.ml.orig	Sun Dec  7 01:10:27 2003
-+++ sks-1.0.6/index.ml	Sun Dec  7 01:09:35 2003
-@@ -557,7 +557,10 @@
-       else 
- 	lines
-     in
--    keystr::lines
-+    let lines =
-+	keystr::lines
-+    in
-+    "</pre><hr><pre>"::lines
-   with
-     | Sys.Break | Eventloop.SigAlarm as e -> raise e
-     | e ->

Copied: sks/trunk/sks/debian/patches/402_separate_keys_with_hr (from rev 103, sks/trunk/sks/debian/patches/202_separate_keys_with_hr)
===================================================================
--- sks/trunk/sks/debian/patches/402_separate_keys_with_hr	                        (rev 0)
+++ sks/trunk/sks/debian/patches/402_separate_keys_with_hr	2008-06-19 14:59:04 UTC (rev 104)
@@ -0,0 +1,14 @@
+--- sks-1.0.6/index.ml.orig	Sun Dec  7 01:10:27 2003
++++ sks-1.0.6/index.ml	Sun Dec  7 01:09:35 2003
+@@ -557,7 +557,10 @@
+       else 
+ 	lines
+     in
+-    keystr::lines
++    let lines =
++	keystr::lines
++    in
++    "</pre><hr><pre>"::lines
+   with
+     | Sys.Break | Eventloop.SigAlarm as e -> raise e
+     | e ->