[med-svn] [Git][med-team/mcl][master] 5 commits: Save backup of changed docs to restore it in clean target Closes: #1046152

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / mcl


Commits:
0f4a6d53 by Andreas Tille at 2024-12-23T11:35:28+01:00
Save backup of changed docs to restore it in clean target Closes: #1046152

- - - - -
e75a3bc3 by Andreas Tille at 2024-12-23T11:35:39+01:00
Standards-Version: 4.7.0 (routine-update)

- - - - -
92f2ae6f by Andreas Tille at 2024-12-23T13:44:54+01:00
Upstream just does not support OCaml and the patch is way to outdated for recent OCaml versions

- - - - -
4c340e99 by Andreas Tille at 2024-12-23T16:14:07+01:00
Really fix clean target

- - - - -
399b97d4 by Andreas Tille at 2024-12-23T16:15:43+01:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,11 @@
-mcl (1:22-282+ds-3) UNRELEASED; urgency=medium
+mcl (1:22-282+ds-3) unstable; urgency=medium
 
   * Move external code in a separate subdirectory
+  * Save backup of changed docs to restore it in clean target
+    Closes: #1046152
+  * Standards-Version: 4.7.0 (routine-update)
 
- -- Andreas Tille <tille at debian.org>  Wed, 16 Nov 2022 15:11:45 +0100
+ -- Andreas Tille <tille at debian.org>  Mon, 23 Dec 2024 16:14:18 +0100
 
 mcl (1:22-282+ds-2) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -9,14 +9,14 @@ Build-Depends: debhelper-compat (= 13),
                zoem,
                tidy,
                aephea,
-               ocaml,
-               ocamlbuild,
-               ocaml-findlib,
-               oasis,
-               bsdextrautils | bsdmainutils (<< 12.1.1~),
+#               ocaml,
+#               ocamlbuild,
+#               ocaml-findlib,
+#               oasis,
+               bsdextrautils,
                dh-exec,
                libtingea-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/med-team/mcl
 Vcs-Git: https://salsa.debian.org/med-team/mcl.git
 Homepage: https://micans.org/mcl/
@@ -27,8 +27,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: mcl-doc
-Enhances: blast2,
-          ncbi-tools-bin,
+Enhances: ncbi-tools-bin,
           bioperl-run
 Description: Markov Cluster algorithm
  The MCL package is an implementation of the MCL algorithm, and offers
@@ -41,29 +40,13 @@ Description: Markov Cluster algorithm
 
 Package: mcl-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Suggests: mcl
-Multi-Arch: foreign
 Description: documentation for mcl
  The MCL package is an implementation of the Markov Cluster algorithm,
  for manipulating sparse matricess and conducting cluster experiments.
  .
  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/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 $@ --with ocaml
+	dh $@ # --with ocaml
 
 override_dh_clean:
 	dh_clean
@@ -68,14 +68,17 @@ override_dh_clean:
 	find . -name "*.zmt" -delete
 	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
+	if [ -d $(docbackupdir) ] ; then mv $(docbackupdir)/*.txt doc/ ; rm -rf $(docbackupdir) ; fi
 
-override_dh_auto_build:
-	#dh_auto_build
-	autoreconf --install
-	oasis setup
-	ocaml setup.ml -all
+#override_dh_auto_build:
+#	#dh_auto_build
+#	autoreconf --install
+#	oasis setup
+#	ocaml setup.ml -all
 
 override_dh_auto_configure:
+	mkdir -p $(docbackupdir)
+	cp -a doc/mcl*.txt $(docbackupdir)
 	dh_auto_configure -- $(confflags)
 
 override_dh_install:



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

-- 
View it on GitLab: https://salsa.debian.org/med-team/mcl/-/compare/251dc047bd7a15bce0b7b87428019769636fc903...399b97d4fd1b17db463f6ac687ee015b50a7ccf4
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/20241223/3a0a689f/attachment-0001.htm>