This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-atd.

commit 2c4a8ca7422ae7e170f45f027db87d21c8798091
Author: Stephane Glondu <st...@glondu.net>
Date:   Wed Jan 29 14:18:56 2014 +0100

    Move patch series to git format
---
 ...ile.patch => 0001-Several-makefile-fixes.patch} | 23 ++++++++++++++-------
 ...s-to.patch => 0002-Lintian-fix-allows-to.patch} | 15 +++++++++++---
 ...ual-without-installing-atd.cma-beforehand.patch | 24 ++++++++++++++++++++++
 debian/patches/build-manual-without-install.patch  | 15 --------------
 debian/patches/series                              |  6 +++---
 5 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/debian/patches/makefile.patch 
b/debian/patches/0001-Several-makefile-fixes.patch
similarity index 65%
rename from debian/patches/makefile.patch
rename to debian/patches/0001-Several-makefile-fixes.patch
index 7101d38..7f1414d 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/0001-Several-makefile-fixes.patch
@@ -1,10 +1,18 @@
-Description: several makefile fixes
- tweak makefile for byte-code only architectures and
- install some ml and mll where lintian complain about dangling cmi's
-Author: Hendrik Tews <hend...@askra.de>
+From: Hendrik Tews <hend...@askra.de>
+Date: Wed, 29 Jan 2014 14:16:18 +0100
+Subject: Several makefile fixes
+
+Tweak makefile for byte-code only architectures and install some ml
+and mll where lintian complain about dangling cmi's.
+---
+ Makefile | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index fec7bfe..c7d6bd4 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -66,7 +66,9 @@
+@@ -66,7 +66,9 @@ install: META
        test ! -f atdcat || cp atdcat $(BINDIR)/
        test ! -f atdcat.exe || cp atdcat.exe $(BINDIR)/
        ocamlfind install atd META \
@@ -15,7 +23,7 @@ Author: Hendrik Tews <hend...@askra.de>
  
  uninstall:
        test ! -f $(BINDIR)/atdcat || rm $(BINDIR)/atdcat
-@@ -129,6 +131,11 @@
+@@ -129,6 +131,11 @@ atdcat: dep $(CMI) $(CMX) atdcat.ml
                -package "$(OCAMLPACKS)" -linkpkg \
                $(CMX) atdcat.ml
  
@@ -27,7 +35,7 @@ Author: Hendrik Tews <hend...@askra.de>
  .PHONY: doc
  doc: odoc/index.html atdcat
        cd manual; $(MAKE)
-@@ -140,7 +147,7 @@
+@@ -140,7 +147,7 @@ odoc/index.html: $(CMI)
                -package "$(OCAMLPACKS)" $(DOCSOURCES)
  
  .PHONY: test
@@ -36,3 +44,4 @@ Author: Hendrik Tews <hend...@askra.de>
        ./atdcat test.atd > test.out
        ./atdcat test.out > test.out.out
        cmp test.out test.out.out
+-- 
diff --git a/debian/patches/lintian-allows-to.patch 
b/debian/patches/0002-Lintian-fix-allows-to.patch
similarity index 64%
rename from debian/patches/lintian-allows-to.patch
rename to debian/patches/0002-Lintian-fix-allows-to.patch
index 7edfffc..4f4bb80 100644
--- a/debian/patches/lintian-allows-to.patch
+++ b/debian/patches/0002-Lintian-fix-allows-to.patch
@@ -1,8 +1,16 @@
-Description: fix allows to
-Author: Hendrik Tews <hend...@askra.de>
+From: Hendrik Tews <hend...@askra.de>
+Date: Wed, 29 Jan 2014 14:16:27 +0100
+Subject: Lintian: fix allows to
+
+---
+ atdcat.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/atdcat.ml b/atdcat.ml
+index 669ef9a..0ab575a 100644
 --- a/atdcat.ml
 +++ b/atdcat.ml
-@@ -131,8 +131,8 @@
+@@ -131,8 +131,8 @@ let () =
            or replace <doc text=\"...\"> by (*html ... *)
            where the contents are formatted as HTML
            using <p>, <code> and <pre>.
@@ -13,3 +21,4 @@ Author: Hendrik Tews <hend...@askra.de>
  
      "-strip",
      Arg.String (fun s -> strip_sections := split_on_comma s @ 
!strip_sections),
+-- 
diff --git 
a/debian/patches/0003-Build-manual-without-installing-atd.cma-beforehand.patch 
b/debian/patches/0003-Build-manual-without-installing-atd.cma-beforehand.patch
new file mode 100644
index 0000000..dce854a
--- /dev/null
+++ 
b/debian/patches/0003-Build-manual-without-installing-atd.cma-beforehand.patch
@@ -0,0 +1,24 @@
+From: Hendrik Tews <hend...@askra.de>
+Date: Wed, 29 Jan 2014 14:16:41 +0100
+Subject: Build manual without installing atd.cma beforehand
+
+---
+ manual/atd-body.mlx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/manual/atd-body.mlx b/manual/atd-body.mlx
+index d37322c..8f34aec 100644
+--- a/manual/atd-body.mlx
++++ b/manual/atd-body.mlx
+@@ -3,7 +3,9 @@
+ ##
+ #use "topfind";;
+ #require "caml2html";;
+-#require "atd";;
++#require "easy-format";;
++#directory "..";;
++#load "atd.cma";;
+ #require "unix";;
+ #use "../atd_version.ml";;
+ #use "macros.ml";;
+-- 
diff --git a/debian/patches/build-manual-without-install.patch 
b/debian/patches/build-manual-without-install.patch
deleted file mode 100644
index 7e87c60..0000000
--- a/debian/patches/build-manual-without-install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: build manual without installing atd.cma beforehand
-Author: Hendrik Tews <hend...@askra.de>
---- a/manual/atd-body.mlx
-+++ b/manual/atd-body.mlx
-@@ -3,7 +3,9 @@
- ##
- #use "topfind";;
- #require "caml2html";;
--#require "atd";;
-+#require "easy-format";;
-+#directory "..";;
-+#load "atd.cma";;
- #require "unix";;
- #use "../atd_version.ml";;
- #use "macros.ml";;
diff --git a/debian/patches/series b/debian/patches/series
index 52aa1ff..3569d05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-makefile.patch
-lintian-allows-to.patch
-build-manual-without-install.patch
+0001-Several-makefile-fixes.patch
+0002-Lintian-fix-allows-to.patch
+0003-Build-manual-without-installing-atd.cma-beforehand.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-atd.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to