Hi all, I'm fixing #965802, #999011 and #946277.
The attachment is the debdiff. I'll do NMU after 10 days if no other comments.
And will upload to DELAY/10 queue. The following changes are made: * Change debhelper from 5 to 11. (Closes: #965802) - Update debian/rules. (Closes: #999011) + This should also fix FTCBFS (Closes: #946277) - Clean files by debian/clean * Change source package to DebSrc3.0 with quilt. - Split diff.gz to quilt patches. * debian/control: Change priority from extra to optional. * debian/copyright: Change to dep5 machine-readable format. * Add autopkgtest Yours, Paul
diff -Nru rig-1.11/debian/changelog rig-1.11/debian/changelog --- rig-1.11/debian/changelog 2022-01-07 17:50:43.000000000 +0800 +++ rig-1.11/debian/changelog 2022-01-07 16:18:35.000000000 +0800 @@ -1,3 +1,18 @@ +rig (1.11-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Change debhelper from 5 to 11. (Closes: #965802) + - Update debian/rules. (Closes: #999011) + + This should also fix FTCBFS (Closes: #946277) + - Clean files by debian/clean + * Change source package to DebSrc3.0 with quilt. + - Split diff.gz to quilt patches. + * debian/control: Change priority from extra to optional. + * debian/copyright: Change to dep5 machine-readable format. + * Add autopkgtest + + -- Ying-Chun Liu (PaulLiu) <paul...@debian.org> Fri, 07 Jan 2022 16:18:35 +0800 + rig (1.11-1) unstable; urgency=low * New upstream release diff -Nru rig-1.11/debian/compat rig-1.11/debian/compat --- rig-1.11/debian/compat 2022-01-07 17:50:43.000000000 +0800 +++ rig-1.11/debian/compat 2022-01-07 16:18:35.000000000 +0800 @@ -1 +1 @@ -5 +11 diff -Nru rig-1.11/debian/control rig-1.11/debian/control --- rig-1.11/debian/control 2022-01-07 17:50:43.000000000 +0800 +++ rig-1.11/debian/control 2022-01-07 16:18:35.000000000 +0800 @@ -1,8 +1,8 @@ Source: rig Section: misc -Priority: extra +Priority: optional Maintainer: Norbert Veber <nve...@debian.org> -Build-Depends: debhelper (>> 5.0.0) +Build-Depends: debhelper (>= 11) Standards-Version: 3.8.0 Package: rig diff -Nru rig-1.11/debian/copyright rig-1.11/debian/copyright --- rig-1.11/debian/copyright 2022-01-07 17:50:43.000000000 +0800 +++ rig-1.11/debian/copyright 2022-01-07 16:18:35.000000000 +0800 @@ -1,13 +1,29 @@ -This package was debianized by Aaron Lehmann <aar...@vitelus.com> on -Sat, 8 Sep 2001 23:46:52 -0700. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: rig +Upstream-Contact: Ian Turner <vec...@pipeline.com> +Source: http://rig.sourceforge.net/ -It was downloaded from http://rig.sourceforge.net/ +Files: * +Copyright: 1999 Ian Turner <vec...@pipeline.com> +License: GPL-2.0+ -Upstream Author: Ian Turner <vec...@pipeline.com> +Files: debian/* +Copyright: 2001 Aaron Lehmann <aar...@vitelus.com> +License: GPL-2.0+ -Copyright: -RIG is released under the terms of the GNU General Public License -version 2. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in /usr/share/common-licenses/GPL. +License: GPL-2.0+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package 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 <https://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru rig-1.11/debian/patches/0001_Makefile.patch rig-1.11/debian/patches/0001_Makefile.patch --- rig-1.11/debian/patches/0001_Makefile.patch 1970-01-01 08:00:00.000000000 +0800 +++ rig-1.11/debian/patches/0001_Makefile.patch 2022-01-07 16:18:35.000000000 +0800 @@ -0,0 +1,31 @@ +Index: rig-1.11/Makefile +=================================================================== +--- rig-1.11.orig/Makefile ++++ rig-1.11/Makefile +@@ -1,20 +1,20 @@ +-PREFIX=/usr/local ++PREFIX=/usr + BINDIR=${PREFIX}/bin + MANDIR=${PREFIX}/man + DATADIR=${PREFIX}/share/rig ++CXX=g++ + + all: rig rig.6 + rig: rig.cc +- g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\"" ++ ${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\"" + + rig.6: rig.6.in + sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6 + + install: rig rig.6 +- install -g 0 -m 755 -o 0 -s rig $(BINDIR) +- install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6 +- install -g 0 -m 755 -o 0 -d $(DATADIR) +- install -g 0 -m 644 -o 0 data/*.idx $(DATADIR) ++ install -g 0 -m 755 -o 0 rig $(DESTDIR)$(BINDIR) ++ install -g 0 -m 755 -o 0 -d $(DESTDIR)$(DATADIR) ++ install -g 0 -m 644 -o 0 data/*.idx $(DESTDIR)$(DATADIR) + + clean: + rm -rf *~ *.rej *.orig *.o rig rig.6 diff -Nru rig-1.11/debian/patches/0002_rig.cc.patch rig-1.11/debian/patches/0002_rig.cc.patch --- rig-1.11/debian/patches/0002_rig.cc.patch 1970-01-01 08:00:00.000000000 +0800 +++ rig-1.11/debian/patches/0002_rig.cc.patch 2022-01-07 16:18:35.000000000 +0800 @@ -0,0 +1,12 @@ +Index: rig-1.11/rig.cc +=================================================================== +--- rig-1.11.orig/rig.cc ++++ rig-1.11/rig.cc +@@ -26,6 +26,7 @@ + #include <time.h> + #include <errno.h> + #include <assert.h> ++#include <string.h> + + using namespace std; + diff -Nru rig-1.11/debian/patches/series rig-1.11/debian/patches/series --- rig-1.11/debian/patches/series 1970-01-01 08:00:00.000000000 +0800 +++ rig-1.11/debian/patches/series 2022-01-07 16:18:35.000000000 +0800 @@ -0,0 +1,2 @@ +0001_Makefile.patch +0002_rig.cc.patch diff -Nru rig-1.11/debian/rig.manpages rig-1.11/debian/rig.manpages --- rig-1.11/debian/rig.manpages 1970-01-01 08:00:00.000000000 +0800 +++ rig-1.11/debian/rig.manpages 2022-01-07 16:18:35.000000000 +0800 @@ -0,0 +1 @@ +rig.6 diff -Nru rig-1.11/debian/rules rig-1.11/debian/rules --- rig-1.11/debian/rules 2022-01-07 17:50:43.000000000 +0800 +++ rig-1.11/debian/rules 2022-01-07 16:18:35.000000000 +0800 @@ -5,63 +5,5 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - $(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/rig. - $(MAKE) install DESTDIR=$(CURDIR)/debian/rig - - -# 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_installdocs - dh_installman rig.6 - dh_installchangelogs Changelog - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ diff -Nru rig-1.11/debian/source/format rig-1.11/debian/source/format --- rig-1.11/debian/source/format 1970-01-01 08:00:00.000000000 +0800 +++ rig-1.11/debian/source/format 2022-01-07 16:18:35.000000000 +0800 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru rig-1.11/debian/tests/control rig-1.11/debian/tests/control --- rig-1.11/debian/tests/control 1970-01-01 08:00:00.000000000 +0800 +++ rig-1.11/debian/tests/control 2022-01-07 16:18:35.000000000 +0800 @@ -0,0 +1,2 @@ +Tests: test-lname +Depends: dos2unix, @ diff -Nru rig-1.11/debian/tests/test-lname rig-1.11/debian/tests/test-lname --- rig-1.11/debian/tests/test-lname 1970-01-01 08:00:00.000000000 +0800 +++ rig-1.11/debian/tests/test-lname 2022-01-07 16:18:35.000000000 +0800 @@ -0,0 +1,11 @@ +#!/bin/sh -e + +TEMP=${AUTOPKGTEST_TMP:-${TMPDIR:-$(mktemp -d)}} +TDIR=$(mktemp -d $TEMP/testlnameXXXXXX) + +# Run +rig > "$TDIR"/out1.txt + +# Check +dos2unix -q -n /usr/share/rig/lnames.idx "$TDIR"/lnames.txt +grep -f "$TDIR"/lnames.txt "$TDIR"/out1.txt diff -Nru rig-1.11/Makefile rig-1.11/Makefile --- rig-1.11/Makefile 2022-01-07 17:50:43.000000000 +0800 +++ rig-1.11/Makefile 2002-06-05 10:07:50.000000000 +0800 @@ -1,20 +1,20 @@ -PREFIX=/usr +PREFIX=/usr/local BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man DATADIR=${PREFIX}/share/rig -CXX=g++ all: rig rig.6 rig: rig.cc - ${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\"" + g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\"" rig.6: rig.6.in sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6 install: rig rig.6 - install -g 0 -m 755 -o 0 rig $(DESTDIR)$(BINDIR) - install -g 0 -m 755 -o 0 -d $(DESTDIR)$(DATADIR) - install -g 0 -m 644 -o 0 data/*.idx $(DESTDIR)$(DATADIR) + install -g 0 -m 755 -o 0 -s rig $(BINDIR) + install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6 + install -g 0 -m 755 -o 0 -d $(DATADIR) + install -g 0 -m 644 -o 0 data/*.idx $(DATADIR) clean: rm -rf *~ *.rej *.orig *.o rig rig.6 diff -Nru rig-1.11/rig.cc rig-1.11/rig.cc --- rig-1.11/rig.cc 2022-01-07 17:50:43.000000000 +0800 +++ rig-1.11/rig.cc 2006-04-23 22:42:22.000000000 +0800 @@ -26,7 +26,6 @@ #include <time.h> #include <errno.h> #include <assert.h> -#include <string.h> using namespace std;
OpenPGP_signature
Description: OpenPGP digital signature
