diff -Nru libxmlezout-1.06.2/debian/changelog libxmlezout-1.06.2/debian/changelog --- libxmlezout-1.06.2/debian/changelog 2020-12-12 13:49:20.000000000 +0000 +++ libxmlezout-1.06.2/debian/changelog 2022-05-28 16:30:09.000000000 +0000 @@ -1,3 +1,30 @@ +libxmlezout (1.06.2-7) unstable; urgency=medium + + * d/copyright: fix syntax errors spotted by lintian + + -- Nicolas Boulenguez Sat, 28 May 2022 18:30:09 +0200 + +libxmlezout (1.06.2-6) unstable; urgency=medium + + * Reupload to unstable for the gnat-11 transition + * Adopt the package. Closes: #834507. + * Sort build dependencies. + * Rename license according to recent guidelines. + * Remove obsolete or redundant comments. + * Configure branch names for git-buildpackage + * Require dh-ada-library 7.5, which generates ada:Depends differently + + -- Nicolas Boulenguez Sun, 08 May 2022 18:36:14 +0200 + +libxmlezout (1.06.2-5) experimental; urgency=medium + + * Build with gnat11 in experimental. Rename -dev package accordingly. + * Build-Depends: drop obsolete version restriction. + * Use unversioned debian_packaging.mk from gnat package. + * Pass build flags via the environment. + + -- Nicolas Boulenguez Sun, 20 Mar 2022 21:23:51 +0000 + libxmlezout (1.06.2-4) unstable; urgency=medium * Reupload to unstable for the transition to gnat-10. @@ -197,7 +224,3 @@ * First upstream version. Closes: #562088. -- Xavier Grave Wed, 23 Dec 2009 12:25:00 +0100 - -Local variables: -left-margin: 2 -End: diff -Nru libxmlezout-1.06.2/debian/control libxmlezout-1.06.2/debian/control --- libxmlezout-1.06.2/debian/control 2020-12-12 13:49:20.000000000 +0000 +++ libxmlezout-1.06.2/debian/control 2022-05-28 16:29:48.000000000 +0000 @@ -1,22 +1,22 @@ Source: libxmlezout Priority: optional Section: libs -Maintainer: Xavier Grave -Uploaders: Nicolas Boulenguez , +Maintainer: Nicolas Boulenguez +Uploaders: Ludovic Brenta Build-Depends: debhelper-compat (= 13), - gnat, gnat-10, -# This line is parsed by debian/rules. + dh-ada-library (>= 7.5), dh-sequence-ada-library, - gprbuild (>= 2015-2) -# gprbuild compatible with gnat-6 -Standards-Version: 4.5.0 + gnat, + gnat-11, + gprbuild, +Standards-Version: 4.6.0 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/debian/libxmlezout Vcs-Git: https://salsa.debian.org/debian/libxmlezout.git -Package: libxmlezout8-dev +Package: libxmlezout9-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, ${ada:Depends} diff -Nru libxmlezout-1.06.2/debian/copyright libxmlezout-1.06.2/debian/copyright --- libxmlezout-1.06.2/debian/copyright 2020-12-11 07:45:34.000000000 +0000 +++ libxmlezout-1.06.2/debian/copyright 2022-05-28 16:29:48.000000000 +0000 @@ -3,13 +3,11 @@ Files: * Copyright: 2003-2009 McKae Technologies, Marc Criley -License: GMGPL +License: GPL-2+ with ada-generic exception Files: debian/* GNUmakefile xmlezout.gpr Copyright: 2009-2018 Xavier Grave - 2016-2020 Nicolas Boulenguez -License: GPL-3+ - + 2016-2022 Nicolas Boulenguez License: GPL-3+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,9 +22,7 @@ The full text of the GNU General Public License version 3 is available in /usr/share/common-licenses/GPL-3 -License: GMGPL - Copyright (c) 2003-2009 McKae Technologies - . +License: GPL-2+ with ada-generic exception The McKae software utilities are free software; you can redistribute it and/or modify it under terms of the GNU General Public License as published by the Free Software Foundation; @@ -47,8 +43,5 @@ exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. . - The McKae Software Utilities are maintained by McKae Technologies - (http://www.mckae.com). - . The full text of the GNU General Public License version 2 is available in /usr/share/common-licenses/GPL-2 diff -Nru libxmlezout-1.06.2/debian/gbp.conf libxmlezout-1.06.2/debian/gbp.conf --- libxmlezout-1.06.2/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ libxmlezout-1.06.2/debian/gbp.conf 2022-05-28 16:29:48.000000000 +0000 @@ -0,0 +1,3 @@ +[DEFAULT] +debian-branch = debian/master +upstream-branch = upstream/master diff -Nru libxmlezout-1.06.2/debian/rules libxmlezout-1.06.2/debian/rules --- libxmlezout-1.06.2/debian/rules 2020-12-11 07:45:34.000000000 +0000 +++ libxmlezout-1.06.2/debian/rules 2022-05-28 16:29:48.000000000 +0000 @@ -1,30 +1,23 @@ #!/usr/bin/make -f -# Debian build script for XML EZ OUT -# Copyright (c) 2009-2014 Xavier Grave -# 2016-2019 Nicolas Boulenguez -$(foreach line,$(shell sed -n '\ - s/^ gnat, gnat-\([0-9.]\+\),$$/ \ - GNAT_VERSION:=\1 \ - /p;\ - s/^Package: \(lib[a-z-]\+\)\([0-9.]\+\)$$/ \ - SONAME:=\1.so.\2 \ - /p;\ - ' debian/control),$(eval $(line))) +soversion != \ + sed -n '/^Package: libxmlezout\([0-9.]\+\)$$/{s//\1/p;q}' debian/control +DPKG_EXPORT_BUILDFLAGS := 1 DEB_BUILD_MAINT_OPTIONS := hardening=+all 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 %: dh $@ .PHONY: override_dh_auto_build override_dh_auto_build: - dh_auto_build -- $(foreach v, \ - ADAFLAGS BUILDER_OPTIONS LDFLAGS SONAME \ - ,"$(v)=$($(v))") + dh_auto_build -- \ + SONAME=libxmlezout.so.$(soversion) \ + BUILDER_OPTIONS='$(GPRBUILDFLAGS)' + .PHONY: override_dh_auto_install -# Clean target is OK.