Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / 
ocaml-expect


Commits:
7c11a37c by Stephane Glondu at 2024-07-03T05:30:36+02:00
Update packaging

- - - - -
d3d03796 by Stephane Glondu at 2024-07-03T05:30:36+02:00
Update changelog and prepare upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+ocaml-expect (0.0.6-4) unstable; urgency=medium
+
+  * Team upload
+  * Fix compilation with recent toolchain (Closes: #1074732, #1073894)
+
+ -- Stéphane Glondu <[email protected]>  Wed, 03 Jul 2024 05:13:02 +0200
+
 ocaml-expect (0.0.6-3) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -5,6 +5,7 @@ Maintainer: Debian OCaml Maintainers 
<[email protected]>
 Build-Depends:
   ocaml,
   ocaml-findlib,
+  libcamlp-streams-ocaml-dev,
   libre-ocaml-dev,
   libounit-ocaml-dev (>= 2.0.0),
   libbatteries-ocaml-dev,


=====================================
debian/rules
=====================================
@@ -11,28 +11,27 @@ include /usr/share/ocaml/ocamlvars.mk
 OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
 export OCAMLFIND_DESTDIR
 
+SETUP := ocaml -I +compiler-libs -I +camlp-streams camlp_streams.cma setup.ml
+
 %:
        dh $@ --with ocaml
 
-.PHONY: override_dh_auto_configure
 override_dh_auto_configure:
-       ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir 
'/usr/share/doc/libexpect-ocaml-dev'
+       $(SETUP) -configure --prefix /usr --destdir '$(DESTDIR)' --docdir 
'/usr/share/doc/libexpect-ocaml-dev'
 
-.PHONY: override_dh_auto_build
 override_dh_auto_build:
-       ocaml setup.ml -build
-       ocaml setup.ml -doc
+       $(SETUP) -build
+       $(SETUP) -doc
 
-.PHONY: override_dh_auto_test
 override_dh_auto_test:
-       ocaml setup.ml -test
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+       $(SETUP) -test
+endif
 
-.PHONY: override_dh_auto_install
 override_dh_auto_install:
        mkdir -p '$(DESTDIR)/usr/bin'
        mkdir -p '$(OCAMLFIND_DESTDIR)'
-       ocaml setup.ml -install
+       $(SETUP) -install
 
-.PHONY: override_dh_auto_clean
 override_dh_auto_clean:
-       ocaml setup.ml -distclean
+       $(SETUP) -distclean



View it on GitLab: 
https://salsa.debian.org/ocaml-team/ocaml-expect/-/compare/552b00eabc32fd714e39955d5c9f3e7611b3115b...d3d03796feaa9cb742553f342d6b3dd0de946a99

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://salsa.debian.org/ocaml-team/ocaml-expect/-/compare/552b00eabc32fd714e39955d5c9f3e7611b3115b...d3d03796feaa9cb742553f342d6b3dd0de946a99
You're receiving this email because of your account on salsa.debian.org.


Reply via email to