[med-svn] [Git][med-team/mcl][master] 11 commits: Add Build-Depends to work with "--with ocaml"

Andreas Tille gitlab at salsa.debian.org
Thu Jun 4 18:33:49 BST 2020



Andreas Tille pushed to branch master at Debian Med / mcl


Commits:
2e7661f8 by Andreas Tille at 2020-06-04T18:49:42+02:00
Add Build-Depends to work with "--with ocaml"

- - - - -
c9d0ff73 by Andreas Tille at 2020-06-04T18:53:14+02:00
Create changelog entry

- - - - -
ecd6d3f7 by Andreas Tille at 2020-06-04T18:53:39+02:00
routine-update: Standards-Version: 4.5.0

- - - - -
45821c51 by Andreas Tille at 2020-06-04T18:53:39+02:00
routine-update: debhelper-compat 13

- - - - -
79345371 by Andreas Tille at 2020-06-04T18:53:42+02:00
routine-update: Add salsa-ci file

- - - - -
1f333fff by Andreas Tille at 2020-06-04T18:53:42+02:00
routine-update: Rules-Requires-Root: no

- - - - -
98efc483 by Andreas Tille at 2020-06-04T18:53:43+02:00
Wrap long lines in changelog entries: 1:14-137+ds-5.

Fixes: lintian: debian-changelog-line-too-long
See-also: https://lintian.debian.org/tags/debian-changelog-line-too-long.html

- - - - -
56971eb5 by Andreas Tille at 2020-06-04T18:53:43+02:00
Use secure URI in Homepage field.

Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html

- - - - -
e84331dd by Andreas Tille at 2020-06-04T18:53:44+02:00
Set field Upstream-Name in debian/copyright.
- - - - -
4a089725 by Andreas Tille at 2020-06-04T19:09:13+02:00
dh_missing of debhelper compat=13 claims missing installation of docs

- - - - -
a2b0cabb by Andreas Tille at 2020-06-04T19:33:16+02:00
install mcl's own examples in one dir and autopkgtest in other dir

- - - - -


10 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/mcl-doc.docs
- − debian/mcl-doc.examples
- debian/mcl-doc.install
- debian/rules
- + debian/salsa-ci.yml
- debian/tests/run-unit-tests


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,31 @@
+mcl (1:14-137+ds-5) UNRELEASED; urgency=medium
+
+  [ Steffen Moeller ]
+  * d/u/metadata: yamllint
+
+  [ Shayan Doust ]
+  * Patch for mcl OCaml support
+  * OCaml headers are not compatible with c89, so change to c99
+  * Add rules for *.ml files to build ...fails for some reason
+  * Add build depends for OCaml
+  * Add oasis as build dependency and run oasis setup in rules
+  * Disable dh_auto_build as we do this manually due to OCaml
+  * Use --with ocaml but invoke autoreconf manually within overridden
+    dh_auto_build
+
+  [ Andreas Tille ]
+  * Add Build-Depends to work with "--with ocaml"
+  * Standards-Version: 4.5.0 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+  * Use secure URI in Homepage field.
+  * Set field Upstream-Name in debian/copyright.
+  * dh_missing of debhelper compat=13 claims missing installation of docs
+  * install mcl's own examples in one dir and autopkgtest in other dir
+
+ -- Andreas Tille <tille at debian.org>  Thu, 04 Jun 2020 18:50:23 +0200
+
 mcl (1:14-137+ds-4) unstable; urgency=medium
 
   [ Saira Hussain ]


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-12


=====================================
debian/control
=====================================
@@ -3,7 +3,8 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: math
 Priority: optional
-Build-Depends: debhelper (>= 12~),
+Build-Depends: debhelper-compat (= 13),
+               dh-ocaml,
                zoem,
                tidy,
                aephea,
@@ -11,10 +12,11 @@ Build-Depends: debhelper (>= 12~),
                ocamlbuild,
                ocaml-findlib,
                oasis
-Standards-Version: 4.4.0
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/mcl
 Vcs-Git: https://salsa.debian.org/med-team/mcl.git
-Homepage: http://micans.org/mcl/
+Homepage: https://micans.org/mcl/
+Rules-Requires-Root: no
 
 Package: mcl
 Architecture: any


=====================================
debian/copyright
=====================================
@@ -4,6 +4,7 @@ Files-Excluded: */*.1
                 */doc/*.ps
                 */*.html
                 */Makefile.in
+Upstream-Name: mcl
 
 Files: *
 Copyright: © 1999-2007 Stijn van Dongen <stijn at micans.org>


=====================================
debian/mcl-doc.docs
=====================================
@@ -2,3 +2,4 @@ AUTHORS
 README
 THANKS
 TODO
+usr/share/doc/mcl/*


=====================================
debian/mcl-doc.examples deleted
=====================================
@@ -1 +0,0 @@
-debian/tests/data/*


=====================================
debian/mcl-doc.install
=====================================
@@ -2,3 +2,4 @@ usr/share/doc/mcl/*.html	usr/share/doc/mcl/html
 usr/share/doc/mcl/*.ps		usr/share/doc/mcl/
 usr/share/doc/mcl/minimcl	usr/share/doc/mcl/
 debian/tests/run-unit-tests	usr/share/doc/mcl/
+debian/tests/data/*		usr/share/doc/mcl/test


=====================================
debian/rules
=====================================
@@ -85,3 +85,9 @@ override_dh_install:
 	for pl in `grep -Rl '#![[:space:]]*/usr/bin/env[[:space:]]\+perl' debian/*/usr/*` ; do \
 	    sed -i '1s?^#![[:space:]]*/usr/bin/env[[:space:]]\+perl?#!/usr/bin/perl?' $${pl} ; \
 	done
+
+override_dh_missing:
+	# Remove duplicated doc (*.html) and doc we do not want (*.ps)
+	rm -f debian/tmp/usr/share/doc/mcl/*.html \
+	      debian/tmp/usr/share/doc/mcl/*.ps
+	dh_missing


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml


=====================================
debian/tests/run-unit-tests
=====================================
@@ -11,7 +11,7 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
 #  trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
 fi
 
-cp /usr/share/doc/${pkg}/examples/* -a "${AUTOPKGTEST_TMP}"
+cp /usr/share/doc/${pkg}/test/* -a "${AUTOPKGTEST_TMP}"
 
 cd "${AUTOPKGTEST_TMP}"
 gunzip -r *



View it on GitLab: https://salsa.debian.org/med-team/mcl/-/compare/417c0f674052f2303c6e34c7fdf37cafe1269065...a2b0cabb05dc3e4dd7815eed049e3b0fc49fd96c

-- 
View it on GitLab: https://salsa.debian.org/med-team/mcl/-/compare/417c0f674052f2303c6e34c7fdf37cafe1269065...a2b0cabb05dc3e4dd7815eed049e3b0fc49fd96c
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/20200604/ad1fab03/attachment-0001.html>


More information about the debian-med-commit mailing list