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

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 423a42d010497a5e460b1cfb18aec03fb8c9747e
Merge: 4ca51a12e9ec770e7461dc76dc6bab5754e9da40 87916f65ee05a2e821aaa54955885a65ba09f845
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon May 18 21:13:38 2009 +0200

    Merge commit 'upstream/1.3'
    
    Conflicts:
    	Makefile

diff --combined Makefile
index 170a607,d0d307e..05feb0d
--- a/Makefile
+++ b/Makefile
@@@ -20,18 -20,15 +20,18 @@@ egraph_writer.mli dose_writer.mli depen
  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
  #PACKAGES+=	,ocamlduce,expat
  #endif
  
 +all: ceve
 +opt: ceve.opt
 +
  ceve: $(OBJS)
 -	$(OCAMLFIND) ocamlc -I $(HOME)/ocamllib/ocamlduce -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
@@@ -43,16 -40,16 +43,16 @@@ endi
  
  ifdef USE_OCAMLDUCE
  egraph_writer.cmo egraph_writer.cmi: ceveduce/egraph_writer.ml egraph_writer.mli
- 	$(OCAMLFIND) ocamlc $(PACKAGES) -o $@ -c $<
+ 	$(OCAMLFIND) ocamlc -I $(HOME)/ocamllib/ocamlduce $(PACKAGES) -o $@ -c $<
  
  egraph_reader.cmo egraph_reader.cmi: ceveduce/egraph_reader.ml egraph_reader.mli
- 	$(OCAMLFIND) ocamlc $(PACKAGES) -o $@ -c $<
+ 	$(OCAMLFIND) ocamlc -I $(HOME)/ocamllib/ocamlduce $(PACKAGES) -o $@ -c $<
  
  egraph_writer.cmx: ceveduce/egraph_writer.ml
- 	$(OCAMLFIND) ocamlopt $(PACKAGES) -o $@ -c $<
+ 	$(OCAMLFIND) ocamlopt -I $(HOME)/ocamllib/ocamlduce $(PACKAGES) -o $@ -c $<
  
  egraph_reader.cmx: ceveduce/egraph_reader.ml
- 	$(OCAMLFIND) ocamlopt $(PACKAGES) -o $@ -c $<
+ 	$(OCAMLFIND) ocamlopt -I $(HOME)/ocamllib/ocamlduce $(PACKAGES) -o $@ -c $<
  endif
  
  %.cmo: %.ml
@@@ -62,7 -59,7 +62,7 @@@
  	$(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
  
  %.cmi: %.mli
 -	$(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
 +	$(OCAMLFIND) ocamlc $(PACKAGES) -c $<
  
  doc: $(CMIS)
  	@rm -rf doc
@@@ -74,12 -71,8 +74,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 --combined debian/changelog
index bda7c3c,0000000..e60135a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,0 +1,26 @@@
++ceve (1.3-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Ralf Treinen <treinen at debian.org>  Mon, 18 May 2009 21:12:46 +0200
++
 +ceve (1.2.1-1) unstable; urgency=low
 +
 +  [ Ralf Treinen ]
 +  * New upstream release
 +  * Add debian/watch
 +  * debian/rules: class/ocaml.ml -> rules/ocaml.mk
 +  * Standards-version 3.8.1 (no change)
 +  * Build-dependency add dh-ocaml, libdose2 must be >= 1.4-2
 +  * Add myself to Uploaders
 +
 +  [ Stefano Zacchiroli ]
 +  * ship ceve.1 manpage
 +
 + -- Ralf Treinen <treinen at debian.org>  Thu, 26 Mar 2009 08:20:45 +0100
 +
 +ceve (1.1-1) experimental; urgency=low
 +
 +  * Initial release. (Closes: #484280)
 +
 + -- Stefano Zacchiroli <zack at debian.org>  Tue, 03 Jun 2008 14:30:29 +0200

-- 
ceve packaging