diff -Nru ada-reference-manual-2012.3/debian/changelog ada-reference-manual-2012.3/debian/changelog --- ada-reference-manual-2012.3/debian/changelog 2018-05-08 10:27:33.000000000 +0000 +++ ada-reference-manual-2012.3/debian/changelog 2019-12-10 14:43:19.000000000 +0000 @@ -1,3 +1,13 @@ +ada-reference-manual (1:2012.3-3) unstable; urgency=medium + + * Debhelper 12. + * Wrap and sort build dependencies. + * Standards-Version: 4.4.1. + * Move VCS to salsa.debian.org. + * Update and simplify rules script. + + -- Nicolas Boulenguez Tue, 10 Dec 2019 15:43:19 +0100 + ada-reference-manual (1:2012.3-2) unstable; urgency=medium * Check build with gnat-8: new-gcc-warnings.diff. diff -Nru ada-reference-manual-2012.3/debian/compat ada-reference-manual-2012.3/debian/compat --- ada-reference-manual-2012.3/debian/compat 2018-05-08 08:45:39.000000000 +0000 +++ ada-reference-manual-2012.3/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru ada-reference-manual-2012.3/debian/control ada-reference-manual-2012.3/debian/control --- ada-reference-manual-2012.3/debian/control 2018-05-08 10:07:54.000000000 +0000 +++ ada-reference-manual-2012.3/debian/control 2019-12-10 14:43:19.000000000 +0000 @@ -3,18 +3,19 @@ Priority: optional Maintainer: Ludovic Brenta Uploaders: Nicolas Boulenguez -Build-Depends-Indep: debhelper (>= 11), +Build-Depends: + debhelper-compat (= 12), gnat, gprbuild, texinfo, # texi2any + texlive-fonts-recommended, +# ecrm1095 fonts texlive-latex-recommended, # pdf output module - texlive-fonts-recommended -# ecrm1095 fonts -Standards-Version: 4.1.4 -Vcs-Browser: http://www.ada-france.org:8081/branch/changes/org.debian.ada-reference-manual -Vcs-Mtn: mtn://www.ada-france.org?org.debian.ada-reference-manual +Standards-Version: 4.4.1 +Vcs-Browser: https://salsa.debian.org/debian/ada-reference-manual +Vcs-Git: https://salsa.debian.org/debian/ada-reference-manual.git Homepage: http://www.stephe-leake.org/ada/arm.html # http://www.ada-auth.org/arm.html is the other upstream contact # but Stephen's page links to them on the front page and this field diff -Nru ada-reference-manual-2012.3/debian/copyright ada-reference-manual-2012.3/debian/copyright --- ada-reference-manual-2012.3/debian/copyright 2018-05-08 08:43:44.000000000 +0000 +++ ada-reference-manual-2012.3/debian/copyright 2019-12-10 13:47:57.000000000 +0000 @@ -14,7 +14,7 @@ Files: * Copyright: 2003-2017 Stephen Leake - 2013-2017 Nicolas Boulenguez + 2013-2019 Nicolas Boulenguez License: GPL-3+ See /usr/share/common-licenses/GPL-3+. diff -Nru ada-reference-manual-2012.3/debian/patches/clean-tex-aux-files.diff ada-reference-manual-2012.3/debian/patches/clean-tex-aux-files.diff --- ada-reference-manual-2012.3/debian/patches/clean-tex-aux-files.diff 2018-05-08 08:43:44.000000000 +0000 +++ ada-reference-manual-2012.3/debian/patches/clean-tex-aux-files.diff 2019-10-06 10:51:04.000000000 +0000 @@ -1,6 +1,6 @@ Description: remove TeX .aux temporary files when cleaning + Applied upstream in revision 9d3c33930a025f5a5e7fa86bf9e51bf80b6a19ab. Author: Nicolas Boulenguez -Forwarded: private mail on 2017/06/21. --- a/build/Makefile +++ b/build/Makefile diff -Nru ada-reference-manual-2012.3/debian/patches/texinfo-table.diff ada-reference-manual-2012.3/debian/patches/texinfo-table.diff --- ada-reference-manual-2012.3/debian/patches/texinfo-table.diff 2018-05-08 08:43:44.000000000 +0000 +++ ada-reference-manual-2012.3/debian/patches/texinfo-table.diff 2019-10-06 10:51:04.000000000 +0000 @@ -4,6 +4,8 @@ . There is only one table in the whole package, so replacing @table with a fixed-length @multitable fixes is enough. It also allows @headitem. + . + Applied ustream in revision 9d3c33930a025f5a5e7fa86bf9e51bf80b6a19ab. Author: Nicolas Boulenguez Bug-Debian: https://bugs.debian.org/817877 diff -Nru ada-reference-manual-2012.3/debian/rules ada-reference-manual-2012.3/debian/rules --- ada-reference-manual-2012.3/debian/rules 2018-05-08 09:25:12.000000000 +0000 +++ ada-reference-manual-2012.3/debian/rules 2019-12-10 14:43:19.000000000 +0000 @@ -2,7 +2,7 @@ # # Makefile for Ada Reference Manual. # Copyright (c) 2010-2012 Stephen Leake -# Copyright (c) 2013-2017 Nicolas Boulenguez +# Copyright (c) 2013-2019 Nicolas Boulenguez # # 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 @@ -28,33 +28,26 @@ FORMATS := html info txt pdf endif -gnat_version := $(shell gnatgcc -dumpversion | sed 's/\..*//') +gnat_version := $(shell gnatgcc -dumpversion) DEB_BUILD_MAINT_OPTIONS := hardening=+all -DEB_CFLAGS_MAINT_APPEND := -fstack-check +DEB_ADAFLAGS_MAINT_APPEND := -gnatoVa -fstack-check include /usr/share/dpkg/buildflags.mk include /usr/share/ada/debian_packaging-$(gnat_version).mk -ADAFLAGS += -gnat2005 -gnato -gnatVa %: - dh $@ + dh $@ --sourcedirectory=build # Ignore the upstream build/ directory. .PHONY: build build: - dh $@ + dh $@ --sourcedirectory=build ###################################################################### -# Upstream Makefile is in the build directory. - -.PHONY: override_dh_auto_clean -override_dh_auto_clean: - $(MAKE) -C build clean - # Default settings do not produce PDF format. .PHONY: override_dh_auto_build override_dh_auto_build: - $(MAKE) -C build -j$(BUILDER_JOBS) \ - $(foreach v,ADAFLAGS BUILDER_OPTIONS FORMATS LDFLAGS,"$(v)=$($(v))") + dh_auto_build -- \ + $(foreach v,ADAFLAGS BUILDER_OPTIONS DOCUMENTS FORMATS LDFLAGS YEARS,'$(v)=$($(v))') ###################################################################### .PHONY: override_dh_compress @@ -113,14 +106,14 @@ build/$(d)$(y).pdf)$(NEW_LINE)) dh_installdocs --remaining-packages -clean: doc_base_clean -doc_base_clean: - rm --force $(DOC_BASE_GENERATED) -.PHONY: doc_base_clean +.PHONY: override_dh_clean +override_dh_clean: + dh_clean $(DOC_BASE_GENERATED) ###################################################################### # Check that some .txt docs are still duplicates, then symlink. +ifeq (aarm-arm,$(findstring aarm,$(DOCUMENTS))-$(findstring arm,$(DOCUMENTS))) .PHONY: override_dh_link override_dh_link: $(foreach y,$(YEARS), \ @@ -132,3 +125,4 @@ usr/share/doc/ada-reference-manual-$(y)/aarm$(y).txt/aa-$(c).TXT \ usr/share/doc/ada-reference-manual-$(y)/arm$(y).txt/rm-$(c).TXT$(NEW_LINE))) dh_link --remaining-packages +endif