[Pkg-ocaml-maint-commits] [SCM] ceve packaging branch, master, updated. debian/1.1-1-13-g4ca51a1

[Ralf Treinen]

The following commit has been merged in the master branch:
commit d4e4d2f3452be4c32daab8fffccc6d5e325a81d2
Merge: c529d2e0e22ca9f6724c44f26cc7e197fca445b8 cddbb740932dbef4740742dc12a895bbeaa93142
Author: Ralf Treinen <rt at free.fr>
Date:   Sun Mar 22 21:20:48 2009 +0100

    Merge commit 'upstream/1.2'
    
    Conflicts:
    	Makefile
    	ceve.1
    	ceve.ml

diff --combined Makefile
index 88a5a5a,023774b..b887930
--- a/Makefile
+++ b/Makefile
@@@ -20,21 -20,23 +20,26 @@@ 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.dosebase,dose2.lifetime,dose2.ocamldeb,dose2.ocamlrpm,expat,str,$(CAMLZIP_NAME)
- ifdef USE_OCAMLDUCE
- PACKAGES+=	,ocamlduce
- endif
+ PACKAGES = -package dose2.lifetime,dose2.ocamlpkgsrc,dose2.ocamlrpm,dose2.ocamldeb,dose2.dosebase,expat,str,$(CAMLZIP_NAME)
+ #ifdef USE_OCAMLDUCE
+ #PACKAGES+=	,ocamlduce
+ #endif
  
 +all: ceve
 +opt: ceve.opt
 +
  ceve: $(OBJS)
- 	$(OCAMLFIND) ocamlc -verbose -thread -o $@ -linkpkg $(PACKAGES) $(C_LIBRARIES) $(CCOPTFLAGS) $(OBJS)
 -	$(OCAMLFIND) ocamlc -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
+ ifdef USE_OCAMLDUCE
+ 	ocamlfind ocamlopt -thread -o $@ -linkpkg $(PACKAGES),ocamlduce $(C_LIBRARIES) $(CCOPTFLAGS) $(XBJS)
+ else
  	$(OCAMLFIND) ocamlopt -thread -o $@ -linkpkg $(PACKAGES) $(C_LIBRARIES) $(CCOPTFLAGS) $(XBJS)
+ endif	
  
  ifdef USE_OCAMLDUCE
  egraph_writer.cmo egraph_writer.cmi: ceveduce/egraph_writer.ml egraph_writer.mli
@@@ -57,7 -59,7 +62,7 @@@ endi
  	$(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
  
  %.cmi: %.mli
 -	$(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
 +	$(OCAMLFIND) ocamlc $(PACKAGES) -c $<
  
  doc: $(CMIS)
  	@rm -rf doc
@@@ -69,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 ceve.1
index 5e1c235,00a94a8..d59d74a
--- a/ceve.1
+++ b/ceve.1
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD:ceve.1
 +.TH ceve 1 "April 13, 2007" "version 1.0rc1" "USER COMMANDS"
++=======
+ .TH ceve 1 "October 28, 2008" "Version 1.2" "USER COMMANDS"
++>>>>>>> upstream/1.2:ceve.1
  .SH NAME
  ceve \- parse package metadata
  .SH SYNOPSIS
@@@ -19,8 -19,6 +23,6 @@@
  .IR yyyy-mm-dd ]
  [\-dose-archive
  .IR archive-name ]
- [\-dose-architecture
- .IR architecture ]
  [\-resolve-dependencies] [\-rpm-versions] [\-debian-versions] [\-verbose] [\-help]
  .I files
  .SH DESCRIPTION
@@@ -97,6 -95,9 +99,9 @@@ One RPM packag
  .B hdlist
  An uncompressed RPM hdlist file
  .IP \(bu 4
+ .B pkgsrc
+ A pkgsrc pkg_summary file
+ .IP \(bu 4
  .B egraph
  An EGraph file (GraphML-based)
  .RE
@@@ -131,7 -132,7 +136,7 @@@ Oz data structur
  .B graphviz
  GraphVIZ graph
  .IP \(bu 4
- .B tart
+ .BR tart " or " cnf
  CNF formula, readable by Tart
  .RE
  This option can be abbreviated as

-- 
ceve packaging