[Pkg-ocaml-maint-commits] [camlpdf] 06/09: Refresh patches and drop obsolete ones

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository camlpdf.

commit be5c05db4a75733b43853865f85e06149adce7d4
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Nov 30 10:18:09 2013 +0100

    Refresh patches and drop obsolete ones
---
 debian/patches/0001-Remove-custom.patch | 34 ++++++++++++++++++++++++++++
 debian/patches/makefile_fix.patch       | 39 ---------------------------------
 debian/patches/remove_custom.patch      | 16 --------------
 debian/patches/series                   |  3 +--
 4 files changed, 35 insertions(+), 57 deletions(-)

diff --git a/debian/patches/0001-Remove-custom.patch b/debian/patches/0001-Remove-custom.patch
new file mode 100644
index 0000000..e9f741b
--- /dev/null
+++ b/debian/patches/0001-Remove-custom.patch
@@ -0,0 +1,34 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 30 Nov 2013 13:59:03 +0100
+Subject: Remove -custom
+
+Also, do not compile camlpdf.top: it fails and it is not installed
+anyway.
+---
+ Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c453cc5..18ad248 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,6 +11,9 @@ PACKS = bigarray
+ 
+ RESULT = camlpdf
+ 
++# Avoid custom binary
++NO_CUSTOM = yes
++
+ LIBINSTALL_FILES = camlpdf.a camlpdf.cma camlpdf.cmxa libcamlpdf_stubs.a \
+ dllcamlpdf_stubs.* \
+ $(foreach x,$(PDFMODS),$x.mli) $(foreach x,$(PDFMODS),$x.cmi)
+@@ -19,7 +22,7 @@ OCAMLNCFLAGS = -g
+ OCAMLBCFLAGS = -g
+ OCAMLLDFLAGS = -g
+ 
+-all : native-code-library byte-code-library top htdoc
++all : native-code-library byte-code-library htdoc
+ 
+ install : libinstall
+ 
+-- 
diff --git a/debian/patches/makefile_fix.patch b/debian/patches/makefile_fix.patch
deleted file mode 100644
index a1bc71d..0000000
--- a/debian/patches/makefile_fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-* Remove unused modules (avoid name clashes)
-* Build on packaged zlib
-* Don't link system libraries into resulting cma
-Index: camlpdf/makefile
-===================================================================
---- camlpdf.orig/makefile	2009-06-02 18:17:24.000000000 +0200
-+++ camlpdf/makefile	2009-06-02 18:19:12.000000000 +0200
-@@ -3,13 +3,8 @@
- # and dllcamlpdf_stubs.so, libcamlpdf_stubs.a or similar 
- # OCaml and C source and interface files. Order matters.
- SOURCES = utility.ml utility.mli \
--	  istring.ml istring.mli \
--	  io.ml io.mli \
--	  unzip.ml unzip.mli \
- 	  pdfio.ml pdfio.mli \
- 	  cgenlex.ml cgenlex.mli \
--	  zlib.ml zlib.mli \
--	  zlibstubs.c \
- 	  transform.ml transform.mli \
- 	  units.ml units.mli \
- 	  paper.ml paper.mli \
-@@ -36,7 +31,7 @@
- TRASH = tl prog.tex camlpdf.tex camlpdf.aux camlpdf.log camlpdf.toc 
- 
- # ML Libraries
--LIBS = unix bigarray str
-+LIBS =
- 
- CLIBS = z
- 
-@@ -44,6 +39,8 @@
- #OCAMLNCFLAGS = -g
- #OCAMLBCFLAGS = -g
- #CAMLLDFLAGS = -g
-+OCAMLFLAGS=-I $(shell ocamlfind query zip)
-+OCAMLLDFLAGS=-I $(shell ocamlfind query zip)
- 
- #Uncomment if you have these compilers
- #OCAMLOPT = ocamlopt.opt
diff --git a/debian/patches/remove_custom.patch b/debian/patches/remove_custom.patch
deleted file mode 100644
index ec1a470..0000000
--- a/debian/patches/remove_custom.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Force linking in standard mode (might be unnecessary here since the 
-compilation of the C code has been disabled, but..)
-Index: camlpdf/makefile
-===================================================================
---- camlpdf.orig/makefile	2009-06-02 18:34:18.000000000 +0200
-+++ camlpdf/makefile	2009-06-02 18:35:15.000000000 +0200
-@@ -28,6 +28,9 @@
- 
- RESULT = camlpdf
- 
-+# Avoid custom binary
-+NO_CUSTOM = yes
-+
- TRASH = tl prog.tex camlpdf.tex camlpdf.aux camlpdf.log camlpdf.toc 
- 
- # ML Libraries
diff --git a/debian/patches/series b/debian/patches/series
index c0901e6..10b7c18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-makefile_fix.patch
-remove_custom.patch
+0001-Remove-custom.patch

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