diff -Nru yiyantang-0.7.0/debian/changelog yiyantang-0.7.0/debian/changelog --- yiyantang-0.7.0/debian/changelog 2020-05-15 11:33:44.000000000 +0000 +++ yiyantang-0.7.0/debian/changelog 2020-09-30 11:38:02.000000000 +0000 @@ -1,3 +1,25 @@ +yiyantang (0.7.0-8) unstable; urgency=medium + + [Helmut Grohne] + * Fix FTCBFS: Let dpkg's buildtools.mk supply CC and friends to configure. + (Closes: #960817) + * Also fix bad argument to --build. + + [ 肖盛文 ] + * update copyright to dep5-copyright + * fix lintian patch-not-forwarded-upstream + * patch Forwarded use: no, dead upstream. + * rename fix-type-error-Default.patch -> fix-typo.patch + * d/watch: add "dead upstream" comment + * update fix-typo.patch: type error --> typo + * d/rules: wrap the long lines + * d/copyright: + - add the previous maintainers in the debian/* section + - use GPL-2+ for debian/* + - quote the complete license boiler plate for GPL-2+ + + -- xiao sheng wen Wed, 30 Sep 2020 19:38:02 +0800 + yiyantang (0.7.0-7) unstable; urgency=medium [ 肖盛文 ] diff -Nru yiyantang-0.7.0/debian/copyright yiyantang-0.7.0/debian/copyright --- yiyantang-0.7.0/debian/copyright 2020-05-15 11:28:27.000000000 +0000 +++ yiyantang-0.7.0/debian/copyright 2020-09-30 11:38:02.000000000 +0000 @@ -1,16 +1,37 @@ -This package was debianized by Yu Guanghui on -Tue, 1 May 2001 22:23:01 +0800. - -It was downloaded from http://yiyantang.on.openave.net/ - -Upstream Author: hashao - -Copyright: - - Copyright (C) 2001 ha shao - -This program is released under GPL license version 2. Please -read COPYING before you use the program. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: yiyantang +Upstream-Contact: hashao + +Files: * +Copyright: 2001 ha shao +License: GPL-2+ + +Files: debian/* +Copyright: 2001 - 2008 Yu Guanghui + 2008 - 2013 Luca Falavigna + 2013 - 2020 Andreas Beckmann + 2020 Sudip Mukherjee + 2020 xiao sheng wen +License: GPL-2+ + +License: GPL-2+ + This program 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 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 package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. diff -Nru yiyantang-0.7.0/debian/patches/fix-type-error-Default.patch yiyantang-0.7.0/debian/patches/fix-type-error-Default.patch --- yiyantang-0.7.0/debian/patches/fix-type-error-Default.patch 2020-05-15 11:28:27.000000000 +0000 +++ yiyantang-0.7.0/debian/patches/fix-type-error-Default.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -Description: type error fix when ITA #629017 - fix Default type error - . -Author: xiao sheng wen -Bug-Debian: https://bugs.debian.org/629017 - ---- -Last-Update: 2020-05-15 - ---- yiyantang-0.7.0.orig/doc/C/yyt.info -+++ yiyantang-0.7.0/doc/C/yyt.info -@@ -470,7 +470,7 @@ Sample Output - -h --help Print help and exit - -V --version Print version and exit - -fSTRING --from=STRING Incoming encoding. Default auto-detect. -- -tSTRING --to=STRING Local encoding. Defaul LC_CTYPE environment. -+ -tSTRING --to=STRING Local encoding. Default LC_CTYPE environment. - -  - File: yyt.info, Node: Invoking yyt, Next: Problems, Prev: Sample, Up: Top ---- yiyantang-0.7.0.orig/doc/C/yyt.texi -+++ yiyantang-0.7.0/doc/C/yyt.texi -@@ -162,7 +162,7 @@ Usage: yiyantang [-h|--help] [-V|--versi - -h --help Print help and exit - -V --version Print version and exit - -fSTRING --from=STRING Incoming encoding. Default auto-detect. -- -tSTRING --to=STRING Local encoding. Defaul LC_CTYPE environment. -+ -tSTRING --to=STRING Local encoding. Default LC_CTYPE environment. - @end example - - @node Invoking yyt, Problems, Sample, Top ---- yiyantang-0.7.0.orig/src/cmdline.c -+++ yiyantang-0.7.0/src/cmdline.c -@@ -45,7 +45,7 @@ cmdline_parser_print_help (void) - -h --help Print help and exit\n\ - -V --version Print version and exit\n\ - -fSTRING --from=STRING Incoming encoding. Default auto-detect.\n\ -- -tSTRING --to=STRING Local encoding. Defaul LC_CTYPE environment.\n\ -+ -tSTRING --to=STRING Local encoding. Default LC_CTYPE environment.\n\ - ", PACKAGE); - } - -@@ -125,7 +125,7 @@ cmdline_parser (int argc, char * const * - args_info->from_arg = gengetopt_strdup (optarg); - break; - -- case 't': /* Local encoding. Defaul LC_CTYPE environment.. */ -+ case 't': /* Local encoding. Default LC_CTYPE environment.. */ - if (args_info->to_given) - { - fprintf (stderr, "%s: `--to' (`-t') option given more than once\n", PACKAGE); ---- yiyantang-0.7.0.orig/src/cmdline.ggo -+++ yiyantang-0.7.0/src/cmdline.ggo -@@ -16,4 +16,4 @@ Please report bugs to ha shao + +--- +Last-Update: 2020-09-30 + +--- yiyantang-0.7.0.orig/doc/C/yyt.info ++++ yiyantang-0.7.0/doc/C/yyt.info +@@ -470,7 +470,7 @@ Sample Output + -h --help Print help and exit + -V --version Print version and exit + -fSTRING --from=STRING Incoming encoding. Default auto-detect. +- -tSTRING --to=STRING Local encoding. Defaul LC_CTYPE environment. ++ -tSTRING --to=STRING Local encoding. Default LC_CTYPE environment. + +  + File: yyt.info, Node: Invoking yyt, Next: Problems, Prev: Sample, Up: Top +--- yiyantang-0.7.0.orig/doc/C/yyt.texi ++++ yiyantang-0.7.0/doc/C/yyt.texi +@@ -162,7 +162,7 @@ Usage: yiyantang [-h|--help] [-V|--versi + -h --help Print help and exit + -V --version Print version and exit + -fSTRING --from=STRING Incoming encoding. Default auto-detect. +- -tSTRING --to=STRING Local encoding. Defaul LC_CTYPE environment. ++ -tSTRING --to=STRING Local encoding. Default LC_CTYPE environment. + @end example + + @node Invoking yyt, Problems, Sample, Top +--- yiyantang-0.7.0.orig/src/cmdline.c ++++ yiyantang-0.7.0/src/cmdline.c +@@ -45,7 +45,7 @@ cmdline_parser_print_help (void) + -h --help Print help and exit\n\ + -V --version Print version and exit\n\ + -fSTRING --from=STRING Incoming encoding. Default auto-detect.\n\ +- -tSTRING --to=STRING Local encoding. Defaul LC_CTYPE environment.\n\ ++ -tSTRING --to=STRING Local encoding. Default LC_CTYPE environment.\n\ + ", PACKAGE); + } + +@@ -125,7 +125,7 @@ cmdline_parser (int argc, char * const * + args_info->from_arg = gengetopt_strdup (optarg); + break; + +- case 't': /* Local encoding. Defaul LC_CTYPE environment.. */ ++ case 't': /* Local encoding. Default LC_CTYPE environment.. */ + if (args_info->to_given) + { + fprintf (stderr, "%s: `--to' (`-t') option given more than once\n", PACKAGE); +--- yiyantang-0.7.0.orig/src/cmdline.ggo ++++ yiyantang-0.7.0/src/cmdline.ggo +@@ -16,4 +16,4 @@ Please report bugs to ha shao +Forwarded: no, dead upstream. --- yiyantang-0.7.0.orig/doc/C/Makefile.in +++ yiyantang-0.7.0/doc/C/Makefile.in diff -Nru yiyantang-0.7.0/debian/patches/remove_stropts.patch yiyantang-0.7.0/debian/patches/remove_stropts.patch --- yiyantang-0.7.0/debian/patches/remove_stropts.patch 2020-05-15 11:28:27.000000000 +0000 +++ yiyantang-0.7.0/debian/patches/remove_stropts.patch 2020-09-30 11:38:02.000000000 +0000 @@ -5,6 +5,7 @@ Author: Sudip Mukherjee Bug-Debian: https://bugs.debian.org/954520 +Forwarded: no, dead upstream. --- diff -Nru yiyantang-0.7.0/debian/patches/series yiyantang-0.7.0/debian/patches/series --- yiyantang-0.7.0/debian/patches/series 2020-05-15 11:28:27.000000000 +0000 +++ yiyantang-0.7.0/debian/patches/series 2020-09-30 11:38:02.000000000 +0000 @@ -1,4 +1,4 @@ misc-fixes.diff fix-manpage.diff remove_stropts.patch -fix-type-error-Default.patch +fix-typo.patch diff -Nru yiyantang-0.7.0/debian/rules yiyantang-0.7.0/debian/rules --- yiyantang-0.7.0/debian/rules 2020-05-15 11:28:27.000000000 +0000 +++ yiyantang-0.7.0/debian/rules 2020-09-30 11:38:02.000000000 +0000 @@ -4,6 +4,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDTOOLS=1 +-include /usr/share/dpkg/buildtools.mk + PREFIX=/usr %: @@ -11,4 +14,15 @@ override_dh_auto_configure: # There is no --runstatedir=/run in configure, so we do it manually here. - ./configure --build={DEB_HOST_MULTIARCH} --prefix=${PREFIX} --includedir=${PREFIX}/include --mandir=${PREFIX}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${PREFIX}/lib/${DEB_HOST_MULTIARCH} --disable-maintainer-mode --disable-dependency-tracking + ./configure --build=${DEB_BUILD_GNU_TYPE} \ + --host=${DEB_HOST_GNU_TYPE} \ + --prefix=${PREFIX} \ + --includedir=${PREFIX}/include \ + --mandir=${PREFIX}/share/man \ + --infodir=${prefix}/share/info \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-silent-rules \ + --libdir=${PREFIX}/lib/${DEB_HOST_MULTIARCH} \ + --disable-maintainer-mode \ + --disable-dependency-tracking diff -Nru yiyantang-0.7.0/debian/watch yiyantang-0.7.0/debian/watch --- yiyantang-0.7.0/debian/watch 2020-05-15 11:28:27.000000000 +0000 +++ yiyantang-0.7.0/debian/watch 2020-09-30 11:38:02.000000000 +0000 @@ -1,3 +1,4 @@ version=4 +# dead upstream # the original download location http://yiyantang.on.openave.net/ # does no longer exist