diff -Nru chktex-1.7.6/debian/changelog chktex-1.7.6/debian/changelog --- chktex-1.7.6/debian/changelog 2018-05-03 14:14:03.000000000 +0000 +++ chktex-1.7.6/debian/changelog 2019-08-18 22:55:16.000000000 +0000 @@ -1,17 +1,20 @@ -chktex (1.7.6-1ubuntu2) cosmic; urgency=medium +chktex (1.7.6-3) unstable; urgency=medium - * No-change rebuild for ncurses soname changes. + * debian/control: bump standard to 4.3.0 (no changes) + * debian/rules: avoid FTBFS on gcc9 (Closes: #925652) + * add patches for error handling (Closes: #851276) - -- Matthias Klose Thu, 03 May 2018 14:14:03 +0000 + -- Thorsten Alteholz Mon, 19 Aug 2019 18:40:03 +0200 -chktex (1.7.6-1ubuntu1) zesty; urgency=low +chktex (1.7.6-2) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - debian/patches/fix-ftbfs-with-gold.patch: - + Reorder LIBS in Makefile.in, fix FTBFS - (Ubuntu only change) + * debian/control: add salsa URLs + * debian/control: use dh11 + * debian/control: bump standard to 4.1.4 (no changes) + * add patch to fix FTBFS with TeX Live 2018 (Closes: #896178) + (thanks to Adrian Bunk for the patch) - -- Bhavani Shankar Mon, 02 Jan 2017 10:07:39 +0530 + -- Thorsten Alteholz Sun, 22 Apr 2018 18:40:03 +0200 chktex (1.7.6-1) unstable; urgency=medium @@ -22,20 +25,6 @@ -- Thorsten Alteholz Mon, 10 Oct 2016 19:40:03 +0200 -chktex (1.7.4-1ubuntu2) xenial; urgency=medium - - * No-change rebuild for ncurses6 transition. - - -- Matthias Klose Sun, 07 Feb 2016 09:52:44 +0000 - -chktex (1.7.4-1ubuntu1) wily; urgency=low - - * Merge from Debian unstable. Remaining changes: - - debian/patches/fix-ftbfs-with-gold.patch: - + Reorder LIBS in Makefile.in, fix FTBFS - - -- Angel Abad Wed, 05 Aug 2015 12:25:42 +0200 - chktex (1.7.4-1) unstable; urgency=medium * new upstream version @@ -45,13 +34,6 @@ -- Thorsten Alteholz Sun, 05 Jul 2015 09:40:03 +0200 -chktex (1.7.2-1ubuntu1) saucy; urgency=low - - * debian/patches/fix-ftbfs-with-gold.patch: - - Reorder LIBS in Makefile.in, fix FTBFS - - -- Angel Abad Tue, 02 Jul 2013 12:47:01 +0200 - chktex (1.7.2-1) unstable; urgency=low * new upstream version @@ -79,7 +61,7 @@ chktex (1.6.4-4) unstable; urgency=low - * debian/rules: build-arch and build-indep according to lintian + * debian/rules: build-arch and build-indep according to lintian recommendation added (Closes: #653383) * debian/rules: moved to debhelpe 8.0.0 * debian/rules: remove dh_quilt_* calls @@ -140,7 +122,7 @@ chktex (1.6.3-2) unstable; urgency=low - * Apply patch to escape some \ characters, thanks to Nicolas François. + * Apply patch to escape some \ characters, thanks to Nicolas François. (Closes: #349863) * Update Standards-Version to 3.7.2, no changes needed. * Increase compat to 5 and use debhelper 5. @@ -190,7 +172,7 @@ * Fix doc-base location. (Closes: bug#227040) * Add link to homepage in package description. - * Add ChkTeX.dvi to the package. (Closes: bug#225218) + * Add ChkTeX.dvi to the package. (Closes: bug#225218) -- Baruch Even Sat, 5 Jun 2004 08:45:48 +0300 @@ -200,7 +182,7 @@ (Closes: bug#221327) * Added support for DEB_BUILD_OPTIONS as per policy, updating standard to 3.6.1 - * Remove \textit from italic correction list, add \itshape + * Remove \textit from italic correction list, add \itshape (Closes: bug#224935) -- Baruch Even Thu, 25 Dec 2003 08:41:48 +0200 @@ -247,13 +229,13 @@ * Solve a problem running chktex from within Emacs, the TERM variable isn't set and chktex gave out an error, it now continues. We only lose the ReverseOn and ReverseOff markers. (Closes: bug#159007) - * Enable Emacs support file, it appears to have some users after all :-) + * Enable Emacs support file, it appears to have some users after all :-) -- Baruch Even Sat, 31 Aug 2002 21:00:14 +0300 chktex (1.5-8) unstable; urgency=low - * Fix to handle \verb* as \verb (Thanks to Bernhard R. Link) + * Fix to handle \verb* as \verb (Thanks to Bernhard R. Link) Closes: bug#140715 -- Baruch Even Fri, 17 May 2002 03:23:33 +0300 @@ -288,7 +270,7 @@ chktex (1.5-3) unstable; urgency=medium - * Updated to policy 3.5.2.0. + * Updated to policy 3.5.2.0. * Added manpages for chkweb and chktex. closes: bug#62809. -- Clint Adams Fri, 30 Mar 2001 14:56:47 -0500 @@ -315,4 +297,3 @@ * Initial Release. -- Clint Adams Wed, 23 Apr 1997 00:58:59 -0400 - diff -Nru chktex-1.7.6/debian/compat chktex-1.7.6/debian/compat --- chktex-1.7.6/debian/compat 2016-10-12 00:15:40.000000000 +0000 +++ chktex-1.7.6/debian/compat 2018-04-22 16:40:03.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru chktex-1.7.6/debian/control chktex-1.7.6/debian/control --- chktex-1.7.6/debian/control 2017-01-02 04:39:44.000000000 +0000 +++ chktex-1.7.6/debian/control 2019-08-18 22:19:49.000000000 +0000 @@ -1,17 +1,18 @@ Source: chktex Section: tex Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Thorsten Alteholz -Build-Depends: debhelper (>= 9), - libncurses5-dev, - texlive, - texlive-latex-extra, - latex2html, +Maintainer: Thorsten Alteholz +Build-Depends: debhelper (>= 11), + libncurses-dev, + texlive, + texlive-latex-extra, + latex2html, autoconf, libpcre3-dev -Standards-Version: 3.9.8 +Standards-Version: 4.3.0 Homepage: http://baruch.ev-en.org/proj/chktex/ +Vcs-Browser: https://salsa.debian.org/alteholz/chktex +Vcs-Git: https://salsa.debian.org/alteholz/chktex.git Package: chktex Architecture: any diff -Nru chktex-1.7.6/debian/patches/fix-ftbfs-with-gold.patch chktex-1.7.6/debian/patches/fix-ftbfs-with-gold.patch --- chktex-1.7.6/debian/patches/fix-ftbfs-with-gold.patch 2015-08-05 10:27:08.000000000 +0000 +++ chktex-1.7.6/debian/patches/fix-ftbfs-with-gold.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Reorder LIBS in Makefile.in, fix FTBFS -Author: Angel Abad - ---- a/Makefile.in -+++ b/Makefile.in -@@ -157,7 +157,7 @@ - - - chktex: $(OBJS) -- $(CC) $(LDFLAGS) -o chktex $(OBJS) $(LIBS) -+ $(CC) $(OBJS) $(LDFLAGS) $(LIBS) -o chktex - - install: chktex ChkTeX.dvi - $(MKDIR_P) $(DESTDIR)$(bindir) diff -Nru chktex-1.7.6/debian/patches/series chktex-1.7.6/debian/patches/series --- chktex-1.7.6/debian/patches/series 2017-01-02 04:37:34.000000000 +0000 +++ chktex-1.7.6/debian/patches/series 2019-08-18 22:38:59.000000000 +0000 @@ -1,6 +1,8 @@ manpage.patch #make.patch #strcpy-bug.patch -fix-ftbfs-with-gold.patch latex2html-date.patch spelling.patch +tex-inputenc.patch +warning-handling-1.patch +warning-handling-2.patch diff -Nru chktex-1.7.6/debian/patches/tex-inputenc.patch chktex-1.7.6/debian/patches/tex-inputenc.patch --- chktex-1.7.6/debian/patches/tex-inputenc.patch 1970-01-01 00:00:00.000000000 +0000 +++ chktex-1.7.6/debian/patches/tex-inputenc.patch 2018-04-22 16:40:03.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Specify the input encoding, fixing FTBFS with TeX Live 2018 +Author: Adrian Bunk +Bug-Debian: https://bugs.debian.org/896178 + +--- chktex-1.7.6.orig/ChkTeX.tex.in ++++ chktex-1.7.6/ChkTeX.tex.in +@@ -37,6 +37,7 @@ + + \documentclass[a4paper]{article} + %latex ++\usepackage[latin1]{inputenc} + \usepackage{array, tabularx, verbatim, multicol} + \usepackage[T1]{fontenc} + \nonfrenchspacing diff -Nru chktex-1.7.6/debian/patches/warning-handling-1.patch chktex-1.7.6/debian/patches/warning-handling-1.patch --- chktex-1.7.6/debian/patches/warning-handling-1.patch 1970-01-01 00:00:00.000000000 +0000 +++ chktex-1.7.6/debian/patches/warning-handling-1.patch 2019-08-18 22:39:36.000000000 +0000 @@ -0,0 +1,37 @@ +From 127e9ea31f80e6738d137e8a5022cbb2ab601f4c Mon Sep 17 00:00:00 2001 +From: gvol +Date: Wed, 28 Sep 2016 03:52:31 +0000 +Subject: Only return exit failure on an error/warning + +git-svn-id: svn://svn.savannah.nongnu.org/chktex/trunk@314 29f9d7e1-bebc-0310-b7c6-d7abf8ca9c08 +--- + chktex/FindErrs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/FindErrs.c b/FindErrs.c +index f1a470b..d5494dd 100644 +--- a/FindErrs.c ++++ b/FindErrs.c +@@ -1872,7 +1872,6 @@ PrintError(const char *File, const char *String, + } + else + { +- FoundErr = EXIT_FAILURE; + Context = LaTeXMsgs[Error].Context; + + if (!HeadErrOut) +@@ -1889,9 +1888,11 @@ PrintError(const char *File, const char *String, + { + case etWarn: + WarnPrint++; ++ FoundErr = EXIT_FAILURE; + break; + case etErr: + ErrPrint++; ++ FoundErr = EXIT_FAILURE; + break; + case etMsg: + break; +-- +cgit v1.0-41-gc330 + diff -Nru chktex-1.7.6/debian/patches/warning-handling-2.patch chktex-1.7.6/debian/patches/warning-handling-2.patch --- chktex-1.7.6/debian/patches/warning-handling-2.patch 1970-01-01 00:00:00.000000000 +0000 +++ chktex-1.7.6/debian/patches/warning-handling-2.patch 2019-08-18 22:41:02.000000000 +0000 @@ -0,0 +1,64 @@ +From ec0fb9b58f02a62ff0bfec98b997208e9d7a5998 Mon Sep 17 00:00:00 2001 +From: gvol +Date: Thu, 15 Feb 2018 03:40:09 +0000 +Subject: Make exit status 2 or 3 (not 1) when warnings or errors are found + +This was causing problems with callers that expected a return value of +1 to mean an internal error. + +#53129 + + +git-svn-id: svn://svn.savannah.nongnu.org/chktex/trunk@319 29f9d7e1-bebc-0310-b7c6-d7abf8ca9c08 +--- + chktex/FindErrs.c | 6 ++++-- + chktex/OpSys.h | 5 ++++- + 2 files changed, 8 insertions(+), 3 deletions(-) + +Index: chktex-1.7.6/FindErrs.c +=================================================================== +--- chktex-1.7.6.orig/FindErrs.c ++++ chktex-1.7.6/FindErrs.c +@@ -1884,15 +1884,17 @@ PrintError(const char *File, const char + RGTCTXT(ctInHead, InHeader); + RGTCTXT(ctOutHead, !InHeader); + ++ /* Count how warnings or errors we've found, and ++ * update the return code with the worst. */ + switch (LaTeXMsgs[Error].Type) + { + case etWarn: + WarnPrint++; +- FoundErr = EXIT_FAILURE; ++ FoundErr = max(FoundErr, EXIT_WARNINGS); + break; + case etErr: + ErrPrint++; +- FoundErr = EXIT_FAILURE; ++ FoundErr = max(FoundErr, EXIT_ERRORS); + break; + case etMsg: + break; +Index: chktex-1.7.6/OpSys.h +=================================================================== +--- chktex-1.7.6.orig/OpSys.h ++++ chktex-1.7.6/OpSys.h +@@ -83,6 +83,9 @@ + # define EXIT_SUCCESS 0 + #endif + ++#define EXIT_WARNINGS 2 ++#define EXIT_ERRORS 3 ++ + /* -=><=- -=><=- -=><=- -=><=- -=><=- -=><=- -=><=- -=><=- -=><=- */ + + /* +@@ -189,7 +192,7 @@ + struct WordList; + #endif + /* Sorry; there are now cyclic dependencies in the +-* source tree. :-/ ++* source tree. :-/ + */ + + extern const char *ReverseOn; diff -Nru chktex-1.7.6/debian/rules chktex-1.7.6/debian/rules --- chktex-1.7.6/debian/rules 2016-10-12 00:15:40.000000000 +0000 +++ chktex-1.7.6/debian/rules 2019-08-18 22:19:38.000000000 +0000 @@ -40,7 +40,7 @@ # Add here commands to configure the package. echo $(LDFLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc + --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc build: build-arch build-indep build-arch: build-stamp @@ -53,18 +53,19 @@ # build source cp -p ChkTeX.tex.in ChkTeX.tex.in.backup echo $(DEBDATE) + echo $(LIBS) sed -ri "s/.date..today./$(DEBDATE)/g" ChkTeX.tex.in - $(MAKE) CFLAGS="$(CFLAGS) $(CXXFLAGS)" LDFLAGS="$(LDFLAGS) -lpcreposix -lpcre" chktex ChkTeX.dvi + $(MAKE) CFLAGS="$(CFLAGS) $(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS) -lpcreposix -lpcre -ltermcap" chktex ChkTeX.dvi # build html documentation $(MAKE) html mv ChkTeX.tex.in.backup ChkTeX.tex.in touch build-stamp -clean: +clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp # Add here commands to clean up after the build process. [ ! -f Makefile ] || [ ! -f config.status ] || $(MAKE) clean @@ -111,9 +112,4 @@ binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install - -get-orig-source: - mkdir -p ../tarballs - uscan --verbose --force-download --destdir=../tarballs - +.PHONY: build clean binary-indep binary-arch binary install diff -Nru chktex-1.7.6/debian/watch chktex-1.7.6/debian/watch --- chktex-1.7.6/debian/watch 2016-10-12 00:15:40.000000000 +0000 +++ chktex-1.7.6/debian/watch 2019-08-18 22:34:09.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://download.savannah.gnu.org/releases/chktex/ (?:.*/)?chktex-([\d+\.]+|\d+)\.tar.* debian uupdate +https://download.savannah.gnu.org/releases/chktex/ (?:.*/)?chktex-([\d+\.]+|\d+)\.tar.* debian uupdate