[Pkg-ocaml-maint-commits] [SCM] headache packaging branch, master, updated. debian/1.03-20-4-ga4ae1a8

[Ralf Treinen]

The following commit has been merged in the master branch:
commit a4ae1a8b2d4da7f4106f96c035169e3b6696dbd5
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Jan 3 08:52:10 2012 +0100

    refresh patch

diff --git a/debian/patches/03_header_width b/debian/patches/03_header_width
old mode 100755
new mode 100644
index 1f54d89..5102779
--- a/debian/patches/03_header_width
+++ b/debian/patches/03_header_width
@@ -1,9 +1,10 @@
 Author: Sylvain Le Gall <gildor at debian.org>
 Description: Compute header width based on header file content.
 
-diff -urNad trunk~/main.ml trunk/main.ml
---- trunk~/main.ml	2008-04-24 22:55:07.685167988 +0200
-+++ trunk/main.ml	2008-04-24 22:57:01.404332989 +0200
+Index: headache/main.ml
+===================================================================
+--- headache.orig/main.ml	2012-01-03 08:42:53.000000000 +0100
++++ headache/main.ml	2012-01-03 08:42:54.000000000 +0100
 @@ -98,9 +98,16 @@
      with
        End_of_file -> close_in ic; []
@@ -70,9 +71,10 @@ diff -urNad trunk~/main.ml trunk/main.ml
    "<file>  Create headers with text from <file>";
  
    "-c",
-diff -urNad trunk~/model.ml trunk/model.ml
---- trunk~/model.ml	2008-04-24 22:55:07.685167988 +0200
-+++ trunk/model.ml	2008-04-24 22:55:50.907330341 +0200
+Index: headache/model.ml
+===================================================================
+--- headache.orig/model.ml	2012-01-03 08:42:53.000000000 +0100
++++ headache/model.ml	2012-01-03 08:42:54.000000000 +0100
 @@ -26,7 +26,7 @@
  
  type generator =
diff --git a/debian/patches/series b/debian/patches/series
index 8452414..bd997d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 02_skip_begin
 03_header_width
 config_file_types
-default_file_types

-- 
headache packaging