diff -Nru dbusada-0.6.0/debian/changelog dbusada-0.6.0/debian/changelog --- dbusada-0.6.0/debian/changelog 2020-12-19 13:39:28.000000000 +0000 +++ dbusada-0.6.0/debian/changelog 2022-05-09 08:46:57.000000000 +0000 @@ -1,3 +1,21 @@ +dbusada (0.6.0-5) unstable; urgency=medium + + * Reupload to unstable for the gnat-11 transition. + * Require dh-ada-library 7.5, which generates ada:Depends differently + + -- Nicolas Boulenguez Mon, 09 May 2022 10:46:57 +0200 + +dbusada (0.6.0-4) experimental; urgency=medium + + * Build with gcc-11 for experimental. Rename -dev package accordingly. + * Use unversioned debian_packaging.mk from gnat package. + * Standards-Version: 4.6.0 (no changes). + * Remove arch or version dependent paths from comments (hopefully + reducing the noise in future diffs). + * Use build flags when building tests/rebounder. + + -- Nicolas Boulenguez Thu, 31 Mar 2022 20:07:38 +0000 + dbusada (0.6.0-3) unstable; urgency=medium * Reupload to unstable for gnat- transition. diff -Nru dbusada-0.6.0/debian/control dbusada-0.6.0/debian/control --- dbusada-0.6.0/debian/control 2020-12-19 13:39:24.000000000 +0000 +++ dbusada-0.6.0/debian/control 2022-05-09 08:46:56.000000000 +0000 @@ -6,25 +6,25 @@ Build-Depends: asciidoctor, debhelper-compat (= 13), - dh-ada-library (>= 7), + dh-ada-library (>= 7.5), dh-sequence-ada-library, - g++-10, + g++-11, # scripts/generate-thin-binding.sh - gnat, gnat-10, -# This line is parsed by debian/rules. + gnat, + gnat-11, gprbuild, - libahven9-dev, + libahven10-dev, libdbus-1-dev, libdbus-glib-1-dev, pkg-config, ruby-pygments.rb, -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Rules-Requires-Root: no Homepage: https://www.codelabs.ch/dbus-ada/ Vcs-Browser: https://git.codelabs.ch/?p=dbus-ada.git Vcs-Git: https://git.codelabs.ch/git/dbus-ada.git -b debian -Package: libdbusada6-dev +Package: libdbusada7-dev # This line is parsed by debian/rules. Section: libdevel Architecture: any diff -Nru dbusada-0.6.0/debian/copyright dbusada-0.6.0/debian/copyright --- dbusada-0.6.0/debian/copyright 2020-11-17 17:01:04.000000000 +0000 +++ dbusada-0.6.0/debian/copyright 2022-05-08 15:27:33.000000000 +0000 @@ -10,7 +10,7 @@ Copyright: 2011 Tero Koskinen 2011-2020 Reto Buerki - 2018-2020 Nicolas Boulenguez + 2018-2022 Nicolas Boulenguez License: GPL-2+ with Ada exception This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru dbusada-0.6.0/debian/patches/gcc-11.diff dbusada-0.6.0/debian/patches/gcc-11.diff --- dbusada-0.6.0/debian/patches/gcc-11.diff 1970-01-01 00:00:00.000000000 +0000 +++ dbusada-0.6.0/debian/patches/gcc-11.diff 2022-05-08 15:27:33.000000000 +0000 @@ -0,0 +1,15 @@ +Descsription: generate the thin binding with gcc-11 +Forwarded: not-needed +Author: Nicolas Boulenguez + +--- a/scripts/generate-thin-binding.sh ++++ b/scripts/generate-thin-binding.sh +@@ -15,7 +15,7 @@ + dbus_lib=dbus-1 + dbus_includes="`pkg-config --cflags-only-I $dbus_lib | sed s/-I//g`" + dbus_h=`find $dbus_includes -name dbus.h` +-CXX=g++-10 ++CXX=g++-11 + + if ! mkdir $thindir; then + echo "The $thindir/ subdirectory exists, and may contain manual changes." diff -Nru dbusada-0.6.0/debian/patches/normalize-thin-binding-comments.diff dbusada-0.6.0/debian/patches/normalize-thin-binding-comments.diff --- dbusada-0.6.0/debian/patches/normalize-thin-binding-comments.diff 1970-01-01 00:00:00.000000000 +0000 +++ dbusada-0.6.0/debian/patches/normalize-thin-binding-comments.diff 2022-05-08 15:27:33.000000000 +0000 @@ -0,0 +1,16 @@ +Descsription: remove arch or version dependent paths from the thin binding +Forwarded: not-needed +Author: Nicolas Boulenguez + +--- a/scripts/generate-thin-binding.sh ++++ b/scripts/generate-thin-binding.sh +@@ -32,6 +32,9 @@ + done + sed -i 's/[a-z0-9_]*dbus_dbus_/dbus_/g' * + ++# Remove arch or version dependent paths from comments. ++sed -i 's| -- /usr/.*/| -- |' * ++ + # Fix a warning about unused entities. + sed -i '/^with Interfaces\.C; use Interfaces\.C;$/d' \ + dbus_h.ads \ diff -Nru dbusada-0.6.0/debian/patches/series dbusada-0.6.0/debian/patches/series --- dbusada-0.6.0/debian/patches/series 2020-11-17 17:02:58.000000000 +0000 +++ dbusada-0.6.0/debian/patches/series 2022-05-08 15:27:33.000000000 +0000 @@ -1,3 +1,6 @@ doc-no-fonts.diff 0001-Disable-message-dispatcher-tests.patch 0002-Strip-stdarg_h.Class_va_list-again-from-thin-binding.patch +normalize-thin-binding-comments.diff +gcc-11.diff +test-build-flags.diff diff -Nru dbusada-0.6.0/debian/patches/test-build-flags.diff dbusada-0.6.0/debian/patches/test-build-flags.diff --- dbusada-0.6.0/debian/patches/test-build-flags.diff 1970-01-01 00:00:00.000000000 +0000 +++ dbusada-0.6.0/debian/patches/test-build-flags.diff 2022-05-08 15:27:33.000000000 +0000 @@ -0,0 +1,15 @@ +Description: use build flags when building tests/rebounder + This cosmetic patch silents some automatic log checkers. +Author: Nicolas Boulenguez + +--- a/Makefile ++++ b/Makefile +@@ -73,7 +73,7 @@ + @mkdir -p $@ + + $(TESTBIN): $(TESTDIR)/c/dbus-rebound.c | $(OBJDIR)/tests +- gcc $? $(PKGCONF) -o $@ ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(PKGCONF) $(LDLIBS) + + doc: + @$(MAKE) -C doc diff -Nru dbusada-0.6.0/debian/rules dbusada-0.6.0/debian/rules --- dbusada-0.6.0/debian/rules 2020-11-17 17:01:04.000000000 +0000 +++ dbusada-0.6.0/debian/rules 2022-05-08 15:27:33.000000000 +0000 @@ -1,9 +1,6 @@ #!/usr/bin/make -f $(foreach line,$(shell sed -n '\ - s/^ gnat, gnat-\([0-9.]\+\),$$/ \ - gnat_version:=\1 \ - /p;\ s/^Package: libdbusada\([0-9.]\+\)$$/ \ VERSION:=\1 \ /p;\ @@ -17,10 +14,11 @@ DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-undefined \ -Wl,--no-copy-dt-needed-entries -Wl,--no-allow-shlib-undefined include /usr/share/dpkg/buildflags.mk -include /usr/share/ada/debian_packaging-$(gnat_version).mk +include /usr/share/dpkg/buildopts.mk +include /usr/share/ada/debian_packaging.mk make_vars := \ - GNAT_BUILDER_FLAGS='$(BUILDER_OPTIONS)' \ + GNAT_BUILDER_FLAGS='$(GPRBUILDFLAGS)' \ VERSION=$(VERSION) %: