[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ocaml-team/why3][master] 2 commits: Do not hardcode /usr/lib/ocaml



Title: GitLab

Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / why3

Commits:

  • 8fbd0489
    by Stephane Glondu at 2024-08-12T20:43:50+02:00
    Do not hardcode /usr/lib/ocaml
    
  • f32984b5
    by Stephane Glondu at 2024-08-12T20:43:50+02:00
    Update changelog
    

6 changed files:

Changes:

  • debian/changelog
    1
    +why3 (1.7.2-2) UNRELEASED; urgency=medium
    
    2
    +
    
    3
    +  * Do not hardcode /usr/lib/ocaml
    
    4
    +
    
    5
    + -- Stéphane Glondu <glondu@debian.org>  Mon, 12 Aug 2024 20:03:36 +0200
    
    6
    +
    
    1 7
     why3 (1.7.2-1) unstable; urgency=medium
    
    2 8
     
    
    3 9
       * New upstream release.
    

  • debian/libwhy3-ocaml-dev.dirs deleted
    1
    -/usr/lib/ocaml/why3

  • debian/libwhy3-ocaml-dev.install deleted
    1
    -debian/tmp/usr/local/lib/ocaml/*/why3    usr/lib/ocaml

  • debian/libwhy3-ocaml-dev.install.in
    1
    +@OCamlStdlibDir@/why3/META
    
    2
    +@OCamlStdlibDir@/why3/why3.*

  • debian/rules
    ... ... @@ -4,6 +4,7 @@ include /usr/share/ocaml/ocamlvars.mk
    4 4
     OCAML_NATIVE_ARCHS := $(subst lpia,,$(OCAML_NATIVE_ARCHS))
    
    5 5
     
    
    6 6
     BUILDDIR=debian/tmp
    
    7
    +export OCAMLFIND_DESTDIR=$(OCAML_STDLIB_DIR)
    
    7 8
     
    
    8 9
     %:
    
    9 10
     	dh $@ --with ocaml,tex
    
    ... ... @@ -13,7 +14,7 @@ override_dh_auto_configure:
    13 14
     	dh_auto_configure -- \
    
    14 15
     		--disable-emacs-compilation \
    
    15 16
     		--disable-coq-libs \
    
    16
    -		--libdir=/usr/lib/ocaml
    
    17
    +		--libdir=$(OCAML_STDLIB_DIR)
    
    17 18
     
    
    18 19
     override_dh_auto_build-arch:
    
    19 20
     	$(MAKE) all byte
    
    ... ... @@ -50,13 +51,13 @@ override_dh_installexamples:
    50 51
     override_dh_compress:
    
    51 52
     	dh_compress -Xmanual.pdf
    
    52 53
     
    
    53
    -ifneq ($(wildcard debian/why3/usr/lib/ocaml/why3/commands/why3ide.cmxs),)
    
    54
    -  WHY3IDE_UNITS := $(shell ocamlobjinfo debian/why3/usr/lib/ocaml/why3/commands/why3ide.cmxs | sed -n 's/Name: //p' | xargs echo | tr ' ' ,)
    
    54
    +ifneq ($(wildcard debian/why3$(OCAML_STDLIB_DIR)/why3/commands/why3ide.cmxs),)
    
    55
    +  WHY3IDE_UNITS := $(shell ocamlobjinfo debian/why3$(OCAML_STDLIB_DIR)/why3/commands/why3ide.cmxs | sed -n 's/Name: //p' | xargs echo | tr ' ' ,)
    
    55 56
     else
    
    56
    -  WHY3IDE_UNITS := $(shell ocamlobjinfo debian/why3/usr/lib/ocaml/why3/commands/why3ide.cma | sed -n 's/Unit name: //p' | xargs echo | tr ' ' ,)
    
    57
    +  WHY3IDE_UNITS := $(shell ocamlobjinfo debian/why3$(OCAML_STDLIB_DIR)/why3/commands/why3ide.cma | sed -n 's/Unit name: //p' | xargs echo | tr ' ' ,)
    
    57 58
     endif
    
    58 59
     
    
    59
    -WHY3HYPO_UNITS := $(shell ocamlobjinfo debian/why3/usr/lib/ocaml/why3/plugins/hypothesis_selection.cma | sed -n 's/Unit name: //p' | xargs echo | tr ' ' ,)
    
    60
    +WHY3HYPO_UNITS := $(shell ocamlobjinfo debian/why3$(OCAML_STDLIB_DIR)/why3/plugins/hypothesis_selection.cma | sed -n 's/Unit name: //p' | xargs echo | tr ' ' ,)
    
    60 61
     
    
    61 62
     override_dh_ocaml:
    
    62 63
     	dh_ocaml --nodefined-map=why3:$(WHY3IDE_UNITS),$(WHY3HYPO_UNITS)

  • debian/why3.installdebian/why3.install.in
    1
    -debian/tmp/usr/bin
    
    2
    -debian/tmp/usr/share
    
    3
    -debian/tmp/usr/lib/*/why3/commands
    
    4
    -debian/tmp/usr/lib/*/why3/plugins
    
    5
    -debian/tmp/usr/lib/*/why3/why3*
    
    1
    +usr/bin
    
    2
    +usr/share
    
    3
    +@OCamlStdlibDir@/why3/commands
    
    4
    +@OCamlStdlibDir@/why3/plugins
    
    5
    +@OCamlStdlibDir@/why3/why3server
    
    6
    +@OCamlStdlibDir@/why3/why3cpulimit
    
    7
    +@OCamlStdlibDir@/why3/why3-call-pvs
    
    6 8
     share/bash/why3				/usr/share/bash-completion/completions
    
    7 9
     share/latex/why3lang.sty		/usr/share/texmf/tex/latex/misc


  • Reply to: