[Pkg-ocaml-maint-commits] [SCM] ceve packaging branch, master, updated. debian/1.4-1-4-g7d5be05

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 7d5be05b68c47271c24fee66c925785602999cd4
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Nov 22 21:41:08 2009 +0100

    put patch into quilt format

diff --git a/debian/patches/Makefile b/debian/patches/Makefile
new file mode 100644
index 0000000..21b4837
--- /dev/null
+++ b/debian/patches/Makefile
@@ -0,0 +1,52 @@
+Description: Various fixes to upstream makefile
+Author: Stefano Zacchiroli <zack at debian.org>
+Reviewed-By: Ralf Treinen <treinen at debian.org>
+
+--- ceve-1.4.orig/Makefile
++++ ceve-1.4/Makefile
+@@ -20,7 +20,7 @@ egraph_writer.mli dose_writer.mli depend
+ cnf_writer.mli graphviz_writer.mli oz_writer.mli
+ OBJS = $(OCAML_SOURCES:.ml=.cmo)
+ XBJS = $(OCAML_SOURCES:.ml=.cmx)
+-CMIS = $(OCAML_MLIS:.mli=.cmi)
++CMIS = $(OCAML_MLIS:.mli=.cmi) ceve.cmi
+ 
+ PACKAGES = -package dose2.lifetime,dose2.ocamlpkgsrc,dose2.ocamlrpm,dose2.ocamldeb,dose2.dosebase,str,$(CAMLZIP_NAME)
+ #ifdef USE_OCAMLDUCE
+@@ -28,8 +28,11 @@ PACKAGES = -package dose2.lifetime,dose2
+ #DUCEDIR=$(shell ocamlfind query ocamlduce)
+ #endif
+ 
++all: ceve
++opt: ceve.opt
++
+ ceve: $(OBJS)
+-	$(OCAMLFIND) ocamlc -I $(DUCEDIR) -thread -custom -o $@ -linkpkg $(PACKAGES) $(C_LIBRARIES) $(CCOPTFLAGS) $(OBJS)
++	$(OCAMLFIND) ocamlc -thread -o $@ -linkpkg $(PACKAGES) $(C_LIBRARIES) $(CCOPTFLAGS) $(OBJS)
+ 
+ ceve.opt: $(XBJS)
+ # bug in ocamlducefind
+@@ -60,7 +63,7 @@ endif
+ 	$(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
+ 
+ %.cmi: %.mli
+-	$(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
++	$(OCAMLFIND) ocamlc $(PACKAGES) -c $<
+ 
+ doc: $(CMIS)
+ 	@rm -rf doc
+@@ -72,8 +75,12 @@ clean:
+ 	@rm -rf ceve ceve.opt doc $(OBJS) $(XBJS) $(CMIS) $(OCAML_SOURCES:.ml=.o)
+ 
+ install: ceve
+-	{ test ! -f ceve.opt || install ceve.opt $(BINDIR); }; \
+-	install ceve $(BINDIR)
++	mkdir -p $(BINDIR)
++	if [ -f ceve.opt ] ; then \
++	  cp ceve.opt $(BINDIR)/ceve ; \
++	else \
++	  cp ceve $(BINDIR)/ceve ; \
++	fi
+ 
+ depend:
+ 	$(OCAMLFIND) ocamldep $(OCAML_SOURCES) $(OCAML_MLIS) > .depend
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..550bd25
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Makefile
+

-- 
ceve packaging