[med-svn] [Git][med-team/mcl][master] Revert "Deactivate OCaml patch"

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / mcl


Commits:
251dc047 by Nilesh Patra at 2022-12-03T08:43:43+05:30
Revert "Deactivate OCaml patch"

This reverts commit a32f7abff69c6c9de44c452432603317b144be9b.

- - - - -


5 changed files:

- debian/control
- + debian/libmcl-ocaml-dev.install
- debian/patches/OCamlSupport.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -5,10 +5,16 @@ Uploaders: Andreas Tille <tille at debian.org>,
 Section: math
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
+               dh-ocaml,
                zoem,
                tidy,
                aephea,
+               ocaml,
+               ocamlbuild,
+               ocaml-findlib,
+               oasis,
                bsdextrautils | bsdmainutils (<< 12.1.1~),
+               dh-exec,
                libtingea-dev
 Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/med-team/mcl
@@ -45,3 +51,19 @@ Description: documentation for mcl
  .
  This is documentation for mcl: the MCL FAQ, some examples as well as manpages
  in HTML and PostScript format.
+
+Package: libmcl-ocaml-dev
+Architecture: any
+Section: ocaml
+Depends: ocaml-findlib,
+         mcl,
+         ${ocaml:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: library providing bindings between mcl and OCaml
+ The MCL package is an implementation of the MCL algorithm, and offers
+ utilities for manipulating sparse matrices (the essential data
+ structure in the MCL algorithm) and conducting cluster experiments.
+ .
+ This library provides bindings between mcl and OCaml.


=====================================
debian/libmcl-ocaml-dev.install
=====================================
@@ -0,0 +1,4 @@
+#!/usr/bin/dh-exec
+_build/caml/* usr/lib/ocaml
+caml/META usr/lib/ocaml/mcl
+src/*/*.a usr/lib/${DEB_HOST_MULTIARCH}


=====================================
debian/patches/OCamlSupport.patch
=====================================
@@ -1,10 +1,5 @@
 Description: add OCaml support
- Add OCaml support. This patch has been generated by taking the diff of an mcl
- clone that has implemented OCaml support and upstream's version of mcl 12-068,
- stripping out unnecessary changes and refreshing it over the Debian mcl packed
- version 14-137.
- .
- This patch is deactivated since it does not work any more.
+ Add OCaml support. This patch has been generated by taking the diff of an mcl clone that has implemented OCaml support and upstream's version of mcl 12-068, stripping out unnecessary changes and refreshing it over the Debian mcl packed version 14-137.
 Author: Shayan Doust <hello at shayandoust.me>
 Last-Update: 2020-06-02
 Origin: https://github.com/fhcrc/mcl


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
-# OCamlSupport.patch
+OCamlSupport.patch
 02-wrong-interpreter-path.patch
 05-manual-what-is.patch
 spelling.patch


=====================================
debian/rules
=====================================
@@ -60,7 +60,7 @@ confflags += --enable-blast
 docbackupdir:=$(CURDIR)/debian/doc.bak
 
 %:
-	dh $@
+	dh $@ --with ocaml
 
 override_dh_clean:
 	dh_clean
@@ -69,6 +69,12 @@ override_dh_clean:
 	rm -rf doc/*.1 doc/*.html doc/*-html doc/*.ps
 	rm -rf src/alien/oxygen/doc/*.1 src/alien/oxygen/doc/*.html src/alien/oxygen/doc/*.ps
 
+override_dh_auto_build:
+	#dh_auto_build
+	autoreconf --install
+	oasis setup
+	ocaml setup.ml -all
+
 override_dh_auto_configure:
 	dh_auto_configure -- $(confflags)
 



View it on GitLab: https://salsa.debian.org/med-team/mcl/-/commit/251dc047bd7a15bce0b7b87428019769636fc903

-- 
View it on GitLab: https://salsa.debian.org/med-team/mcl/-/commit/251dc047bd7a15bce0b7b87428019769636fc903
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20221203/39e7b252/attachment-0001.htm>