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

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

commit fc38a40daac6f5de970fb0297ea2fa8853a78835
Author: Stephane Glondu <st...@glondu.net>
Date:   Wed Jan 29 14:24:40 2014 +0100

    Update patches
    
     * makefile fixes (mostly) applied upstream
     * lintian and manual compilation fixed upstream
---
 debian/patches/0001-Several-makefile-fixes.patch   | 47 ----------------------
 ...makefile-for-byte-code-only-architectures.patch | 34 ++++++++++++++++
 debian/patches/0002-Lintian-fix-allows-to.patch    | 24 -----------
 ...ual-without-installing-atd.cma-beforehand.patch | 24 -----------
 debian/patches/series                              |  4 +-
 5 files changed, 35 insertions(+), 98 deletions(-)

diff --git a/debian/patches/0001-Several-makefile-fixes.patch 
b/debian/patches/0001-Several-makefile-fixes.patch
deleted file mode 100644
index 7f1414d..0000000
--- a/debian/patches/0001-Several-makefile-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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 @@ install: META
-       test ! -f atdcat || cp atdcat $(BINDIR)/
-       test ! -f atdcat.exe || cp atdcat.exe $(BINDIR)/
-       ocamlfind install atd META \
--              `find $(MLI) $(CMI) $(CMO) $(CMX) $(O) atd.cma atd.a atd.cmxa`
-+              `find $(MLI) $(CMI) $(CMO) $(CMX) $(O) atd.cma atd.a atd.cmxa` \
-+              atd_check.ml atd_doc_lexer.mll atd_doc_lexer.ml \
-+              atd_lexer.mll atd_lexer.ml atd_predef.ml atd_version.ml
- 
- uninstall:
-       test ! -f $(BINDIR)/atdcat || rm $(BINDIR)/atdcat
-@@ -129,6 +131,11 @@ atdcat: dep $(CMI) $(CMX) atdcat.ml
-               -package "$(OCAMLPACKS)" -linkpkg \
-               $(CMX) atdcat.ml
- 
-+atdcat.byte: dep $(CMI) $(CMO) atdcat.ml
-+      ocamlfind ocamlc $(OCAMLFLAGS) -o atdcat \
-+              -package "$(OCAMLPACKS)" -linkpkg \
-+              $(CMO) atdcat.ml
-+
- .PHONY: doc
- doc: odoc/index.html atdcat
-       cd manual; $(MAKE)
-@@ -140,7 +147,7 @@ odoc/index.html: $(CMI)
-               -package "$(OCAMLPACKS)" $(DOCSOURCES)
- 
- .PHONY: test
--test: atdcat test.atd test2.atd
-+test: test.atd test2.atd
-       ./atdcat test.atd > test.out
-       ./atdcat test.out > test.out.out
-       cmp test.out test.out.out
--- 
diff --git 
a/debian/patches/0001-Tweak-makefile-for-byte-code-only-architectures.patch 
b/debian/patches/0001-Tweak-makefile-for-byte-code-only-architectures.patch
new file mode 100644
index 0000000..ecc7871
--- /dev/null
+++ b/debian/patches/0001-Tweak-makefile-for-byte-code-only-architectures.patch
@@ -0,0 +1,34 @@
+From: Hendrik Tews <hend...@askra.de>
+Date: Wed, 29 Jan 2014 14:16:18 +0100
+Subject: Tweak makefile for byte-code only architectures
+
+---
+ Makefile | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9046f02..2099777 100644
+--- a/Makefile
++++ b/Makefile
+@@ -137,6 +137,11 @@ atdcat$(EXE): dep $(CMI) $(CMX) atdcat.ml
+               -package "$(OCAMLPACKS)" -linkpkg \
+               $(CMX) atdcat.ml
+ 
++atdcat.byte: dep $(CMI) $(CMO) atdcat.ml
++      ocamlfind ocamlc $(OCAMLFLAGS) -o atdcat \
++              -package "$(OCAMLPACKS)" -linkpkg \
++              $(CMO) atdcat.ml
++
+ .PHONY: doc
+ doc: odoc/index.html atdcat$(EXE)
+       cd manual; $(MAKE)
+@@ -148,7 +153,7 @@ odoc/index.html: $(CMI)
+               -package "$(OCAMLPACKS)" $(DOCSOURCES)
+ 
+ .PHONY: test
+-test: atdcat$(EXE) test.atd test2.atd
++test: test.atd test2.atd
+       ./atdcat test.atd > test.out
+       ./atdcat test.out > test.out.out
+       cmp test.out test.out.out
+-- 
diff --git a/debian/patches/0002-Lintian-fix-allows-to.patch 
b/debian/patches/0002-Lintian-fix-allows-to.patch
deleted file mode 100644
index 4f4bb80..0000000
--- a/debian/patches/0002-Lintian-fix-allows-to.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 @@ let () =
-           or replace <doc text=\"...\"> by (*html ... *)
-           where the contents are formatted as HTML
-           using <p>, <code> and <pre>.
--          This is suitable input for \"caml2html -ext html:cat\"
--          which allows to convert ATD files into HTML.";
-+          This is suitable input for \"caml2html -ext html:cat\",
-+          which converts ATD files into HTML.";
- 
-     "-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
deleted file mode 100644
index dce854a..0000000
--- 
a/debian/patches/0003-Build-manual-without-installing-atd.cma-beforehand.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/series b/debian/patches/series
index 3569d05..f0891e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-Several-makefile-fixes.patch
-0002-Lintian-fix-allows-to.patch
-0003-Build-manual-without-installing-atd.cma-beforehand.patch
+0001-Tweak-makefile-for-byte-code-only-architectures.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