diff -Nru bomstrip-9/debian/bomstrip.1 bomstrip-9/debian/bomstrip.1 --- bomstrip-9/debian/bomstrip.1 2020-05-02 11:59:23.000000000 +0000 +++ bomstrip-9/debian/bomstrip.1 2021-11-15 10:52:44.000000000 +0000 @@ -1,7 +1,7 @@ .\" Written by Peter Pentchev in 2008. .\" This file is hereby placed into the public domain. .\" -.Dd June 14, 2008 +.Dd November 14, 2021 .Dt BOMSTRIP 1 .Os .Sh NAME @@ -78,6 +78,6 @@ implementations in all languages. .Sh AUTHORS .An Mechiel Lukkien -.Aq mechiel@xs4all.nl +.Aq mechiel@ueber.net .An Peter Pentchev .Aq roam@ringlet.net diff -Nru bomstrip-9/debian/changelog bomstrip-9/debian/changelog --- bomstrip-9/debian/changelog 2020-05-02 11:59:23.000000000 +0000 +++ bomstrip-9/debian/changelog 2021-11-15 10:52:44.000000000 +0000 @@ -1,3 +1,14 @@ +bomstrip (9-15) unstable; urgency=medium + + * Declare compliance with Debian Policy 4.6.0 with no changes. + * Explicitly specify dh-sequence-single-binary in the list of build + dependencies. + * Add the constify patch to mark some C/C++ variables as constant. + * Update the upstream author's e-mail address. + * Mark two patches as forwarded upstream. + + -- Peter Pentchev Mon, 15 Nov 2021 12:52:44 +0200 + bomstrip (9-14) unstable; urgency=medium * Drop the adequate autopkgtest. diff -Nru bomstrip-9/debian/control bomstrip-9/debian/control --- bomstrip-9/debian/control 2020-05-02 11:59:23.000000000 +0000 +++ bomstrip-9/debian/control 2021-11-15 10:52:44.000000000 +0000 @@ -2,8 +2,10 @@ Section: text Priority: optional Maintainer: Peter Pentchev -Build-Depends: debhelper-compat (= 13) -Standards-Version: 4.5.0 +Build-Depends: + debhelper-compat (= 13), + dh-sequence-single-binary, +Standards-Version: 4.6.0 Homepage: https://www.ueber.net/who/mjl/projects/bomstrip/ Vcs-Git: https://gitlab.com/ppentchev/bomstrip-pkg-debian.git Vcs-Browser: https://gitlab.com/ppentchev/bomstrip-pkg-debian diff -Nru bomstrip-9/debian/copyright bomstrip-9/debian/copyright --- bomstrip-9/debian/copyright 2020-05-02 11:59:23.000000000 +0000 +++ bomstrip-9/debian/copyright 2021-11-15 10:52:44.000000000 +0000 @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: bomstrip -Upstream-Contact: Mechiel Lukkien +Upstream-Contact: Mechiel Lukkien Source: https://www.ueber.net/who/mjl/projects/bomstrip/ License: public-domain diff -Nru bomstrip-9/debian/patches/constify.patch bomstrip-9/debian/patches/constify.patch --- bomstrip-9/debian/patches/constify.patch 1970-01-01 00:00:00.000000000 +0000 +++ bomstrip-9/debian/patches/constify.patch 2021-11-15 10:52:44.000000000 +0000 @@ -0,0 +1,66 @@ +Description: Mark some C and C++ variables as constant. +Author: Peter Pentchev +Forwarded: yes +Last-Update: 2021-11-14 + +--- a/bomstrip.c ++++ b/bomstrip.c +@@ -4,19 +4,19 @@ + #include + + char buf[BUFSIZ]; +-const char *utf8bom = "\xef\xbb\xbf"; ++const char * const utf8bom = "\xef\xbb\xbf"; + + static void usage(const char *); + + static void +-usage(const char *prog) ++usage(const char * const prog) + { + fprintf(stderr, "usage: %s\n", prog); + exit(1); + } + + int +-main(int argc, const char * const argv[]) ++main(const int argc, const char * const argv[]) + { + size_t nread; + +--- a/bomstrip.cpp ++++ b/bomstrip.cpp +@@ -6,20 +6,20 @@ + + using namespace std; + +-const char *utf8bom = "\xef\xbb\xbf"; ++const char * const utf8bom = "\xef\xbb\xbf"; + + static void usage(const char *); +-static void outendl(string &); ++static void outendl(const string &); + + static void +-usage(const char *prog) ++usage(const char * const prog) + { + cerr << "usage: " << prog << endl; + exit(1); + } + + static void +-outendl(string &s) ++outendl(const string &s) + { + cout << s; + if (!cin.eof()) +@@ -27,7 +27,7 @@ + } + + int +-main(int argc, const char * const argv[]) ++main(const int argc, const char * const argv[]) + { + string s; + diff -Nru bomstrip-9/debian/patches/series bomstrip-9/debian/patches/series --- bomstrip-9/debian/patches/series 2020-05-02 11:59:23.000000000 +0000 +++ bomstrip-9/debian/patches/series 2021-11-15 10:52:44.000000000 +0000 @@ -1,2 +1,3 @@ c-warnings.patch typos.patch +constify.patch diff -Nru bomstrip-9/debian/patches/typos.patch bomstrip-9/debian/patches/typos.patch --- bomstrip-9/debian/patches/typos.patch 2020-05-02 11:59:23.000000000 +0000 +++ bomstrip-9/debian/patches/typos.patch 2021-11-15 10:52:44.000000000 +0000 @@ -1,5 +1,5 @@ Description: Correct a typographical error. -Forwarded: no +Forwarded: yes Author: Peter Pentchev Last-Update: 2017-01-09