From 6c3ffd8ceb680b1f496d946cdb1a40299acb64d5 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez Date: Sat, 30 Dec 2023 00:43:49 +0100 Subject: [PATCH] Build with gnat-13, dh-ada-library/9. Rename -dev and so packages Upload to experimental because of the following transitions. Build with gnat-13. Rename library package with new SOversion. Build with dh-ada-library/9. Remove version from -dev package name. Provide a name containing a hash. Build-Depend: gnat instead of gnat-13. Break/Replace previous -devs. doc-base, rules, tests: simplified by an unversioned -dev. --- debian/changelog | 11 +++++++++++ debian/control | 16 +++++++++------- debian/libalog-doc.doc-base | 4 ++-- debian/rules | 5 ----- debian/tests/control | 2 +- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2a9aba8..fc6b2f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libalog (0.6.2-4) experimental; urgency=medium + + * Upload to experimental because of the following transitions. + * Build with gnat-13. Rename library package with new SOversion. + * Build with dh-ada-library/9. Remove version from -dev package name. + Provide a name containing a hash. + Build-Depend: gnat instead of gnat-13. Break/Replace previous -devs. + * doc-base, rules, tests: simplified by an unversioned -dev. + + -- Nicolas Boulenguez Fri, 29 Dec 2023 23:29:07 +0000 + libalog (0.6.2-3) unstable; urgency=medium * Break/Replace libalog*-dev since oldstable. Closes: #1035004. diff --git a/debian/control b/debian/control index 394c682..43058c3 100644 --- a/debian/control +++ b/debian/control @@ -7,14 +7,15 @@ Uploaders: Reto Buerki , Build-Depends: debhelper-compat (= 13), Build-Depends-Arch: - dh-ada-library (>= 8.2), + dh-ada-library (>= 9.1), dh-sequence-ada-library, - gnat-12, + gnat (>= 13), gprbuild, - libahven11-dev, + libahven-dev, Build-Depends-Indep: asciidoctor, ruby-pygments.rb, +# Upstream runs scour, no need for dh-sequence-scour and helpers. scour, Standards-Version: 4.6.2 Rules-Requires-Root: no @@ -22,7 +23,7 @@ Homepage: https://www.codelabs.ch/alog/ Vcs-Git: https://git.codelabs.ch/git/alog.git -b debian Vcs-Browser: https://git.codelabs.ch/?p=alog.git -Package: libalog0.6.2 +Package: libalog0.6.3 Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} @@ -31,9 +32,10 @@ Description: Logging framework for Ada easily extendable. Alog provides file-based and syslog logging facilities and log-level support. -Package: libalog8-dev -Breaks: libalog4-dev, libalog5-dev, libalog6-dev, libalog7-dev -Replaces: libalog4-dev, libalog5-dev, libalog6-dev, libalog7-dev +Package: libalog-dev +Breaks: libalog4-dev, libalog5-dev, libalog6-dev, libalog7-dev, libalog8-dev +Replaces: libalog4-dev, libalog5-dev, libalog6-dev, libalog7-dev, libalog8-dev +Provides: ${ada:Provides} Section: libdevel Architecture: any Depends: ${misc:Depends}, ${ada:Depends} diff --git a/debian/libalog-doc.doc-base b/debian/libalog-doc.doc-base index 885f508..9352a6a 100644 --- a/debian/libalog-doc.doc-base +++ b/debian/libalog-doc.doc-base @@ -7,5 +7,5 @@ Abstract: Alog - Ada Logging Library documentation. Section: Programming Format: HTML -Index: /usr/share/doc/libalog-doc/index.html -Files: /usr/share/doc/libalog-doc/alog-arch.svg +Index: /usr/share/doc/libalog-dev/index.html +Files: /usr/share/doc/libalog-dev/alog-arch.svg diff --git a/debian/rules b/debian/rules index 157a26f..f083449 100755 --- a/debian/rules +++ b/debian/rules @@ -35,8 +35,3 @@ override_dh_auto_install-arch: override_dh_auto_test-indep: override_dh_auto_test-arch: $(MAKE) tests - -# Prevent a warning about doc-main-package autodetection. -override_dh_installdocs override_dh_installexamples: override_%: - $* --package=libalog-doc --doc-main-package=libalog-doc - $* --remaining-packages diff --git a/debian/tests/control b/debian/tests/control index fdf42b4..e84600e 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,2 +1,2 @@ Tests: link-with-shared -Depends: @, gprbuild +Depends: gprbuild, libalog-dev