--- topal-75.orig/MIME-tool/Makefile +++ topal-75/MIME-tool/Makefile @@ -1,9 +1,11 @@ .PHONY: all clean realclean distrib +CC ?= gcc + all: mime-tool mime-tool: mime.c - gcc -Wall -O2 -o mime-tool mime.c + $(CC) $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get LDFLAGS) -Wall -o mime-tool mime.c -strip mime-tool realclean: clean --- topal-75.orig/MIME-tool/mime-tool.man +++ topal-75/MIME-tool/mime-tool.man @@ -1,9 +1,7 @@ .TH "MIME message tool" 1 mime "MIME tool" .SH NAME -\fMIME message tool\fR \- a simple program to construct MIME messages -with attached files. Specifically written to be compiled with limited -K&R style C compiler commonly bundled with commercial unices. +mime-tool \- a simple program to construct MIME messages with attached files .SH SYNOPSIS .B mime --- topal-75.orig/Makefile +++ topal-75/Makefile @@ -36,6 +36,10 @@ INSTALLPATHDOC ?= $(INSTALLPATH)/share/doc/topal INSTALLPATHPATCHES ?= $(INSTALLPATH)/share/topal/patches +DEBCFLAGS=$(filter-out -Wformat,$(shell dpkg-buildflags --get CFLAGS)) + +CC ?= gcc + # The default action. all: binary topal.pdf @@ -44,19 +48,19 @@ all2: package distrib ada-readline-c.o: ada-readline-c.c - gcc -c -Wall -O2 $(TOPALDEBUG) ada-readline-c.c + $(CC) -c -Wall $(shell dpkg-buildflags --get CFLAGS) $(TOPALDEBUG) ada-readline-c.c ada-echo-c.o: ada-echo-c.c - gcc -c -Wall -O2 $(TOPALDEBUG) ada-echo-c.c + $(CC) -c -Wall $(shell dpkg-buildflags --get CFLAGS) $(TOPALDEBUG) ada-echo-c.c externals-c.o: externals-c.c - gcc -c -Wall -O2 $(TOPALDEBUG) externals-c.c + $(CC) -c -Wall $(shell dpkg-buildflags --get CFLAGS) $(TOPALDEBUG) externals-c.c mime-tool: make -C MIME-tool topal: $(TOPALDEPS) - gnatmake -gnat05 -gnatwa -gnato -O2 $(TOPALDEBUG) topal + gnatmake $(DEBCFLAGS) -gnat05 -gnatwa -gnato -O2 $(TOPALDEBUG) topal -largs $(shell dpkg-buildflags --get LDFLAGS) -strip topal # FORCE, because BUILDDATE changes each time.... @@ -83,18 +87,18 @@ install -m 755 -s MIME-tool/mime-tool $(INSTALLPATHBIN) install -m 644 MIME-tool/mime-tool.man $(INSTALLPATHMAN)/man1/mime-tool.1 -clean: +clean: FORCE -rm *.o *.ali $(GENFILES) # Clean LaTeX stuff. -rm topal.{toc,out,log,aux} # Clean packaging directories. -rm -rf topal-[0-9]* - make -C MIME-tool clean + -make -C MIME-tool clean distclean realclean: clean -rm topal topal.gz topal.gz.asc topal-ps topal-ps.gz topal-ps.gz.asc README.txt topal-package*.{tgz,tgz.sig,tgz.asc} *~ -rm -rf www www.bak - make -C MIME-tool realclean + -make -C MIME-tool realclean package: topal-package-$(RELEASECODE).tgz topal-package-$(RELEASECODE).tgz.asc --- topal-75.orig/debian/README.Debian +++ topal-75/debian/README.Debian @@ -0,0 +1,10 @@ +Topal for Debian +---------------- + +If you want the full functionality of Topal, then you will need to +patch Alpine using the file + /usr/share/topal/patches/alpine-n.nn-patch + +See the main README for more details on configuration. + + -- Phil Brooke , Fri, 22 Feb 2002 08:53:57 +0000 --- topal-75.orig/debian/changelog +++ topal-75/debian/changelog @@ -0,0 +1,207 @@ +topal (75-2.1) unstable; urgency=medium + + * Non maintainer upload. + * Rebuild with gnat-6 and bump ALI version. Closes: #830333. + Select gnatgcc (currently gcc-6) instead of gcc (currently gcc-5). + + -- Nicolas Boulenguez Mon, 11 Jul 2016 18:12:06 +0200 + +topal (75-2) unstable; urgency=medium + + * Remove metamail from suggests list. (Closes: #665090.) + * Update to gnat-4.9. (Closes: #751697.) + * Bump standards-version to 3.9.5. + * Add dpkg-buildflags. + * Add debian/source/format. + * Add an override re: the mime-tool source. This is a bug to be + fixed upstream, then the override can be removed. + + -- Phil Brooke Tue, 22 Jul 2014 17:00:07 +0100 + +topal (75-1) unstable; urgency=low + + * New upstream release. + * Bump standards-version to 3.9.3. + * Bump gnat version to 4.6. + + -- Phil Brooke Mon, 27 Feb 2012 08:13:00 +0000 + +topal (74-1) unstable; urgency=low + + * New upstream release. + * Bump standards-version to 3.9.2. + * Upstream documentation changes: + * No longer need weblint. + * Uses some texlive packages instead. + * Remove LaTeX aux files in clean target. + * Updated debian/docs. + * Rename and convert Changelog.html to text. + * Added build-arch and build-indep targets. + + -- Phil Brooke Mon, 04 Jul 2011 12:25:03 +0100 + +topal (72-1) unstable; urgency=low + + * New upstream release. + + -- Phil Brooke Mon, 01 Mar 2010 15:18:34 +0000 + +topal (70-1) unstable; urgency=low + + * New upstream release. + * Bump gnat version to 4.4. + * Change architecture to any (to match gnat-4.4). + (Closes: #568453, #542420). + * Bump standards version to 3.8.4. + * Add ${misc:Depends} to Depends. + * Topal no longer uses tofrodos. + + -- Phil Brooke Sat, 06 Feb 2010 15:52:29 +0000 + +topal (68-1) unstable; urgency=low + + * New upstream release. + * Bump standards-version to 3.8.2. + * Bump debian/compat to 6 and build-depends on debhelper. + * Now refer to GPL-3 common licence, not GPL. + * Adjust dates in copyright notice. + * Alpine patch names have changed slightly in upstream: so + update debian/rules. + + -- Phil Brooke Sat, 27 Jun 2009 15:27:08 +0100 + +topal (62-1) unstable; urgency=low + + * New upstream release. This includes the necessary upstream work + to make it work properly again. + * Move from contrib to main (Alpine is in main). + * Fix standards-version to 3.8.0. + * Update gnat dependency and add more architectures. + * Update debian/compat. + * Update description. + * Update copyright file. + * Update depends/recommends/suggests. + * Patches are installed in their own directory. + + -- Phil Brooke Fri, 18 Jul 2008 07:57:38 +0100 + +topal (0.7.13.6-1) unstable; urgency=low + + * New upstream release. + * Added missing upstream file: pine-4.60-patch. + * Changed build dependencies on libreadline (closes: #326276). + * Bumped standards-version to 3.6.2. + * Fixed broken email address in changelog entry (0.6.4-3). + * Updated FSF postal address in copyright. + * Changed prerm and postinst to refer to /bin/bash not /bin/sh. + + -- Phil Brooke Sun, 11 Sep 2005 11:36:59 +0100 + +topal (0.7.13.3-3) unstable; urgency=low + + * Set priority to `optional'. + + -- Phil Brooke Wed, 10 Dec 2003 22:34:03 +0000 + +topal (0.7.13.3-2) unstable; urgency=low + + * Moved from GNAT 3.14 to GNAT 3.15. + * Added indirection layer to avoid ld.so complaint of `Incorrectly + built binary which accesses errno or h_errno directly.' + + -- Phil Brooke Mon, 10 Dec 2003 22:08:49 +0000 + +topal (0.7.13.3-1) unstable; urgency=low + + * New upstream release. + - Fixes a relocation error relating to libreadline and ncurses. + - Adds a patch against Pine version 4.58. + * Update to standards-version 3.6.1.0. + + -- Phil Brooke Tue, 21 Oct 2003 13:06:59 +0100 + +topal (0.7.13-1) unstable; urgency=low + + * New upstream release. Adds missing includes to one .c file. + * Include the new patches in the .deb. + * Fixing minor problems in text of copyright and control. + + -- Phil Brooke Sun, 16 Feb 2003 16:28:49 +0000 + +topal (0.7.12-1) unstable; urgency=low + + * New upstream release. Contains more patches against Pine, and + some improvements to error handling/messages and documentation. + * Update to standards version 3.5.8. + * Priority changed to extra: depends on extra packages, so cannot be + optional. + + -- Phil Brooke Sun, 16 Feb 2003 16:12:29 +0000 + +topal (0.7.9-1) unstable; urgency=low + + * New upstream release. This release is a major code clean-up. + Shell dependencies have been removed. + * Removed /usr/doc symlink from postinst. + * Removed mpack dependency. + * topal-fix-{email,folder} scripts have been removed upstream. + Replaced them with symlinks to the main binary. + * Update to standards version 3.5.7.1. + + -- Phil Brooke Mon, 11 Nov 2002 12:17:09 +0000 + +topal (0.7.2-1) unstable; urgency=low + + * New upstream release. + * Fixes bug in keylist handling interface. + * Sorted out prerm and postinst for /usr/doc symlink. + + -- Phil Brooke Tue, 3 Sep 2002 21:08:00 +0100 + +topal (0.7.1-1) unstable; urgency=low + + * New upstream release. + * Code reorganisation that fixes a parsing bug for MIME emails. + * Other minor bug fixes; removes some reliance on external shell + calls. + + -- Phil Brooke Sat, 24 Aug 2002 12:20:12 +0100 + +topal (0.6.9-1) unstable; urgency=low + + * New upstream release. + + -- Phil Brooke Thu, 18 Jul 2002 16:28:47 +0100 + +topal (0.6.8-1) unstable; urgency=low + + * New upstream release. + * This new release fixes a nasty bug relating to the menus. + + -- Phil Brooke Wed, 5 Jun 2002 08:07:46 +0000 + +topal (0.6.4-4) unstable; urgency=low + + * Missed some additional dependencies in the scripts. Added. + + -- Phil Brooke Fri, 26 Apr 2002 23:32:20 +0000 + +topal (0.6.4-3) unstable; urgency=low + + * Adding dependencies for programs called by topal (except for + essential packages) (closes: #144674). + + -- Phil Brooke Fri, 26 Apr 2002 23:31:51 +0000 + +topal (0.6.4-2) unstable; urgency=low + + * Changed Build-Depends regarding libreadline4 (closes: #144581). + + -- Phil Brooke Fri, 26 Apr 2002 08:18:14 +0000 + +topal (0.6.4-1) unstable; urgency=low + + * Initial Release (closes: #143319). + + -- Phil Brooke Sun, 21 Apr 2002 14:29:05 +0000 + --- topal-75.orig/debian/compat +++ topal-75/debian/compat @@ -0,0 +1 @@ +6 --- topal-75.orig/debian/control +++ topal-75/debian/control @@ -0,0 +1,23 @@ +Source: topal +Section: mail +Priority: optional +Maintainer: Phil Brooke +Build-Depends: debhelper (>> 6.0.0), libreadline-dev, gnat, gnat-6, lynx, texlive, texlive-latex-extra, texlive-fonts-extra +Standards-Version: 3.9.5 + +Package: topal +Architecture: any +Depends: gnupg, ${shlibs:Depends}, ${misc:Depends}, less +Recommends: alpine, mime-support, procmail, openssl, gpgsm +Description: Links Pine and GnuPG together + 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. + Decryption and verification output can be cached to reduce the + number of times the passphrase is entered. RFC2015/3156 multipart + messages can be sent and received with help from some scripts, + procmail, and a patch to Pine/Alpine. It includes basic support for + verifying S/MIME multipart/signed messages. There is a remote + sending mode for reading email on a distant computer via SSH with + secret keys on the local computer. There is a high level of + configurability. --- topal-75.orig/debian/copyright +++ topal-75/debian/copyright @@ -0,0 +1,23 @@ +This package was debianized by Phil Brooke on +Fri, 22 Feb 2002 08:53:57 +0000. + +It was downloaded from http://homepage.ntlworld.com/phil.brooke/topal/. + +Upstream Author: Phil Brooke + +Copyright (C) 2001--2009 Phillip J. Brooke + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License version 3 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see http://www.gnu.org/licenses/. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-3'. --- topal-75.orig/debian/dirs +++ topal-75/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +usr/share/doc/topal +usr/share/man/man1 +usr/share/topal/patches --- topal-75.orig/debian/docs +++ topal-75/debian/docs @@ -0,0 +1,3 @@ +Features.html +topal.pdf + --- topal-75.orig/debian/postinst +++ topal-75/debian/postinst @@ -0,0 +1,59 @@ +#! /bin/bash +# postinst script for topal +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +if [ "$1" = "configure" ]; then + # Add topal-fix-email and topal-fix-folder symlinks + if [ -e /usr/bin/topal -a ! -e /usr/bin/topal-fix-email ]; then + ln -sf topal /usr/bin/topal-fix-email + fi + if [ -e /usr/bin/topal -a ! -e /usr/bin/topal-fix-folder ]; then + ln -sf topal /usr/bin/topal-fix-folder + fi +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- topal-75.orig/debian/prerm +++ topal-75/debian/prerm @@ -0,0 +1,52 @@ +#! /bin/bash +# prerm script for topal +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) +# install-info --quiet --remove /usr/info/#PACKAGE#.info.gz + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/topal ]; then + rm -f /usr/doc/topal +fi + +if [ "$1" = "upgrade" -o "$1" = "remove" ]; then + if [ -L /usr/bin/topal-fix-email ]; then + rm -f /usr/bin/topal-fix-email + fi + if [ -L /usr/bin/topal-fix-folder ]; then + rm -f /usr/bin/topal-fix-folder + fi +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- topal-75.orig/debian/rules +++ topal-75/debian/rules @@ -0,0 +1,101 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + TOPALDEBUG += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) CC=gnatgcc + #/usr/bin/docbook-to-man debian/topal.sgml > topal.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + $(MAKE) realclean + rm -f topal.pdf topal.aux topal.log topal.out topal.toc versionid.tex changelog changelog.txt + rm -f build-stamp configure-stamp + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/topal. + # $(MAKE) install DESTDIR=$(CURDIR)/debian/topal + install -m 755 -s topal MIME-tool/mime-tool debian/topal/usr/bin + install -m 644 topal.man debian/topal/usr/share/man/man1/topal.1 + install -m 644 MIME-tool/mime-tool.man debian/topal/usr/share/man/man1/mime-tool.1 + install -m 644 pine-*.patch alpine-*.patch* debian/topal/usr/share/topal/patches + install -T -m 644 Changelog.html debian/topal/usr/share/doc/topal/changelog.html + lynx -dump -nolist Changelog.html > changelog + install -m 644 changelog debian/topal/usr/share/doc/topal + + dh_lintian + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit + dh_installcron + dh_installman + dh_installinfo +# dh_undocumented + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- topal-75.orig/debian/shlibs.local +++ topal-75/debian/shlibs.local @@ -0,0 +1 @@ +libgnat-3.14p 1 libgnat-3.14p-1 --- topal-75.orig/debian/source/format +++ topal-75/debian/source/format @@ -0,0 +1 @@ +1.0 --- topal-75.orig/debian/source/lintian-overrides +++ topal-75/debian/source/lintian-overrides @@ -0,0 +1 @@ +topal source: source-is-missing MIME-tool/mime-tool --- topal-75.orig/readline.adb +++ topal-75/readline.adb @@ -22,7 +22,6 @@ package body Readline is pragma Linker_Options("ada-readline-c.o"); - pragma Linker_Options("-lncurses"); pragma Linker_Options("-lreadline"); function C_Get_String (Prompt : in Interfaces.C.Char_Array)