Description: Use "type_conv" instead of "type-conv"
Author: Stéphane Glondu <glondu@debian.org>
Bug-Debian: http://bugs.debian.org/713349

--- xen-api-libs-0.5.2.orig/Makefile.in
+++ xen-api-libs-0.5.2/Makefile.in
@@ -16,7 +16,7 @@ default: all
 
 .PHONY: all
 all:
-ifeq ($(HAVE_TYPECONV),type-conv)
+ifeq ($(HAVE_TYPECONV),type_conv)
 	$(MAKE) -C rpc-light
 endif
 	$(MAKE) -C uuid
@@ -70,7 +70,7 @@ install: $(STUBLIBDIR)
 	$(MAKE) -C close-and-exec install
 	$(MAKE) -C sexpr install
 	$(MAKE) -C udev install
-ifeq ($(HAVE_TYPECONV),type-conv)
+ifeq ($(HAVE_TYPECONV),type_conv)
 	$(MAKE) -C rpc-light install
 endif
 ifeq ($(HAVE_XMLM),xmlm)
@@ -111,7 +111,7 @@ uninstall:
 	$(MAKE) -C close-and-exec uninstall
 	$(MAKE) -C sexpr uninstall
 	$(MAKE) -C udev uninstall
-ifeq ($(HAVE_TYPECONV),type-conv)
+ifeq ($(HAVE_TYPECONV),type_conv)
 	$(MAKE) -C rpc-light uninstall
 endif
 ifeq ($(HAVE_XMLM),xmlm)
--- xen-api-libs-0.5.2.orig/configure.ac
+++ xen-api-libs-0.5.2/configure.ac
@@ -52,7 +52,7 @@ if test "$OCAMLFIND" = "no"; then
 fi
 
 AC_CHECK_OCAML_PKG([xmlm])
-AC_CHECK_OCAML_PKG([type-conv])
+AC_CHECK_OCAML_PKG([type_conv])
 
 AC_CONFIG_FILES([Makefile config.mk])
 AC_SUBST([XEN])
--- xen-api-libs-0.5.2.orig/config.mk.in
+++ xen-api-libs-0.5.2/config.mk.in
@@ -27,7 +27,7 @@ OCAMLYACC = ocamlyacc
 OCAMLCFLAGS = -dtypes
 OCAMLOPTFLAGS = -g -dtypes
 
-RPCLIGHTFLAGS = -package camlp4,type-conv -ppopt -I -ppopt ../rpc-light -ppopt pa_rpc.cma -syntax camlp4o -I ../rpc-light -I ../jsonrpc -I ../rpc-light
+RPCLIGHTFLAGS = -package camlp4,type_conv -ppopt -I -ppopt ../rpc-light -ppopt pa_rpc.cma -syntax camlp4o -I ../rpc-light -I ../jsonrpc -I ../rpc-light
 
 DOCDIR = ../doc
 
--- xen-api-libs-0.5.2.orig/tapctl/Makefile
+++ xen-api-libs-0.5.2/tapctl/Makefile
@@ -1,6 +1,6 @@
 include ../config.mk
 
-#FEPP = camlp4o -I ../rpc-light -I $(shell ocamlfind query type-conv) pa_type_conv.cmo pa_rpc.cma
+#FEPP = camlp4o -I ../rpc-light -I $(shell ocamlfind query type_conv) pa_type_conv.cmo pa_rpc.cma
 
 OBJS = tapctl
 INTF = $(foreach obj, $(OBJS),$(obj).cmi)
--- xen-api-libs-0.5.2.orig/rpc-light/META.in
+++ xen-api-libs-0.5.2/rpc-light/META.in
@@ -5,7 +5,7 @@ requires = "rpc-light.xml, rpc-light.jso
 package "syntax" (
   version = "@VERSION@"
   description = "rpc-light: library to marshalling/unmarshalling ML types to/from RPC intermediate language"
-  requires = "type-conv"
+  requires = "type_conv"
   archive(syntax,preprocessor) = "pa_rpc.cma"
   archive(syntax,toploop) = "pa_rpc.cma"
   )
--- xen-api-libs-0.5.2.orig/rpc-light/Makefile
+++ xen-api-libs-0.5.2/rpc-light/Makefile
@@ -3,7 +3,7 @@ include ../config.mk
 OCAMLFLAGS = -annot -g
 PACKS = xmlm
 
-ICAMLP4 = -I $(shell ocamlfind query camlp4) -I $(shell ocamlfind query type-conv)
+ICAMLP4 = -I $(shell ocamlfind query camlp4) -I $(shell ocamlfind query type_conv)
 TARGETS = \
 	rpc.cmi rpc.cmo rpc.o rpc.cmx \
 	pa_rpc.cma idl.cma \
@@ -23,13 +23,13 @@ idl.cma: p4_rpc.cmo p4_idl.cmo
 	$(OCAMLC) -a $(ICAMLP4) -o $@ $^
 
 pa_rpc.cmo: pa_rpc.ml p4_rpc.cmo pa_module_conv.cmo
-	$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type-conv -pp "camlp4orf" $(ICAMLP4) $@ $<
+	$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type_conv -pp "camlp4orf" $(ICAMLP4) $@ $<
 
 p4_rpc.cmo: p4_rpc.ml rpc.cmo
-	$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type-conv -pp "camlp4orf" $(ICAMLP4) $@ $<
+	$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type_conv -pp "camlp4orf" $(ICAMLP4) $@ $<
 
 p4_idl.cmo: p4_idl.ml p4_rpc.cmo
-	$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type-conv -pp "camlp4orf" $(ICAMLP4) $@ $<
+	$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type_conv -pp "camlp4orf" $(ICAMLP4) $@ $<
 
 %.o %.cmx: %.ml
 	$(OCAMLOPT) $(OCAMLFLAGS) -package $(PACKS) -c -o $@ $<
