[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. upstream/0.7-59-g8f4a761

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 8f4a761fc59166001055f805c58286e35cfa215f
Author: Ralf Treinen <treinen at debian.org>
Date:   Fri Nov 12 14:54:16 2010 +0100

    links for distribution-specific distchecks

diff --git a/debian/ceve.NEWS b/debian/ceve.NEWS
index fdb53e6..1719269 100644
--- a/debian/ceve.NEWS
+++ b/debian/ceve.NEWS
@@ -1,7 +1,8 @@
-ceve (1:0.7.3-1-1) experimental; urgency=low
+ceve (0.7.3-1-1) experimental; urgency=low
 
-    The format EGraph, which was one of the possible input and output
-    formats of earlier versions of ceve based on the dose and dose2
-    libraries, is no longer supported.
+    Several of the input and output formats of earlier versions of
+    ceve versions 1.x and 2.x are no longer supported: EGraph, Oz,
+    and tart (which has been replaced by CNF). The new output format
+    DIMACS has been added.
 
  -- Ralf Treinen <treinen at debian.org>  Fri, 05 Nov 2010 14:56:17 +0100
diff --git a/debian/edos-distcheck.links b/debian/edos-distcheck.links
new file mode 100644
index 0000000..81d9697
--- /dev/null
+++ b/debian/edos-distcheck.links
@@ -0,0 +1,3 @@
+bin/distcheck bin/edos-debcheck
+bin/distcheck bin/edos-rpmcheck
+bin/distcheck bin/edos-eclipsecheck
diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos
new file mode 100644
index 0000000..c52beaa
--- /dev/null
+++ b/debian/patches/binaries-prefix-edos
@@ -0,0 +1,22 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: In debian, the symlinks to distcheck for specific distribution
+  formats are named edos-*.
+
+
+--- dose3.orig/applications/distcheck.ml	2010-11-12 14:49:38.000000000 +0100
++++ dose3/applications/distcheck.ml	2010-11-12 14:50:45.000000000 +0100
+@@ -54,10 +54,10 @@
+   let posargs =
+     let args = OptParse.OptParser.parse_argv Options.options in
+     match Filename.basename(Sys.argv.(0)),args with
+-    |"debcheck",[] -> ["deb://-"]
+-    |"debcheck",l -> List.map ((^) "deb://") l
+-    |"eclipsecheck",l -> List.map ((^) "eclipse://") l
+-    |"rpmcheck",l -> List.map ((^) "synthesis://") l
++    |"edos-debcheck",[] -> ["deb://-"]
++    |"edos-debcheck",l -> List.map ((^) "deb://") l
++    |"edos-eclipsecheck",l -> List.map ((^) "eclipse://") l
++    |"edos-rpmcheck",l -> List.map ((^) "synthesis://") l
+     |_,_ -> args
+   in
+   Boilerplate.enable_debug (OptParse.Opt.get Options.verbose);
diff --git a/debian/patches/build-libraries b/debian/patches/build-libraries
deleted file mode 100644
index 607734e..0000000
--- a/debian/patches/build-libraries
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: dose3/Makefile
-===================================================================
---- dose3.orig/Makefile	2010-07-21 20:36:24.000000000 +0200
-+++ dose3/Makefile	2010-07-21 20:37:31.000000000 +0200
-@@ -12,7 +12,7 @@
- 				 $(wildcard common/*.ml common/*.mli))
- 
- all:
--	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="-fstack-protector" $(OCAMLBUILD) $(OBFLAGS) $(TARGETS)
-+	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="-fstack-protector" $(OCAMLBUILD) $(OBFLAGS) $(TARGETS) $(LIBS)
- 
- clean:
- 	$(OCAMLBUILD) $(OBFLAGS) -clean
-Index: dose3/META
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dose3/META	2010-07-21 20:38:38.000000000 +0200
-@@ -0,0 +1,17 @@
-+description = "Dose3 libraries"
-+version = "placeholder"
-+
-+package "common" (
-+archive(byte) = "common.cma"
-+requires = "extlib"
-+)
-+
-+package "algo" (
-+archive(byte) = "algo.cma"
-+requires = "extlib"
-+)
-+
-+package "debian" (
-+archive(byte) = "debian.cma"
-+requires = "extlib"
-+)
-Index: dose3/Makefile.config.in
-===================================================================
---- dose3.orig/Makefile.config.in	2010-07-21 20:36:24.000000000 +0200
-+++ dose3/Makefile.config.in	2010-07-21 20:37:31.000000000 +0200
-@@ -27,6 +27,9 @@
-   OCAMLLIBBEST=cma
- endif
- 
-+# temporary fix
-+OCAMLLIBBEST=cma
-+
- TARGETS= \
- 		 applications/deb-cudf.$(OCAMLBEST) \
- 		 applications/randcudf.$(OCAMLBEST) \
diff --git a/debian/patches/install b/debian/patches/install
deleted file mode 100644
index 3ece0c9..0000000
--- a/debian/patches/install
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: dose3/Makefile
-===================================================================
---- dose3.orig/Makefile	2010-07-21 21:08:03.000000000 +0200
-+++ dose3/Makefile	2010-07-21 21:08:35.000000000 +0200
-@@ -53,10 +53,10 @@
- 	test -d $(LIBDIR) || mkdir -p $(LIBDIR)
- 	$(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF)
- 	test -d $(BINDIR) || mkdir -p $(BINDIR)
--	if [ -f _build/*.native ] ; then \
--		cp applications/_build/*.native $(BINDIR)/ ; \
-+	if [ "$(OCAMLBEST)" = "native" ] ; then \
-+		cp _build/applications/*.native $(BINDIR)/ ; \
- 	else \
--		cp applications/_build/*.byte $(BINDIR)/ ; \
-+		cp _build/applications/*.byte $(BINDIR)/ ; \
- 	fi
- 	@echo "Installed binaries in $(BINDIR)"
- 
diff --git a/debian/patches/series b/debian/patches/series
index 811b7b0..9dceec7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-# build-libraries
-# install
+binaries-prefix-edos

-- 
dose3 packaging