Package: headache Version: 1.03-8 Severity: normal Tags: patch Hi,
Attached is the diff for my headache 1.03-8.1 NMU. -- adn Mohammed Adnène Trojette
diff -u headache-1.03/debian/patches/00list headache-1.03/debian/patches/00list --- headache-1.03/debian/patches/00list +++ headache-1.03/debian/patches/00list @@ -1,2 +1 @@ - - +01_detect_end_of_header.dpatch diff -u headache-1.03/debian/changelog headache-1.03/debian/changelog --- headache-1.03/debian/changelog +++ headache-1.03/debian/changelog @@ -1,3 +1,12 @@ +headache (1.03-8.1) unstable; urgency=medium + + * Non-maintainer upload. + * 01_detect_end_of_header.dpatch: + + patch from Julien Cristau to detect the end of + the header (Closes: #379146) + + -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Mon, 18 Sep 2006 02:37:52 +0200 + headache (1.03-8) unstable; urgency=low * Remove Debian OCaml Maintainer as uploader (this is non sense) only in patch2: unchanged: --- headache-1.03.orig/debian/patches/01_detect_end_of_header.dpatch +++ headache-1.03/debian/patches/01_detect_end_of_header.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_detect_end_of_header.patch.dpatch by Julien Cristau <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to detect the end of the header + [EMAIL PROTECTED]@ + +diff -Nru headache-1.03/main.ml headache-1.03.new/main.ml +--- headache-1.03/main.ml 2004-03-29 11:16:22.000000000 +0200 ++++ headache-1.03.new/main.ml 2006-09-16 01:57:34.000000000 +0200 +@@ -89,7 +89,7 @@ + let line = input_line ic in + line :: loop () + with +- End_of_file -> [] ++ End_of_file -> close_in ic; [] + in + loop () + +@@ -221,4 +221,4 @@ + main () + with + Sys_error msg -> +- eprintf "%s: %s" Sys.argv.(0) msg ++ eprintf "%s: %s\n" Sys.argv.(0) msg +diff -Nru headache-1.03/model.ml headache-1.03.new/model.ml +--- headache-1.03/model.ml 2004-03-29 11:16:22.000000000 +0200 ++++ headache-1.03.new/model.ml 2006-09-16 01:47:06.000000000 +0200 +@@ -138,6 +138,8 @@ + let regexp_end = + Str.regexp_string (sprintf "%s%s" (String.make 10 line_char) close_comment) + in ++ let end_length = 10 + String.length close_comment ++ in + + let regexp_blank = Str.regexp "^[ ]*$" in + +@@ -146,7 +148,11 @@ + let line = input_line ic in + if Str.string_match regexp_begin line 0 + then begin +- while not (Str.string_match regexp_end (input_line ic) 0) do () done; ++ while ++ let s = input_line ic in ++ not (Str.string_match regexp_end s ++ (max 0 (String.length s - end_length))) ++ do () done; + "" + end + else if Str.string_match regexp_blank line 0
