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


Commits:
9e892885 by Stephane Glondu at 2022-01-25T16:31:38+01:00
Update packaging

- - - - -
6c8f6d7e by Stephane Glondu at 2022-01-25T16:31:47+01:00
Update changelog and prepare upload to unstable

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+pxp (1.2.9-3) unstable; urgency=medium
+
+  * Team upload
+  * Remove explicit dependency on ocaml-nox-$ABI
+  * Switch to dh, bump debhelper compat level to 13
+  * Bump Standards-Version to 4.6.0
+  * Bump debian/watch version to 4
+  * Add Rules-Requires-Root: no
+
+ -- Stéphane Glondu <[email protected]>  Tue, 25 Jan 2022 16:16:27 +0100
+
 pxp (1.2.9-2) unstable; urgency=medium
 
   [ Stéphane Glondu ]


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


=====================================
debian/control
=====================================
@@ -3,15 +3,15 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <[email protected]>
 Build-Depends:
- debhelper (>= 9),
- ocaml-nox,
- dh-ocaml (>= 0.9),
+ debhelper-compat (= 13),
+ ocaml,
+ dh-ocaml,
  ocaml-findlib,
  libocamlnet-ocaml-dev (>= 4.1),
  ocaml-ulex,
- camlp4,
- cdbs
-Standards-Version: 4.0.0
+ camlp4
+Standards-Version: 4.6.0
+Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/ocaml-team/pxp.git
 Vcs-Browser: https://salsa.debian.org/ocaml-team/pxp
 Homepage: http://projects.camlcity.org/projects/pxp.html
@@ -19,7 +19,6 @@ Homepage: http://projects.camlcity.org/projects/pxp.html
 Package: libpxp-ocaml-dev
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
  libocamlnet-ocaml-dev,
  ocaml-findlib,
  ocaml-ulex,


=====================================
debian/rules
=====================================
@@ -1,20 +1,25 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
+
+include /usr/share/ocaml/ocamlvars.mk
 
 PKGNAME = libpxp-ocaml-dev
 DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
 
-configure/$(PKGNAME)::
+%:
+       dh $@ --with ocaml
+
+override_dh_auto_configure:
        ./configure -without-wlex -without-wlex-compat
        rm -f README    # it's a symlink, the real one is doc/README
+
+override_dh_auto_build:
+       $(MAKE)
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-build/$(PKGNAME)::
        $(MAKE) opt
 endif
-binary-post-install/$(PKGNAME)::
+
+override_dh_auto_install:
+       $(MAKE) install DESTDIR=$(DESTDIR)
        -for f in 
debian/$(PKGNAME)/usr/share/doc/$(PKGNAME)/examples/xmlforms/styles/* ; do \
                test ! -r $$f && rm -f $$f ; \
        done


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
+version=4
 opts=uversionmangle=s/&#48\x3b/0/ \
 http://download.camlcity.org/download/pxp-(.*)\.tar\.gz



View it on GitLab: 
https://salsa.debian.org/ocaml-team/pxp/-/compare/efa776d4bd37890846f9534417bd3bcf1491cfd1...6c8f6d7ec4f1b6014a3db6bc9b856d3a04527cb1

-- 
View it on GitLab: 
https://salsa.debian.org/ocaml-team/pxp/-/compare/efa776d4bd37890846f9534417bd3bcf1491cfd1...6c8f6d7ec4f1b6014a3db6bc9b856d3a04527cb1
You're receiving this email because of your account on salsa.debian.org.


Reply via email to