diff -Nru mtink-1.0.16/debian/changelog mtink-1.0.16/debian/changelog --- mtink-1.0.16/debian/changelog 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/changelog 2020-07-05 17:05:48.000000000 +0000 @@ -1,3 +1,25 @@ +mtink (1.0.16-11) unstable; urgency=medium + + * QA upload + * Update Vcs-* URIs for move to salsa.debian.org + * Switch to debhelper 13 + * Install documentation in /usr/share/doc/mtink (policy ยง12.3) + * Patch Makefile to not require root for installing binaries + * Set Rules-Requires-Root: no + * Drop dh-exec, not needed with debhelper 13 + * Drop unused dh-buildinfo + * Fix FTBFS with GCC 10 (Closes: #957569) + * Do not link with -Wl,--as-needed, it is now the default + * Mark mtink-doc Multi-Arch: foreign + * Drop mtink.menu, see #741573 + * Use web.archive.org for upstream Homepage and Source, + drop debian/watch + * Drop trailing whitespace in debian/changelog and debian/rules + * Fix some more spelling errors reported by Lintian + * Bump Standards-Version to 4.5.0, no changes + + -- Graham Inggs Sun, 05 Jul 2020 17:05:48 +0000 + mtink (1.0.16-10) unstable; urgency=medium * QA upload. @@ -11,10 +33,10 @@ license of his debconf work. * Added agreement from Sylvain Le Gall regarding the license of his translation work. - * Added agreement from Daniel Nylander + * Added agreement from Daniel Nylander regarding the license of his translation work and correct header in po file. - * Update French translation of the manual page, thanks to Jean-Pierre + * Update French translation of the manual page, thanks to Jean-Pierre Giraud. (Closes: #918043) -- Helge Kreutzmann Sun, 06 Jan 2019 10:45:56 +0100 @@ -111,7 +133,7 @@ mtink (1.0.16-2) unstable; urgency=low * Orphaning the package - * Acknowledge NMU, thanks Stefano ! (Closes: #554185, #534040) + * Acknowledge NMU, thanks Stefano ! (Closes: #554185, #534040) * Add japanese po-debconf (Closes: #512975) * Add russion po-debconf (Closes: #543188) * Apply font change proposed by upstream (Closes: #504317) @@ -203,7 +225,6 @@ * Remove Eduard Bloch as uploaders (i am now the main uploader), thanks to Eduard for his contribution, * Use CDBS. - -- Sylvain Le Gall Sun, 1 Oct 2006 18:14:38 +0200 @@ -236,24 +257,24 @@ mtink (1.0.11-1) unstable; urgency=low * New upstream release - * Replace debconf by ${misc:Dependency} from the dependency field of the + * Replace debconf by ${misc:Dependency} from the dependency field of the control file, it is automatically filled by dh_installdebconf * Update italian debconf translation, thanks to Luca Bruno (Closes: #325623) * Remove patches gcc-4, typo_french, mtink-cups since they are applied upstream * Update FSF address in copyright - * Correct dates in changelog (Jui = Jul) + * Correct dates in changelog (Jui = Jul) -- Sylvain Le Gall Tue, 27 Sep 2005 23:44:37 +0200 mtink (1.0.9-1) unstable; urgency=low * New upstream release - * Create a patch (gcc4.dpatch) to allow building with gcc-4.0 + * Create a patch (gcc4.dpatch) to allow building with gcc-4.0 (Closes: #287679) * Talk with upstream author: * Bug #269127: "This may appear very occasionnally. Never see this bug with - the latest version. This can mostly be ignored." (Closes:#269127) + the latest version. This can mostly be ignored." (Closes:#269127) * Bug #278080: "The user has attached the printer to the // port, the 2.6 kernel has a wrong implementation for the read() call which can't be interrupted. This is fixed for the 1.0.9 release." (Closes: #278080) @@ -264,7 +285,7 @@ * Vietnamese, thanks to Clytie Siddall (Closes: #312976) * German correction, thanks to Jens Seidel (Closes: #313945) * Czech, thanks to Miroslav Kure (Closes: #302878) - * Correct some errors in the debconf, thanks to Clytie Siddall + * Correct some errors in the debconf, thanks to Clytie Siddall (Closes: #312975) * Call debconf-updatepo in the clean target * Redirect stderr to /dev/null in the cups backend (Closes: #293186) @@ -275,9 +296,9 @@ mtink (1.0.5-1) unstable; urgency=high - * New upstream version + * New upstream version * Fix insecure file permissions (CAN-2004-1110) as describe here - http://bugs.gentoo.org/show_bug.cgi?id=70310 (CAN-2004-1110). Set + http://bugs.gentoo.org/show_bug.cgi?id=70310 (CAN-2004-1110). Set urgency high, because it is a security bug ( Closes: #284121 ) * Change the GFDL tp GPL of the different manual pages ( since the different translator have let my name as the upstream authors of the documentation, @@ -320,7 +341,7 @@ * New upstream version * Update policy compliance to 3.6.1 * Fix po/POTFILES.in and de.po to correct debconf-updatepo problems - * Fixed in previous release: removed dependency on libgimp* generated + * Fixed in previous release: removed dependency on libgimp* generated by dh_shlibdeps (closes: #201910) -- Sylvain LE GALL Mon, 5 Jan 2004 12:58:24 +0100 @@ -351,7 +372,7 @@ * Add a directory debian/patches to store different patches * Write faster than i can can't go to gimp1.3, it doesn't build, warn the upstream and send him some patches... - + -- Sylvain LE GALL Fri, 18 Jul 2003 19:27:23 +0200 mtink (0.9.55-3) unstable; urgency=low @@ -409,13 +430,13 @@ -- Sylvain LE GALL Tue, 1 Oct 2002 12:31:38 +0200 mtink (0.9.11-1) unstable; urgency=low - + * New upstream version -- Sylvain LE GALL Thu, 30 Jul 2002 22:27:33 +0200 mtink (0.9-1) unstable; urgency=low - + * Fix the doc-base problem * Add source dependency diff -Nru mtink-1.0.16/debian/compat mtink-1.0.16/debian/compat --- mtink-1.0.16/debian/compat 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru mtink-1.0.16/debian/control mtink-1.0.16/debian/control --- mtink-1.0.16/debian/control 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/control 2020-07-05 17:04:50.000000000 +0000 @@ -2,9 +2,7 @@ Section: misc Priority: optional Maintainer: Debian QA Group -Build-Depends: debhelper (>= 9), - dh-buildinfo, - dh-exec, +Build-Depends: debhelper-compat (= 13), docbook-xml, docbook-xsl, libgimp2.0-dev, @@ -16,10 +14,11 @@ po-debconf, po4a, xsltproc -Standards-Version: 3.9.6 -Homepage: http://xwtools.automatix.de/ -#Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mtink.git -#Vcs-Git: git://anonscm.debian.org/collab-maint/mtink.git +Standards-Version: 4.5.0 +Rules-Requires-Root: no +Homepage: https://web.archive.org/web/20180324135050/http://xwtools.automatix.de/ +Vcs-Browser: https://salsa.debian.org/debian/mtink +Vcs-Git: https://salsa.debian.org/debian/mtink.git Package: mtink Architecture: any @@ -35,6 +34,7 @@ Package: mtink-doc Section: doc Architecture: all +Multi-Arch: foreign Suggests: mtink Depends: ${misc:Depends} Description: Status monitor tool for Epson inkjet printers - documentation diff -Nru mtink-1.0.16/debian/copyright mtink-1.0.16/debian/copyright --- mtink-1.0.16/debian/copyright 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/copyright 2020-07-05 16:43:53.000000000 +0000 @@ -1,7 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Status Monitor for EPSON inkjet printers Upstream-Contact: Jean-Jacques Sarton -Source: http://xwtools.automatix.de/ +Source: https://web.archive.org/web/20180324135050/http://xwtools.automatix.de/ Files: * Copyright: 2001-2007 Jean-Jacques Sarton @@ -14,7 +14,7 @@ Files: debian/* Copyright: 2002-2009 Sylvain Le Gall - 2009-2015,2018 Debian QA Group + 2009-2020 Debian QA Group License: GPL-2.0+ Files: debian/po/cs.po diff -Nru mtink-1.0.16/debian/mtink-doc.doc-base mtink-1.0.16/debian/mtink-doc.doc-base --- mtink-1.0.16/debian/mtink-doc.doc-base 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/mtink-doc.doc-base 2020-07-05 15:29:46.000000000 +0000 @@ -6,5 +6,5 @@ Section: System/Monitoring Format: HTML -Index: /usr/share/doc/mtink-doc/html/index.html -Files: /usr/share/doc/mtink-doc/html/*.html +Index: /usr/share/doc/mtink/html/index.html +Files: /usr/share/doc/mtink/html/*.html diff -Nru mtink-1.0.16/debian/mtink-doc.install mtink-1.0.16/debian/mtink-doc.install --- mtink-1.0.16/debian/mtink-doc.install 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/mtink-doc.install 2020-07-05 15:29:27.000000000 +0000 @@ -1,2 +1,2 @@ -html/*.gif usr/share/doc/mtink-doc/html/ -html/*.html usr/share/doc/mtink-doc/html/ +html/*.gif usr/share/doc/mtink/html/ +html/*.html usr/share/doc/mtink/html/ diff -Nru mtink-1.0.16/debian/mtink.install mtink-1.0.16/debian/mtink.install --- mtink-1.0.16/debian/mtink.install 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/mtink.install 2020-07-05 12:13:50.000000000 +0000 @@ -1,5 +1,4 @@ -#!/usr/bin/dh-exec -gimp-mtink /usr/lib/gimp/${gimp_version}/plug-ins +gimp-mtink /usr/lib/gimp/${env:gimp_version}/plug-ins etc/mtink-cups /usr/lib/cups/backend/mtink debian/mtink.desktop /usr/share/applications debian/mtinkc.desktop /usr/share/applications diff -Nru mtink-1.0.16/debian/mtink.lintian-overrides mtink-1.0.16/debian/mtink.lintian-overrides --- mtink-1.0.16/debian/mtink.lintian-overrides 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/mtink.lintian-overrides 2020-07-05 16:53:21.000000000 +0000 @@ -1,4 +1,5 @@ # Override spelling error warnings detected in non-English text mtink: spelling-error-in-binary usr/bin/mtink proces process mtink: spelling-error-in-binary usr/bin/mtink Ment Meant +mtink: spelling-error-in-binary usr/bin/ttink alignement alignment mtink: spelling-error-in-binary usr/bin/ttink ment meant diff -Nru mtink-1.0.16/debian/mtink.menu mtink-1.0.16/debian/mtink.menu --- mtink-1.0.16/debian/mtink.menu 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/mtink.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -?package(mtink):needs="x11" section="Applications/System/Monitoring"\ - hints="Status Printer"\ - title="Mtink"\ - command="/usr/bin/mtink" -?package(mtink):needs="x11" section="Applications/System/Monitoring"\ - hints="Chooser for Status Printer"\ - title="Mtinkc"\ - command="/usr/bin/mtinkc" diff -Nru mtink-1.0.16/debian/patches/do-not-require-root mtink-1.0.16/debian/patches/do-not-require-root --- mtink-1.0.16/debian/patches/do-not-require-root 1970-01-01 00:00:00.000000000 +0000 +++ mtink-1.0.16/debian/patches/do-not-require-root 2020-07-05 15:50:13.000000000 +0000 @@ -0,0 +1,43 @@ +Description: Do not require root for installing binaries +Forwarded: no +Author: Graham Inggs +Last-Update: 2020-07-05 + +--- a/Makefile.ORG ++++ b/Makefile.ORG +@@ -289,7 +289,7 @@ + + install-mtink: + @#echo install mtink +- @if id | grep '=0(root)' >/dev/null; \ ++ @if true; \ + then \ + mkdir -p $(prefix)/bin >/dev/null 2>&1; \ + if [ -d $(prefix)/doc ]; \ +@@ -318,7 +318,7 @@ + + install-ttink: + @#echo install ttink +- @if id | grep '=0(root)' >/dev/null; \ ++ @if true; \ + then \ + mkdir -p $(prefix)/bin >/dev/null 2>&1; \ + cp ttink $(prefix)/bin; \ +@@ -343,7 +343,7 @@ + @#echo install askPrinter utility + @if [ `uname` = Linux ];\ + then \ +- if id | grep '=0(root)' >/dev/null; \ ++ if true; \ + then \ + mkdir -p $(prefix)/sbin >/dev/null 2>&1; \ + cp $(DETDIR)/askPrinter $(prefix)/sbin; \ +@@ -356,7 +356,7 @@ + @#echo install mtink daemon + @if [ `uname` = Linux ];\ + then \ +- if id | grep '=0(root)' >/dev/null; \ ++ if true; \ + then \ + mkdir -p $(prefix)/sbin >/dev/null 2>&1; \ + cp mtinkd $(prefix)/sbin; \ diff -Nru mtink-1.0.16/debian/patches/fix-spelling-errors mtink-1.0.16/debian/patches/fix-spelling-errors --- mtink-1.0.16/debian/patches/fix-spelling-errors 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/patches/fix-spelling-errors 2020-07-05 16:54:06.000000000 +0000 @@ -1,7 +1,8 @@ Description: fix various spelling errors reported by Lintian -Author: Graham Inggs +Author: Graham Inggs Forwarded: No -Last-Update: 2013-07-31 +Last-Update: 2020-07-05 + --- a/mainSrc/d4lib.c +++ b/mainSrc/d4lib.c @@ -148,14 +148,14 @@ @@ -106,3 +107,14 @@ Photo 895 under Linux. If the printer is powered off and then on, the usb kernel will not detect the printer properly and mtinkd must be at least stopped and started again.
+--- a/server/mtinkd.c ++++ b/server/mtinkd.c +@@ -1088,7 +1088,7 @@ + + if ( debug ) + { +- fprintf(stderr,"Fifo <%s> created and rigths set\n",fifoName); ++ fprintf(stderr,"Fifo <%s> created and rights set\n",fifoName); + } + + /* open the pipe */ diff -Nru mtink-1.0.16/debian/patches/gcc-10 mtink-1.0.16/debian/patches/gcc-10 --- mtink-1.0.16/debian/patches/gcc-10 1970-01-01 00:00:00.000000000 +0000 +++ mtink-1.0.16/debian/patches/gcc-10 2020-07-05 15:59:28.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Fix FTBFS with GCC 10 +Bug-Debian: https://bugs.debian.org/957569 +Forwarded: no +Author: Graham Inggs +Last-Update: 2020-07-05 + +--- a/mainSrc/mtink.h ++++ b/mainSrc/mtink.h +@@ -133,11 +133,11 @@ + + #endif + +-wConfig_data_t firstConfig; +-wConfig_data_t newPrinter; ++extern wConfig_data_t firstConfig; ++extern wConfig_data_t newPrinter; + +-wConfig_data_t exchangeCartridge; +-wConfig_data_t alignHead; ++extern wConfig_data_t exchangeCartridge; ++extern wConfig_data_t alignHead; + + #if WITH_X + extern Widget createNoPrinterBox(char *); diff -Nru mtink-1.0.16/debian/patches/series mtink-1.0.16/debian/patches/series --- mtink-1.0.16/debian/patches/series 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/patches/series 2020-07-05 15:58:22.000000000 +0000 @@ -8,3 +8,5 @@ fix-non-void-function-return fix-function-declarations reproducible-build +do-not-require-root +gcc-10 diff -Nru mtink-1.0.16/debian/rules mtink-1.0.16/debian/rules --- mtink-1.0.16/debian/rules 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/rules 2020-07-05 16:50:44.000000000 +0000 @@ -2,7 +2,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall $(shell dpkg-buildflags --get CPPFLAGS) -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed PO4A_SOURCES := $(CURDIR)/debian/xml-man/po4a/po4a.cfg @@ -35,7 +34,7 @@ debconf-updatepo override_dh_auto_configure: - ./Configure --no-strip --no-suid -p $(CURDIR)/debian/mtink/usr + ./Configure --no-strip --no-suid -p $(CURDIR)/debian/mtink/usr override_dh_auto_build: $(DOCBOOK_MANPAGE_SOURCES) dh_auto_build diff -Nru mtink-1.0.16/debian/watch mtink-1.0.16/debian/watch --- mtink-1.0.16/debian/watch 2019-01-06 09:45:56.000000000 +0000 +++ mtink-1.0.16/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -version=3 -http://xwtools.automatix.de/english/downloads.htm \ -(?:|.*/)mtink(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)