diff -Nru xwpe-1.5.30a/debian/changelog xwpe-1.5.30a/debian/changelog --- xwpe-1.5.30a/debian/changelog 2018-05-03 14:20:27.000000000 +0000 +++ xwpe-1.5.30a/debian/changelog 2021-01-14 17:20:36.000000000 +0000 @@ -1,20 +1,12 @@ -xwpe (1.5.30a-2.1build3) cosmic; urgency=medium +xwpe (1.5.30a-3) unstable; urgency=medium - * No-change rebuild for ncurses soname changes. + * Package revamped with debhelper 13 and policy 4.5.1. + * Now d/rules uses dh targets extensively. + * Patched revised to remove dpatch scent. + * Added one more patch to cope with -Werror=format-security. + * d/copyright reformatted in machine-readable format. - -- Matthias Klose Thu, 03 May 2018 14:20:27 +0000 - -xwpe (1.5.30a-2.1build2) bionic; urgency=high - - * No change rebuild to pick up -fPIE compiler default - - -- Balint Reczey Tue, 03 Apr 2018 12:53:23 +0000 - -xwpe (1.5.30a-2.1build1) xenial; urgency=medium - - * No-change rebuild for ncurses6 transition. - - -- Matthias Klose Sun, 07 Feb 2016 09:47:41 +0000 + -- Francesco Paolo Lovergine Thu, 14 Jan 2021 18:20:36 +0100 xwpe (1.5.30a-2.1) unstable; urgency=low diff -Nru xwpe-1.5.30a/debian/compat xwpe-1.5.30a/debian/compat --- xwpe-1.5.30a/debian/compat 2010-05-05 22:02:46.000000000 +0000 +++ xwpe-1.5.30a/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -7 diff -Nru xwpe-1.5.30a/debian/control xwpe-1.5.30a/debian/control --- xwpe-1.5.30a/debian/control 2018-04-03 12:53:23.000000000 +0000 +++ xwpe-1.5.30a/debian/control 2021-01-12 19:58:28.000000000 +0000 @@ -1,10 +1,14 @@ Source: xwpe Section: editors Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Francesco Paolo Lovergine -Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 7.1), libgpmg1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev | libncurses-dev, libx11-dev, x11proto-core-dev, zlib1g-dev | libz-dev +Maintainer: Francesco Paolo Lovergine +Standards-Version: 4.5.1 +Build-Depends: debhelper-compat (=13) + ,libgpmg1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] + ,libncurses5-dev | libncurses-dev + ,libx11-dev + ,x11proto-core-dev, + zlib1g-dev | libz-dev Homepage: http://www.identicalsoftware.com/xwpe Package: xwpe diff -Nru xwpe-1.5.30a/debian/copyright xwpe-1.5.30a/debian/copyright --- xwpe-1.5.30a/debian/copyright 2010-05-05 22:01:59.000000000 +0000 +++ xwpe-1.5.30a/debian/copyright 2021-01-14 17:20:36.000000000 +0000 @@ -1,15 +1,17 @@ -This package was debianized by Igor Grobman . -Current maintainer is Francesco P. Lovergine +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Xwpe-Alpha +Upstream-Contact: Dennis Payne +Source: http://www.identicalsoftware.com/xwpe/ -It was downloaded from: http://www.identicalsoftware.com/xwpe/ - -Upstream maintainer: Dennis Payne - -Copyright (C) 1993 Fred Kruse +Files: * +Copyright: 1993 Fred Kruse + 1997 Dennis Payne + 2002-2020 Francesco Paolo Lovergine +License: GPL-2 xwpe is free; anyone may redistribute copies of xwpe to anyone under the terms stated in the GNU General Public License. The author assumes no responsibility for errors or omissions or damages resulting from the use of xwpe. - -On Debian systems the complete text of the GNU General Public License -can be found in "/usr/share/common-licenses/GPL-2". + . + On Debian systems the complete text of the GNU General Public License + can be found in "/usr/share/common-licenses/GPL-2". diff -Nru xwpe-1.5.30a/debian/docs xwpe-1.5.30a/debian/docs --- xwpe-1.5.30a/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ xwpe-1.5.30a/debian/docs 2021-01-14 17:20:36.000000000 +0000 @@ -0,0 +1 @@ +README diff -Nru xwpe-1.5.30a/debian/patches/00list xwpe-1.5.30a/debian/patches/00list --- xwpe-1.5.30a/debian/patches/00list 2010-05-05 21:58:30.000000000 +0000 +++ xwpe-1.5.30a/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -tparm_proto diff -Nru xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes --- xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes 1970-01-01 00:00:00.000000000 +0000 +++ xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes 2021-01-14 17:20:36.000000000 +0000 @@ -0,0 +1,55 @@ +Description: xwpe.1_eng: hyphen fixes etc. +Author: Jari Aalto +Forwarded-upstream: no + +diff --git a/xwpe.1_eng b/xwpe.1_eng +index b8551b8..4520c8e 100644 +--- a/xwpe.1_eng ++++ b/xwpe.1_eng +@@ -14,7 +14,7 @@ + .if t .sp .5 + .. + .ta .3i .6i .9i 1.2i 1.5i 1.8i +-.TH xwpe alpha "May 3, 1999" ++.TH xwpe 1 "May 3, 1999" + .UC + .SH NAME + xwpe, xwe, wpe, we \- X-Window Programming Environment +@@ -82,7 +82,7 @@ The next file is a message-file. + Start \fIxwpe\fP in the \fIrecover mode\fP. The internal buffers + are saved in files with the postfix `.ESV' in the name + if a signal is caught by \fIxwpe\fP (except for SIGKILL). +-If the editor is invoked with the `-r' option is ++If the editor is invoked with the `\-r' option is + specified in the command line, the old session will be + recovered. + +@@ -181,8 +181,8 @@ definition. + "string: Characters used for comments depending on the + column." + "string: Special single characters." +-"integer: Column for comments (-1 for none)." +-"integer: Column for continuing line (-1 for none)" ++"integer: Column for comments (\-1 for none)." ++"integer: Column for continuing line (\-1 for none)" + "Integer: Column for comment till the end of line (1000 + for none)" + .EE +@@ -217,7 +217,7 @@ An example: + struct switch typedef union unsigned void volatile + while + 0 +- ~^()[]{}<>+-/*%=|&!.?:,; /* */ NULL NULL "'#\\ -1 -1 1000 ++ ~^()[]{}<>+\-/*%=|&!.?:,; /* */ NULL NULL "'#\\ \-1 \-1 1000 + + .f + 64 +@@ -257,7 +257,7 @@ would be greatly appreciated. + + Documentation hasn't been updated. + +-Compilers are assumed to have a -c and -o option. This causes problems ++Compilers are assumed to have a \-c and \-o option. This causes problems + for those who wish to use java, perl, or other languages. + + \fBmake install\fP installs x versions even if not compiled in. diff -Nru xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes.dpatch xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes.dpatch --- xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes.dpatch 2010-05-09 00:10:48.000000000 +0000 +++ xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## /tmp/xwpe.1_eng-manpage-fixes.patch.dpatch by Jari Aalto -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: -## DP: Author: Jari Aalto -## DP: -## DP: -## DP: xwpe.1_eng: hyphen fixes etc. - -@DPATCH@ - -diff --git a/xwpe.1_eng b/xwpe.1_eng -index b8551b8..4520c8e 100644 ---- a/xwpe.1_eng -+++ b/xwpe.1_eng -@@ -14,7 +14,7 @@ - .if t .sp .5 - .. - .ta .3i .6i .9i 1.2i 1.5i 1.8i --.TH xwpe alpha "May 3, 1999" -+.TH xwpe 1 "May 3, 1999" - .UC - .SH NAME - xwpe, xwe, wpe, we \- X-Window Programming Environment -@@ -82,7 +82,7 @@ The next file is a message-file. - Start \fIxwpe\fP in the \fIrecover mode\fP. The internal buffers - are saved in files with the postfix `.ESV' in the name - if a signal is caught by \fIxwpe\fP (except for SIGKILL). --If the editor is invoked with the `-r' option is -+If the editor is invoked with the `\-r' option is - specified in the command line, the old session will be - recovered. - -@@ -181,8 +181,8 @@ definition. - "string: Characters used for comments depending on the - column." - "string: Special single characters." --"integer: Column for comments (-1 for none)." --"integer: Column for continuing line (-1 for none)" -+"integer: Column for comments (\-1 for none)." -+"integer: Column for continuing line (\-1 for none)" - "Integer: Column for comment till the end of line (1000 - for none)" - .EE -@@ -217,7 +217,7 @@ An example: - struct switch typedef union unsigned void volatile - while - 0 -- ~^()[]{}<>+-/*%=|&!.?:,; /* */ NULL NULL "'#\\ -1 -1 1000 -+ ~^()[]{}<>+\-/*%=|&!.?:,; /* */ NULL NULL "'#\\ \-1 \-1 1000 - - .f - 64 -@@ -257,7 +257,7 @@ would be greatly appreciated. - - Documentation hasn't been updated. - --Compilers are assumed to have a -c and -o option. This causes problems -+Compilers are assumed to have a \-c and \-o option. This causes problems - for those who wish to use java, perl, or other languages. - - \fBmake install\fP installs x versions even if not compiled in. diff -Nru xwpe-1.5.30a/debian/patches/format-security xwpe-1.5.30a/debian/patches/format-security --- xwpe-1.5.30a/debian/patches/format-security 1970-01-01 00:00:00.000000000 +0000 +++ xwpe-1.5.30a/debian/patches/format-security 2021-01-14 17:20:36.000000000 +0000 @@ -0,0 +1,26 @@ +Description: remove error due to [-Werror=format-security] default. +From: Francesco Paolo Lovergine +Forwarded-upstream: no + +--- a/we_fl_unix.c ++++ b/we_fl_unix.c +@@ -1044,7 +1044,7 @@ + } + else if(!WpeIsXwin()) + { +- printf(e_msg[ERR_HITCR]); ++ printf("%s", e_msg[ERR_HITCR]); + fflush(stderr); + fflush(stdout); + fk_getch(); +--- a/we_prog.c ++++ b/we_prog.c +@@ -1477,7 +1477,7 @@ + ret = system(estr); + if (!WpeIsXwin()) + { +- printf(e_msg[ERR_HITCR]); ++ printf("%s",e_msg[ERR_HITCR]); + fflush(stdout); + fk_getch(); + } diff -Nru xwpe-1.5.30a/debian/patches/series xwpe-1.5.30a/debian/patches/series --- xwpe-1.5.30a/debian/patches/series 2010-05-09 00:13:24.000000000 +0000 +++ xwpe-1.5.30a/debian/patches/series 2021-01-14 17:20:36.000000000 +0000 @@ -1,3 +1,4 @@ -10-xwpe.1_eng-manpage-fixes.dpatch -tparm_proto.dpatch +10-xwpe.1_eng-manpage-fixes +tparm_proto debian-changes-1.5.30a-2.1 +format-security diff -Nru xwpe-1.5.30a/debian/patches/tparm_proto xwpe-1.5.30a/debian/patches/tparm_proto --- xwpe-1.5.30a/debian/patches/tparm_proto 1970-01-01 00:00:00.000000000 +0000 +++ xwpe-1.5.30a/debian/patches/tparm_proto 2021-01-14 17:20:36.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Removed tparm prototype. +From: Francesco Paolo Lovergine +Forwarded-upstream: no + +diff -urNad xwpe-1.5.30a~/we_debug.c xwpe-1.5.30a/we_debug.c +--- xwpe-1.5.30a~/we_debug.c 2006-11-02 15:38:21.000000000 +0100 ++++ xwpe-1.5.30a/we_debug.c 2006-11-02 15:39:16.000000000 +0100 +@@ -63,7 +63,7 @@ + extern char *e_tmp_dir; + + #ifdef NOTPARM +-char *tparm(); ++/* char *tparm(); */ + char *tgoto(); + #endif + #ifdef DEFTPUTS diff -Nru xwpe-1.5.30a/debian/patches/tparm_proto.dpatch xwpe-1.5.30a/debian/patches/tparm_proto.dpatch --- xwpe-1.5.30a/debian/patches/tparm_proto.dpatch 2010-05-05 21:58:30.000000000 +0000 +++ xwpe-1.5.30a/debian/patches/tparm_proto.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#! /bin/sh -e -## tparm_proto.dpatch by Francesco Paolo Lovergine -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad xwpe-1.5.30a~/we_debug.c xwpe-1.5.30a/we_debug.c ---- xwpe-1.5.30a~/we_debug.c 2006-11-02 15:38:21.000000000 +0100 -+++ xwpe-1.5.30a/we_debug.c 2006-11-02 15:39:16.000000000 +0100 -@@ -63,7 +63,7 @@ - extern char *e_tmp_dir; - - #ifdef NOTPARM --char *tparm(); -+/* char *tparm(); */ - char *tgoto(); - #endif - #ifdef DEFTPUTS diff -Nru xwpe-1.5.30a/debian/rules xwpe-1.5.30a/debian/rules --- xwpe-1.5.30a/debian/rules 2010-05-08 23:50:27.000000000 +0000 +++ xwpe-1.5.30a/debian/rules 2021-01-14 17:20:36.000000000 +0000 @@ -1,63 +1,19 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 -export CFLAGS := -O2 -Wall -DNCURSES -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif - -build: build-stamp -build-stamp: - dh_testdir - - PRNTCMD=lpr ./configure --prefix=/usr \ - --libdir='$${prefix}/share' \ - --mandir='$${prefix}/share/man' - $(MAKE) - - > $@ - - touch build-stamp - -clean: myclean -myclean: - dh_testdir - dh_testroot - dh_clean build-stamp install-stamp - - [ ! -f Makefile ] || $(MAKE) clean distclean - -install: install-stamp -install-stamp: build - dh_testdir - dh_testroot - dh_clean - - $(MAKE) install prefix=`pwd`/debian/xwpe/usr - - > $@ - - touch install-stamp - -binary-indep: build install -# We have nothing to do by default. - -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs README - dh_installmenu - dh_installchangelogs CHANGELOG - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb +export DEB_CFLAGS_MAINT_APPEND=-DNCURSES -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary myclean +# This is introduced to support cross-building +include /usr/share/dpkg/architecture.mk + +%: + dh $@ --without autoreconf + +override_dh_auto_configure: + dh_update_autotools_config + PRNTCMD=lpr $(CURDIR)/configure --prefix=/usr --libdir='$${prefix}/share' --mandir='$${prefix}/share/man' \ + --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) + +override_dh_auto_install: + dh_auto_install -- DESTDIR=$(CURDIR)/debian/xwpe/usr/bin prefix=$(CURDIR)/debian/xwpe/usr diff -Nru xwpe-1.5.30a/debian/watch xwpe-1.5.30a/debian/watch --- xwpe-1.5.30a/debian/watch 2010-05-05 22:06:32.000000000 +0000 +++ xwpe-1.5.30a/debian/watch 2021-01-12 20:01:14.000000000 +0000 @@ -1,4 +1,4 @@ -version=3 +version=4 http://www.identicalsoftware.com/xwpe/index.html .*xwpe-([\d.]+.*)\.tar\.gz