diff -Nru libflorist-2017/debian/ada_libraries libflorist-2017/debian/ada_libraries --- libflorist-2017/debian/ada_libraries 1970-01-01 00:00:00.000000000 +0000 +++ libflorist-2017/debian/ada_libraries 2019-07-20 22:41:13.000000000 +0000 @@ -0,0 +1,2 @@ +LIBRARY_TYPE=relocatable +florist.gpr diff -Nru libflorist-2017/debian/changelog libflorist-2017/debian/changelog --- libflorist-2017/debian/changelog 2018-10-27 13:09:54.000000000 +0000 +++ libflorist-2017/debian/changelog 2020-02-25 10:41:02.000000000 +0000 @@ -1,3 +1,26 @@ +libflorist (2017-7) unstable; urgency=medium + + * Reupload to unstable for gnat-9 transition. + * Debhelper 12 dh-sequence syntax. + * Standards-Version: 4.5.0. + * Drop obsolete branch in Vcs-Git. + * Select specific dpkg-dev Makefile snippet. + + -- Nicolas Boulenguez Tue, 25 Feb 2020 11:41:02 +0100 + +libflorist (2017-6) experimental; urgency=medium + + * Rebuild with gnat-9 in experimental. Rebuild both packages per Ada policy. + * Make explicit that the package is orphaned upstream. + * Move the packaging history to salsa.debian.org. + * Standards-Version 4.4.0. Rules-Requires-Root: no. + * Debhelper 12. + * dh-ada-library ignores soversion, use a separate configuration file + * gprbuild now handles default.cgpr by itself. + * Let dh_auto_build select options like -j for Make. + + -- Nicolas Boulenguez Sun, 21 Jul 2019 00:44:17 +0200 + libflorist (2017-5) unstable; urgency=medium * Rebuild in unstable for gnat-8 transition. diff -Nru libflorist-2017/debian/compat libflorist-2017/debian/compat --- libflorist-2017/debian/compat 2018-05-08 12:59:04.000000000 +0000 +++ libflorist-2017/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru libflorist-2017/debian/control libflorist-2017/debian/control --- libflorist-2017/debian/control 2018-05-08 12:59:04.000000000 +0000 +++ libflorist-2017/debian/control 2020-01-21 10:30:45.000000000 +0000 @@ -3,19 +3,20 @@ Priority: optional Maintainer: Ludovic Brenta Uploaders: Nicolas Boulenguez -Build-Depends: debhelper (>= 11), - gnat, gnat-8, +Build-Depends: + debhelper-compat (= 12), + gnat, gnat-9, # This line is parsed by debian/rules. - dh-ada-library (>= 6.7), + dh-sequence-ada-library, # 6.7 knows that -dbg packages are optional. gprbuild (>= 2015-2) # 2015-2 handles gnat-6 -Standards-Version: 4.1.4 -Vcs-Browser: http://www.ada-france.org:8081/branch/changes/org.debian.libflorist -Vcs-Mtn: mtn://www.ada-france.org?org.debian.libflorist -Homepage: https://www.adacore.com/community +Standards-Version: 4.5.0 +Rules-Requires-Root: no +Vcs-Browser: https://salsa.debian.org/debian/libflorist +Vcs-Git: https://salsa.debian.org/debian/libflorist.git -Package: libflorist2018-dev +Package: libflorist2019-dev Architecture: any Depends: ${misc:Depends}, ${ada:Depends} Description: POSIX.5 Ada interface to operating system services: development @@ -24,10 +25,13 @@ the POSIX Ada Bindings. Using this library, you can call operating system services from within Ada programs. . + No one seems to maintain this library anymore. + For new packages, please consider other solutions. + . This package contains the development files and unstripped static library. -Package: libflorist2018 +Package: libflorist2019 Section: libs Architecture: any Multi-Arch: same @@ -39,4 +43,7 @@ the POSIX Ada Bindings. Using this library, you can call operating system services from within Ada programs. . + No one seems to maintain this library anymore. + For new packages, please consider other solutions. + . This package contains the run-time shared library. diff -Nru libflorist-2017/debian/copyright libflorist-2017/debian/copyright --- libflorist-2017/debian/copyright 2018-05-08 12:59:04.000000000 +0000 +++ libflorist-2017/debian/copyright 2019-07-20 22:46:52.000000000 +0000 @@ -1,6 +1,5 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: florist -Upstream-Contact: https://www.adacore.com/community Files: * Copyright: Copyright (C) 1991-1997 Florida State University @@ -39,7 +38,7 @@ Files: debian/* Copyright: Copyright (C) 2003-2014 Ludovic Brenta - Copyright (C) 2014-2018 Nicolas Boulenguez + Copyright (C) 2014-2019 Nicolas Boulenguez License: GPL-3+ License: GPL-3+ diff -Nru libflorist-2017/debian/README.source libflorist-2017/debian/README.source --- libflorist-2017/debian/README.source 2018-05-08 12:59:04.000000000 +0000 +++ libflorist-2017/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -This documentation is shared by most Adacore packages. -Please replace PKG with florist. - -Upstream use three versioning schemes. -* Commercial releases are numbered YY.MINOR, - where YY contains the two last digits of the year (since 2017). -* Builds between 17.2 and 12.3 are numbered 12.3w (as wavefront). -* Every year, a GPL release without the GCC Runtime Library Exception - is numbered as gpl-20YY. -There is no ordering implied between gpl-20YY and any YY.MINOR. -Upstream history is visible at https://github.com/AdaCore/PKG/network. -The version number is always visible in first line of ./configure.in. - -Debian packages are based on GPL releases. -The (upstream part of) the source version is 20YY (for historical reasons). -ALI and SO binary package versions as described in the Debian Ada -policy are consecutive integers (since 2018). -They are almost unrelated with upstream releases. - -When packaging a new version for Debian: - -Download GPL release pristine archive from the Homepage URL field in -the control file. Tracking upstream releases automatically is of -little interest, and quite hard as the website is modified each year. - -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. -# upstream_branch=com.adacore.florsist tracks AdaCore tarballs. -# debian_branch=org.debian.libflorist 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?$upstream_branch -# mtn -d $db pull mtn://$server?$debian_branch - -Recreate the repackaged archive from a tag. -# mtn -d $db checkout -r t:florist-2014 florist-src -# tar caf libflorist_2014.orig.tar.gz florist-src --exclude=_MTN -# rm -fr florist-src - -Inspect the unpatched source tree. -# tar xf libflorist_2014.orig.tar.xz -# cd florist-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 , Tue, 8 May 2018 14:55:42 +0200 diff -Nru libflorist-2017/debian/rules libflorist-2017/debian/rules --- libflorist-2017/debian/rules 2018-05-08 12:59:04.000000000 +0000 +++ libflorist-2017/debian/rules 2019-12-17 11:54:59.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f # Copyright (c) 2003-2014 Ludovic Brenta -# Copyright (c) 2014-2018 Nicolas Boulenguez +# Copyright (c) 2014-2019 Nicolas Boulenguez # This build script is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -33,43 +33,31 @@ ' debian/control),$(eval $(line))) DEB_CFLAGS_MAINT_APPEND := -w +DEB_ADAFLAGS_MAINT_APPEND := -gnatVa -gnatafno -gnatwa +DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed -Wl,--no-undefined \ + -Wl,--no-copy-dt-needed-entries -Wl,--no-allow-shlib-undefined DEB_BUILD_MAINT_OPTIONS := hardening=+all -include /usr/share/dpkg/default.mk +include /usr/share/dpkg/buildflags.mk include /usr/share/ada/debian_packaging-$(GNAT_VERSION).mk -ADAFLAGS += -gnatVa -gnatafno -gnatwa - %: - dh $@ --with ada-library + dh $@ # Disable autoheader, upstream maintains the macros manually. .PHONY: override_dh_autoreconf override_dh_autoreconf: AUTOHEADER=true dh_autoreconf -.PHONY: $(addprefix override_dh_auto_, configure build test install clean) +.PHONY: $(addprefix override_dh_auto_, configure build test install) +# dh_auto_clean is OK. override_dh_auto_configure: dh_auto_configure -- $(foreach v, \ ADAFLAGS CC CFLAGS CPPFLAGS LDFLAGS \ ,"$(v)=$($(v))") -GPR_CONFIG := default.cgpr -override_dh_auto_build: $(GPR_CONFIG) -$(GPR_CONFIG): - gprconfig --batch --config=Ada --config=C,,,,gnatgcc -override_dh_auto_clean:: - rm -f $(GPR_CONFIG) - override_dh_auto_build: - $(MAKE) LIBRARY_TYPE_OPTION=-XLIBRARY_TYPE=static \ + dh_auto_build -- LIBRARY_TYPE_OPTION=-XLIBRARY_TYPE=static \ "GPRBUILD_FLAGS=$(BUILDER_OPTIONS) -XSOVERSION=$(soversion)" - $(MAKE) LIBRARY_TYPE_OPTION=-XLIBRARY_TYPE=relocatable \ + dh_auto_build -- LIBRARY_TYPE_OPTION=-XLIBRARY_TYPE=relocatable \ "GPRBUILD_FLAGS=$(BUILDER_OPTIONS) -XSOVERSION=$(soversion)" -override_dh_auto_clean:: - dh_auto_clean - -.PHONY: override_dh_ada_library -override_dh_ada_library: - dh_ada_library LIBRARY_TYPE=relocatable \ - SOVERSION=$(soversion) florist.gpr diff -Nru libflorist-2017/debian/tests/link-with-shared libflorist-2017/debian/tests/link-with-shared --- libflorist-2017/debian/tests/link-with-shared 2018-05-08 12:59:04.000000000 +0000 +++ libflorist-2017/debian/tests/link-with-shared 2019-07-20 22:52:58.000000000 +0000 @@ -1,7 +1,6 @@ #!/bin/sh set -C -e -f -u -TOP_SOURCE_DIR="`pwd`" -cd "$ADTTMP" +cd "$AUTOPKGTEST_TMP" cat > p.gpr <