diff -Nru libaunit-18/CHANGES libaunit-19/CHANGES --- libaunit-18/CHANGES 2018-05-25 04:59:36.000000000 +0000 +++ libaunit-19/CHANGES 2019-04-30 04:07:25.000000000 +0000 @@ -1 +1 @@ -{anod.anod: 6a0487d59525e9ed7a4fb16cfbc25c7290671150, aunit: 331778, aunit.anod: 2d8defe59c59a81d87a161f4ebba050fe9421b55} +{anod.anod: df77c06d8887b3536f1f28cf5dbce113b2c49530, aunit: 47b808f, aunit.anod: 3dd4590f0ae0aa3d5f462101d6710dbf9bce4239} diff -Nru libaunit-18/debian/changelog libaunit-19/debian/changelog --- libaunit-18/debian/changelog 2018-10-27 13:09:51.000000000 +0000 +++ libaunit-19/debian/changelog 2020-02-25 10:22:20.000000000 +0000 @@ -1,3 +1,31 @@ +libaunit (19-3) unstable; urgency=medium + + * Reupload to unstable for gnat-9 transition. + * Let rules only include the needed dpkg-dev snippet. + * Drop redundant branch from Vcs-Git. + * Standards-Versions: 4.5.0. + * Wrap and sort dependencies. Use Debhelper 12 dh-sequence syntax. + + -- Nicolas Boulenguez Tue, 25 Feb 2020 11:22:20 +0100 + +libaunit (19-2) experimental; urgency=medium + + * Build-Depend: gnat-9. Closes: #939621. Then 19-dev Depends: gnat-9 as + 18-dev on gnat-8. Each compiler conflicts with previous versions of + itself exactly in order to prevent coinstallations of -dev versions. + + -- Nicolas Boulenguez Sat, 07 Sep 2019 01:45:07 +0200 + +libaunit (19-1) experimental; urgency=medium + + * New upstream release, built in experimental with gnat-9. + Rename library and -dev package accordingly. + * Move VCS to salsa.debian.org. + * Debhelper 12. Examples are not compressed anymore. + * Standards-Version: 4.4.0. + + -- Nicolas Boulenguez Sun, 01 Sep 2019 21:41:19 +0200 + libaunit (18-2) unstable; urgency=medium * Rebuild in unstable for gnat-8 transition. diff -Nru libaunit-18/debian/compat libaunit-19/debian/compat --- libaunit-18/debian/compat 2018-06-09 12:54:38.000000000 +0000 +++ libaunit-19/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru libaunit-18/debian/control libaunit-19/debian/control --- libaunit-18/debian/control 2018-06-09 12:54:38.000000000 +0000 +++ libaunit-19/debian/control 2020-01-21 10:30:45.000000000 +0000 @@ -2,21 +2,23 @@ Section: libdevel Priority: optional Maintainer: Nicolas Boulenguez -Build-Depends: debhelper (>= 11), - gnat, gnat-8, +Build-Depends: + debhelper-compat (= 12), + dh-sequence-ada-library, + gnat, gnat-9, # This line is parsed by debian/rules. # gprbuild compatible with gnat-6 gprbuild (>= 2015-2), -# dh-ada-library knowing that -dbg packages are obsolete. - dh-ada-library (>= 6.7), # To deduplicate examples in rules. - rdfind, symlinks -Standards-Version: 4.1.4 + rdfind, + symlinks, +Standards-Version: 4.5.0 +Rules-Requires-Root: no Homepage: https://www.adacore.com/community -Vcs-Mtn: mtn://www.ada-france.org?org.debian.libaunit -Vcs-Browser: http://www.ada-france.org:8081/branch/changes/org.debian.libaunit +Vcs-Browser: https://salsa.debian.org/debian/libaunit +Vcs-Git: https://salsa.debian.org/debian/libaunit.git -Package: libaunit18-dev +Package: libaunit19-dev Architecture: any Depends: ${misc:Depends}, ${ada:Depends} Description: AUnit, a unit testing framework for Ada: development @@ -34,7 +36,7 @@ It is available at http://docs.adacore.com/aunit-docs/html/aunit_cb/aunit_cb.html. -Package: libaunit18 +Package: libaunit19 Section: libs Architecture: any Multi-Arch: same diff -Nru libaunit-18/debian/copyright libaunit-19/debian/copyright --- libaunit-18/debian/copyright 2018-06-09 12:54:38.000000000 +0000 +++ libaunit-19/debian/copyright 2019-09-01 19:32:47.000000000 +0000 @@ -11,12 +11,12 @@ directory only contains some unused duplicates. Files: * -Copyright: 2006-2018 AdaCore +Copyright: 2006-2019 AdaCore : 2004-2008 Free Software Foundation License: GPL-3+ Files: debian/* -Copyright: 2013-2018 Nicolas Boulenguez +Copyright: 2013-2019 Nicolas Boulenguez 2006-2012 Stephen Leake 2004-2006 Ludovic Brenta License: GPL-3+ diff -Nru libaunit-18/debian/patches/adapt_projects.diff libaunit-19/debian/patches/adapt_projects.diff --- libaunit-18/debian/patches/adapt_projects.diff 2018-06-09 12:54:38.000000000 +0000 +++ libaunit-19/debian/patches/adapt_projects.diff 2019-09-01 19:39:46.000000000 +0000 @@ -12,10 +12,8 @@ builds, so the patch modifies the directory names. As far as I know, in normal usage, these directories are only used internally by gprbuild/install/clean. - . - Forwarded by private mail to report@adacore.com on 2018/6/11. Author: Nicolas Boulenguez -Forwarded: yes +Forwarded: https://github.com/AdaCore/aunit/pull/4 --- a/lib/gnat/aunit.gpr +++ b/lib/gnat/aunit.gpr @@ -65,7 +63,7 @@ Compiler'Default_Switches ("ada") & ("-fno-strict-aliasing"); --- a/lib/gnat/aunit_shared.gpr +++ b/lib/gnat/aunit_shared.gpr -@@ -13,7 +13,20 @@ +@@ -14,7 +14,20 @@ Runtime : Runtime_Type := external ("RUNTIME", "full"); diff -Nru libaunit-18/debian/patches/user_gpr_args.diff libaunit-19/debian/patches/user_gpr_args.diff --- libaunit-18/debian/patches/user_gpr_args.diff 2018-06-09 12:54:38.000000000 +0000 +++ libaunit-19/debian/patches/user_gpr_args.diff 2019-09-01 19:39:19.000000000 +0000 @@ -1,7 +1,6 @@ Description: Allow local gpr options on the make command line. - Forwarded by private mail to report@adacore.com on 2018/6/11. Author: Nicolas Boulenguez -Forwarded: yes +Forwarded: https://github.com/AdaCore/aunit/pull/4 --- a/Makefile +++ b/Makefile diff -Nru libaunit-18/debian/README.source libaunit-19/debian/README.source --- libaunit-18/debian/README.source 2018-06-09 12:54:38.000000000 +0000 +++ libaunit-19/debian/README.source 2019-09-01 19:31:16.000000000 +0000 @@ -26,42 +26,4 @@ Repackage it without generated files. # mk-origtargz --repack --compression=xz --version=YY ../PKG-gpl-YYYY-src.tar.gz -The monotone repository at www.ada-france.org once used to track GPL -versions from the public part of the upstream CVS repository in a -branch named com.adacore.PKG, and the repackaged sources in a -branch named com.adacore.PKG.debian, but this seems redundant with -the public git repository now. - -Use of the version control system ---------------------------------- - -You may either create an empty Monotone database -# mtn -d $db db init -or use an existing one. - -All work on this package is tracked in the -www.ada-france.org monotone repository. -# debian_branch=org.debian.libaws tracks the Debian packaging - -Download the branches from the server to your database. The first -time you contact this server, monotone will show its key. You should -check that it matches f8a11727e8983cf9083c08c6a2acaa27e439dd39. -# server=www.ada-france.org -# mtn -d $db pull mtn://$server?$debian_branch - -Inspect the unpatched source tree. -# tar xf libaunit_3.7.1.orig.tar.xz -# cd aunit-3.7.0w-src -# mtn -d $db checkout -r h:$debian_branch . - -Build the package -# debuild - -Beware that: -- mtn status does not list all changes. Try "mtn list missing", "mtn - list unknown", "mtn list ignored" and "mtn status" to get the - equivalent of "git status". -- Monotone will detect changes outside debian/ caused by patches. - Always "quilt pop -a" when preparing a commit. - - -- Nicolas Boulenguez , Mon, 7 May 2018 21:51:04 +0200 + -- Nicolas Boulenguez , Sun, 1 Sep 2019 21:25:53 +0200 diff -Nru libaunit-18/debian/rules libaunit-19/debian/rules --- libaunit-18/debian/rules 2018-06-09 12:54:38.000000000 +0000 +++ libaunit-19/debian/rules 2019-12-17 11:55:00.000000000 +0000 @@ -13,12 +13,14 @@ ' debian/control),$(eval $(line))) DEB_BUILD_MAINT_OPTIONS := hardening=+all -include /usr/share/dpkg/default.mk +DEB_ADAFLAGS_MAINT_APPEND := -gnatfno -gnatwa -gnatVa +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 -ADAFLAGS += -gnatfno -gnatwa -gnatVa %: - dh $@ --with ada-library + dh $@ ###################################################################### # Ignore upstream Makefile/configure. @@ -46,10 +48,3 @@ rdfind -outputname /dev/null -makesymlinks true $(INSTALLED_EXAMPLES) # symlinks to make them relative (only if -indep build). symlinks -r -s -c $(INSTALLED_EXAMPLES) - -###################################################################### -.PHONY: override_dh_compress -override_dh_compress: - dh_compress --package=$(DEV_PKG) --exclude=usr/share/doc/$(DEV_PKG)/examples/ -# Check calculator/tests/stack-test.adb.gz - dh_compress --remaining-packages diff -Nru libaunit-18/debian/tests/examples libaunit-19/debian/tests/examples --- libaunit-18/debian/tests/examples 2018-06-09 12:54:38.000000000 +0000 +++ libaunit-19/debian/tests/examples 2019-09-07 05:29:03.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh set -C -e -f -u dev_pkg="`sed -n '/^Package: \(libaunit[0-9.]\+-dev\)$/{s//\1/;p;q}' debian/control`" -cd "$ADTTMP" +cd "$AUTOPKGTEST_TMP" cp -r /usr/share/doc/$dev_pkg/examples . cd examples diff -Nru libaunit-18/debian/tests/link-with-shared libaunit-19/debian/tests/link-with-shared --- libaunit-18/debian/tests/link-with-shared 2018-06-09 12:54:38.000000000 +0000 +++ libaunit-19/debian/tests/link-with-shared 2019-09-07 05:29:03.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh set -C -e -f -u -cd "$ADTTMP" +cd "$AUTOPKGTEST_TMP" MAIN=test diff -Nru libaunit-18/include/aunit/framework/aunit.adb libaunit-19/include/aunit/framework/aunit.adb --- libaunit-18/include/aunit/framework/aunit.adb 2018-05-25 04:59:36.000000000 +0000 +++ libaunit-19/include/aunit/framework/aunit.adb 2019-04-30 04:07:25.000000000 +0000 @@ -7,7 +7,7 @@ -- B o d y -- -- -- -- -- --- Copyright (C) 2008-2011, AdaCore -- +-- Copyright (C) 2008-2018, AdaCore -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -32,20 +32,33 @@ with Ada.Unchecked_Conversion; with System.Storage_Elements; use System.Storage_Elements; with AUnit.Memory; use AUnit.Memory; +with System; package body AUnit is + -- The allocation strategy below is based on a low-level trick that mimics + -- what GNAT would generate for a regular allocator. Therefore it needs to + -- be protected from changes of Default_Scalar_Storage_Order setting. + + pragma Warnings (Off, "scalar storage order"); + type Bounds is record First : Natural; Last : Natural; - end record; + end record + with Bit_Order => System.Default_Bit_Order, + Scalar_Storage_Order => System.Default_Bit_Order; + type Bounds_Access is access all Bounds; type Fat_Pointer is record Address : System.Address; Bound_Address : Bounds_Access; - end record; - pragma Pack (Fat_Pointer); + end record + with Bit_Order => System.Default_Bit_Order, + Scalar_Storage_Order => System.Default_Bit_Order; + + pragma Warnings (On, "scalar storage order"); ------------------- -- Message_Alloc -- diff -Nru libaunit-18/include/aunit/framework/nodealloc/aunit-memory.adb libaunit-19/include/aunit/framework/nodealloc/aunit-memory.adb --- libaunit-18/include/aunit/framework/nodealloc/aunit-memory.adb 1970-01-01 00:00:00.000000000 +0000 +++ libaunit-19/include/aunit/framework/nodealloc/aunit-memory.adb 2019-04-30 04:07:25.000000000 +0000 @@ -0,0 +1,58 @@ +------------------------------------------------------------------------------ +-- -- +-- GNAT RUN-TIME COMPONENTS -- +-- -- +-- A U N I T . M E M O R Y -- +-- -- +-- B o d y -- +-- -- +-- Copyright (C) 2001-2003 Free Software Foundation, Inc. -- +-- Copyright (C) 2008-2018, AdaCore -- +-- -- +-- GNAT is free software; you can redistribute it and/or modify it under -- +-- terms of the GNU General Public License as published by the Free Soft- -- +-- ware Foundation; either version 3, or (at your option) any later ver- -- +-- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- +-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- +-- or FITNESS FOR A PARTICULAR PURPOSE. -- +-- -- +-- -- +-- -- +-- -- +-- -- +-- You should have received a copy of the GNU General Public License and -- +-- a copy of the GCC Runtime Library Exception along with this program; -- +-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -- +-- . -- +-- -- +-- GNAT is maintained by AdaCore (http://www.adacore.com) -- +-- -- +------------------------------------------------------------------------------ + +-- Memory allocation implementation using the gnat runtime methods with +-- no support for deallocation. + +package body AUnit.Memory is + + ----------- + -- Alloc -- + ----------- + + function AUnit_Alloc (Size : size_t) return System.Address is + function RT_Malloc (Size : size_t) return System.Address; + pragma Import (C, RT_Malloc, "__gnat_malloc"); + begin + return RT_Malloc (Size); + end AUnit_Alloc; + + ---------- + -- Free -- + ---------- + + procedure AUnit_Free (Obj : System.Address) is + pragma Unreferenced (Obj); + begin + null; + end AUnit_Free; + +end AUnit.Memory; diff -Nru libaunit-18/include/aunit/framework/nodealloc/aunit-memory-utils.adb libaunit-19/include/aunit/framework/nodealloc/aunit-memory-utils.adb --- libaunit-18/include/aunit/framework/nodealloc/aunit-memory-utils.adb 1970-01-01 00:00:00.000000000 +0000 +++ libaunit-19/include/aunit/framework/nodealloc/aunit-memory-utils.adb 2019-04-30 04:07:25.000000000 +0000 @@ -0,0 +1,43 @@ +------------------------------------------------------------------------------ +-- -- +-- GNAT COMPILER COMPONENTS -- +-- -- +-- A U N I T . M E M O R Y . U T I L S -- +-- -- +-- B o d y -- +-- -- +-- -- +-- Copyright (C) 2008-2012, AdaCore -- +-- -- +-- GNAT is free software; you can redistribute it and/or modify it under -- +-- terms of the GNU General Public License as published by the Free Soft- -- +-- ware Foundation; either version 3, or (at your option) any later ver- -- +-- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- +-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- +-- or FITNESS FOR A PARTICULAR PURPOSE. -- +-- -- +-- -- +-- -- +-- -- +-- -- +-- You should have received a copy of the GNU General Public License and -- +-- a copy of the GCC Runtime Library Exception along with this program; -- +-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -- +-- . -- +-- -- +-- GNAT is maintained by AdaCore (http://www.adacore.com) -- +-- -- +------------------------------------------------------------------------------ + +package body AUnit.Memory.Utils is + + --------------- + -- Gen_Alloc -- + --------------- + + function Gen_Alloc return Name is + begin + return new Object; + end Gen_Alloc; + +end AUnit.Memory.Utils; diff -Nru libaunit-18/lib/gnat/aunit_shared.gpr libaunit-19/lib/gnat/aunit_shared.gpr --- libaunit-18/lib/gnat/aunit_shared.gpr 2018-05-25 04:59:36.000000000 +0000 +++ libaunit-19/lib/gnat/aunit_shared.gpr 2019-04-30 04:07:25.000000000 +0000 @@ -5,7 +5,8 @@ type Runtime_Type is ( "full", -- used for all full capability runtimes - "zfp", -- used for all zfp/sfp/minimal runtimes + "zfp", -- used for typical zfp/sfp/minimal runtimes + "zfp-cross", -- used for zfp runtimes on some cross ports "ravenscar", -- used for full ravenscar runtimes "ravenscar-cert", -- used for ravenscar-cert runtimes "cert" -- used for cert runtimes @@ -19,7 +20,7 @@ type Exception_Type is ("fullexception", "certexception", "zfpexception"); type Calendar_Type is ("calendar", "nocalendar"); - type Memory_type is ("nativememory", "staticmemory"); + type Memory_type is ("nativememory", "nodealloc", "staticmemory"); Except : Exception_Type := "fullexception"; Calend : Calendar_Type := "calendar"; @@ -29,6 +30,10 @@ when "zfp" => Except := "zfpexception"; Calend := "nocalendar"; + Memory := "nodealloc"; + when "zfp-cross" => + Except := "zfpexception"; + Calend := "nocalendar"; Memory := "staticmemory"; when "ravenscar" => Except := "certexception"; diff -Nru libaunit-18/version_information libaunit-19/version_information --- libaunit-18/version_information 2018-05-25 04:59:24.000000000 +0000 +++ libaunit-19/version_information 2019-04-30 04:07:20.000000000 +0000 @@ -1 +1 @@ -2018 \ No newline at end of file +2019 \ No newline at end of file