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

[Git][ocaml-team/ocaml-fdkaac][master] 2 commits: Add pristine-tar setting to debian/gbp.conf



Title: GitLab

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

Commits:

  • 4705ca63
    by Stephane Glondu at 2023-08-13T12:55:14+02:00
    Add pristine-tar setting to debian/gbp.conf
    
  • b636a7df
    by Stephane Glondu at 2023-08-13T12:55:14+02:00
    Use ocaml_dune DH buildsystem
    

5 changed files:

Changes:

  • debian/changelog
    1
    +ocaml-fdkaac (0.3.3~gitd3393eb-2) UNRELEASED; urgency=medium
    
    2
    +
    
    3
    +  * Use ocaml_dune DH buildsystem
    
    4
    +
    
    5
    + -- Stéphane Glondu <glondu@debian.org>  Sun, 13 Aug 2023 12:42:26 +0200
    
    6
    +
    
    1 7
     ocaml-fdkaac (0.3.3~gitd3393eb-1) unstable; urgency=medium
    
    2 8
     
    
    3 9
       * New upstream version (Closes: #962220)
    

  • debian/control
    ... ... @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 10),
    8 8
                    ocaml-dune,
    
    9 9
                    dh-buildinfo,
    
    10 10
                    ocaml,
    
    11
    -               dh-ocaml (>= 0.9),
    
    11
    +               dh-ocaml (>= 1.2),
    
    12 12
                    libdune-ocaml-dev,
    
    13 13
                    libfdk-aac-dev (>= 0.1.1),
    
    14 14
                    ocaml-findlib (>= 1.2.4),
    

  • debian/debian-dune
    1
    +fdkaac

  • debian/gbp.conf
    1
    +[DEFAULT]
    
    2
    +pristine-tar = True
    
    3
    +
    
    1 4
     [buildpackage]
    
    2 5
     extra-repository = deb http://deb.debian.org/debian sid main contrib non-free

  • debian/rules
    1 1
     #!/usr/bin/make -f
    
    2
    +# -*- makefile -*-
    
    2 3
     
    
    3 4
     include /usr/share/ocaml/ocamlvars.mk
    
    4 5
     
    
    5
    -DESTDIR := $(CURDIR)/debian/tmp
    
    6
    -export OCAMLFIND_DESTDIR=$(DESTDIR)$(OCAML_STDLIB_DIR)
    
    7
    -
    
    8 6
     %:
    
    9
    -	dh $@
    
    10
    -
    
    11
    -override_dh_auto_build:
    
    12
    -	dune build @install --verbose
    
    13
    -
    
    14
    -override_dh_auto_install:
    
    15
    -	mkdir -p $(DESTDIR)
    
    16
    -	dune install --prefix=$(DESTDIR)/usr --libdir=$(OCAMLFIND_DESTDIR) --verbose
    
    17
    -	dh_install
    
    7
    +	dh $@ --with ocaml --buildsystem ocaml_dune
    
    18 8
     
    
    19
    -override_dh_auto_clean:
    
    20
    -	dh_clean
    
    21
    -	dh_ocamlinit
    9
    +override_dh_ocaml:
    
    10
    +	dh_ocaml --nodefined-map=libfdkaac-ocaml-dynlink:Fdkaac


  • Reply to: