Source: topal Followup-For: Bug #1067320 Control: tag -1 + patch Hello. Attachment 002 below fixes this bug. Would you be OK with a non maintainer upload?
The other attachments are unrelated sugestions. Would you be OK with a salsa.debian.org/debian/topal git repository? PATH 1/10 updates the upstream part to version 82. >From 31c2f14e91e2a01c75eb1309f17ea540ffb80571 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <nico...@debian.org> Date: Sat, 3 Dec 2022 18:56:23 +0100 Subject: [PATCH 02/10] Switch to dh-ada-library >= 8.2 for packaging.mk --- debian/control | 1 + debian/rules | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index be7984d..53206e5 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Phil Brooke <p...@debian.org> Build-Depends: debhelper-compat (= 13), + dh-ada-library (>= 8.2), gnat (>= 11), libreadline-dev, texlive, diff --git a/debian/rules b/debian/rules index cdd07e4..d3e38d5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,7 @@ DEB_BUILD_MAINT_OPTIONS := hardening=+all include /usr/share/dpkg/buildflags.mk -include /usr/share/dpkg/buildopts.mk -include /usr/share/ada/debian_packaging.mk +include /usr/share/ada/packaging.mk # Compile Ada and C with the same compiler. CC := gnatgcc -- 2.39.2 >From a9e088d51c8f95a9e7cd60bee7e31f9e167834ed Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <nico...@debian.org> Date: Sat, 3 Dec 2022 18:57:35 +0100 Subject: [PATCH 03/10] Set CC from gnat version without the deprecated gnatgcc symbolic link gcc-$MAJOR is also specific to Debian, but not to Ada. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d3e38d5..b29f0ea 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ include /usr/share/dpkg/buildflags.mk include /usr/share/ada/packaging.mk # Compile Ada and C with the same compiler. -CC := gnatgcc +CC := gcc-$(DEB_GNAT_VERSION) # Upstream Makefile insists on rebuilding everything everytime. # SOURCE_DATE_EPOCH (set by debhelper) and the -m gnatmake option may -- 2.39.2 >From 6a3416662d4142d461f6c59bdaca4c3e495f59ff Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <nico...@debian.org> Date: Wed, 20 Jul 2022 14:56:41 +0200 Subject: [PATCH 04/10] Drop full texlive from build dependencies It was now redundant with more specific dependencies. --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 53206e5..5669b2f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: dh-ada-library (>= 8.2), gnat (>= 11), libreadline-dev, - texlive, texlive-latex-base, texlive-latex-extra, texlive-fonts-recommended, -- 2.39.2 >From 2946bec7938ae412ac7cf632a2f2982a6b79355d Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <nico...@debian.org> Date: Wed, 20 Jul 2022 14:57:05 +0200 Subject: [PATCH 05/10] Sort build dependencies Dpkg supports the extra comma exactly for this purpose. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 5669b2f..00262aa 100644 --- a/debian/control +++ b/debian/control @@ -7,10 +7,10 @@ Build-Depends: dh-ada-library (>= 8.2), gnat (>= 11), libreadline-dev, + texlive-fonts-extra, + texlive-fonts-recommended, texlive-latex-base, texlive-latex-extra, - texlive-fonts-recommended, - texlive-fonts-extra Standards-Version: 4.6.1 Rules-Requires-Root: no Homepage: https://www.zircon.org.uk/topal/ -- 2.39.2 >From acb27a97b77357e5a17617c778119151161468de Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <nico...@debian.org> Date: Sat, 3 Dec 2022 19:18:57 +0100 Subject: [PATCH 06/10] Remove some trailing whitespaces --- debian/changelog | 1 - debian/rules | 1 - 2 files changed, 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 03c854b..ba63f7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -290,4 +290,3 @@ topal (0.6.4-1) unstable; urgency=low * Initial Release (closes: #143319). -- Phil Brooke <p...@debian.org> Sun, 21 Apr 2002 14:29:05 +0000 - diff --git a/debian/rules b/debian/rules index b29f0ea..c8539a8 100755 --- a/debian/rules +++ b/debian/rules @@ -37,4 +37,3 @@ override_dh_auto_install: .PHONY: override_dh_installchangelogs override_dh_installchangelogs: dh_installchangelogs Changelog.html - -- 2.39.2 >From 6934d431d7d4efde5a7a2e2095e879d6488a083d Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <nico...@debian.org> Date: Sun, 27 Aug 2023 14:03:48 +0200 Subject: [PATCH 07/10] Bump Standards-Version --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 00262aa..abc38ee 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: texlive-fonts-recommended, texlive-latex-base, texlive-latex-extra, -Standards-Version: 4.6.1 +Standards-Version: 4.7.0 Rules-Requires-Root: no Homepage: https://www.zircon.org.uk/topal/ -- 2.39.2 >From acda4e332a7e8c8cef85c778bbdf4841a8655788 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <nico...@debian.org> Date: Sun, 27 Aug 2023 14:04:39 +0200 Subject: [PATCH 08/10] Update home page URL Zircon now requires a login. --- debian/control | 2 +- debian/copyright | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index abc38ee..2b876d4 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: texlive-latex-extra, Standards-Version: 4.7.0 Rules-Requires-Root: no -Homepage: https://www.zircon.org.uk/topal/ +Homepage: https://green-pike.co.uk/topal/ Package: topal Architecture: any diff --git a/debian/copyright b/debian/copyright index 5a473de..eeb998d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Topal -Source: https://zircon.org.uk/topal/ +Source: https://green-pike.co.uk/topal/ Files: * Copyright: 2001-2022 Phillip J. Brooke <p...@green-pike.co.uk> -- 2.39.2 >From ffcc16a06ea5516fe5ffb2dabc887b9599a02356 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <nico...@debian.org> Date: Sun, 27 Aug 2023 14:22:25 +0200 Subject: [PATCH 09/10] Improve short description for non-technical readers --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 2b876d4..f590a40 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Package: topal Architecture: any Depends: gnupg, ${shlibs:Depends}, ${misc:Depends}, less Recommends: alpine, mailcap, procmail, openssl, gpgsm -Description: Links Pine and GnuPG together +Description: glue between the Pine email client and GnuPG cryptography Topal is yet another program that links GnuPG and Pine/Alpine. It offers facilities to encrypt, decrypt, sign, and verify messages. Multiple PGP blocks included in the text of a message are processed. -- 2.39.2 >From 845baba1c8b9bb51ac27cc18ec4229c467536ab6 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <nico...@debian.org> Date: Wed, 6 Mar 2024 14:23:25 +0100 Subject: [PATCH 10/10] Pass build flags via the environment instead of the command line This simplifies debian/rules, and the flags are visible elsewhere in the build logs anyways. --- debian/rules | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/debian/rules b/debian/rules index c8539a8..9499a2e 100755 --- a/debian/rules +++ b/debian/rules @@ -3,32 +3,25 @@ #export DH_OPTIONS=-v DEB_BUILD_MAINT_OPTIONS := hardening=+all +DPKG_EXPORT_BUILDFLAGS := 1 include /usr/share/dpkg/buildflags.mk include /usr/share/ada/packaging.mk # Compile Ada and C with the same compiler. -CC := gcc-$(DEB_GNAT_VERSION) +export CC := gcc-$(DEB_GNAT_VERSION) # Upstream Makefile insists on rebuilding everything everytime. # SOURCE_DATE_EPOCH (set by debhelper) and the -m gnatmake option may # avoid some unneeded recompilations. -GNATMAKEFLAGS += -m +export gnatmake_options := $(GNATMAKEFLAGS) -m -recursive_make_variables := \ - strip=true \ - "gnatmake_options=$(GNATMAKEFLAGS)" \ - $(foreach v,ADAFLAGS CC CFLAGS CPPFLAGS LDFLAGS,"$(v)=$($(v))") +# Tell Make not to strip the executables (dh_strip will). +export strip := true %: dh $@ -.PHONY: override_dh_auto_build -override_dh_auto_build: - dh_auto_build -- $(recursive_make_variables) - -.PHONY: override_dh_auto_install -override_dh_auto_install: - dh_auto_install -- $(recursive_make_variables) +execute_after_dh_auto_install: # The verbatim GPL would duplicate /usr/share/common-licenses. rm -f debian/topal/usr/share/doc/topal/COPYING # Let dh_installchangelogs handle an html changelog. -- 2.39.2
