diff -Nru foo2zjs-20151024dfsg0/ChangeLog foo2zjs-20160313dfsg0/ChangeLog --- foo2zjs-20151024dfsg0/ChangeLog 2015-12-11 17:25:37.000000000 +0000 +++ foo2zjs-20160313dfsg0/ChangeLog 2016-04-25 19:28:24.000000000 +0000 @@ -1,3 +1,6 @@ +2016-03-13 Rick Richardson + * icc2ps/lcms.h: USE_CUSTOM_SWAB defined. + 2015-10-24 Rick Richardson * foomatic-db/printer/Epson-AcuLaser_CX17NF.xml: Change margins on Epson AcuLaser CX17NF. diff -Nru foo2zjs-20151024dfsg0/debian/changelog foo2zjs-20160313dfsg0/debian/changelog --- foo2zjs-20151024dfsg0/debian/changelog 2016-04-07 11:08:31.000000000 +0000 +++ foo2zjs-20160313dfsg0/debian/changelog 2016-06-18 13:07:05.000000000 +0000 @@ -1,9 +1,27 @@ -foo2zjs (20151024dfsg0-1ubuntu1) xenial; urgency=medium +foo2zjs (20160313dfsg0-2) unstable; urgency=medium - * Explicitly prefer cups-filters as the real provider of foomatic-filters; - it's already the one in Ubuntu main. + [ Colin Watson ] + * Explicitly prefer cups-filters as the real provider of foomatic-filters - -- Colin Watson Thu, 07 Apr 2016 12:08:30 +0100 + -- Didier Raboud Sat, 18 Jun 2016 15:06:36 +0200 + +foo2zjs (20160313dfsg0-1) unstable; urgency=medium + + * New 20160313 upstream release + + * DFSG repack (no changes from previous releases). + - remove binary file c5200mono.prn + - remove crd/qpdl/CLP* , because copyright is unclear + * Refresh patches + * Bump S-V to 3.9.8 without changes needed + + -- Didier Raboud Mon, 25 Apr 2016 22:04:14 +0200 + +foo2zjs (20151024dfsg0-2) unstable; urgency=medium + + * Add patch to build manpages & manual reproducibly + + -- Didier Raboud Fri, 26 Feb 2016 11:35:42 +0100 foo2zjs (20151024dfsg0-1) unstable; urgency=medium diff -Nru foo2zjs-20151024dfsg0/debian/control foo2zjs-20160313dfsg0/debian/control --- foo2zjs-20151024dfsg0/debian/control 2016-04-07 10:53:13.000000000 +0000 +++ foo2zjs-20160313dfsg0/debian/control 2016-06-18 13:08:03.000000000 +0000 @@ -1,8 +1,7 @@ Source: foo2zjs Section: text Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Printing Team +Maintainer: Debian Printing Team Uploaders: Luca Capello , Didier Raboud Build-Depends: debhelper (>= 9), ghostscript, @@ -15,7 +14,7 @@ pyppd (>= 1.0.2-1~), libjbig-dev XS-Testsuite: autopkgtest -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://foo2zjs.rkkda.com/ Vcs-Git: https://anonscm.debian.org/git/printing/foo2zjs.git Vcs-Browser: https://anonscm.debian.org/cgit/printing/foo2zjs.git diff -Nru foo2zjs-20151024dfsg0/debian/patches/10-makefile.patch foo2zjs-20160313dfsg0/debian/patches/10-makefile.patch --- foo2zjs-20151024dfsg0/debian/patches/10-makefile.patch 2015-12-11 17:26:50.000000000 +0000 +++ foo2zjs-20160313dfsg0/debian/patches/10-makefile.patch 2016-04-25 19:57:55.000000000 +0000 @@ -3,7 +3,7 @@ Author: Steffen Joeris Author: Luca Capello Author: Didier Raboud -Last-Update: 2014-01-07 +Last-Update: 2016-04-16 --- a/Makefile +++ b/Makefile @@ -184,7 +184,7 @@ ln -sf $(BIN)/command2foo2lava-pjl $(CUPS_SERVERBIN)/filter/; \ fi -@@ -1436,10 +1432,9 @@ +@@ -1432,10 +1428,9 @@ *) driver=foo2zjs;; \ esac; \ echo $$driver - $$printer; \ @@ -196,7 +196,7 @@ -d $$driver -p $$printer \ > PPD/$$printer.ppd; \ done -@@ -1873,7 +1868,7 @@ +@@ -1869,7 +1864,7 @@ misc: pksm2bitcmyk phorum-logo.gif pksm2bitcmyk: pksm2bitcmyk.c diff -Nru foo2zjs-20151024dfsg0/debian/patches/20-system-lcms.patch foo2zjs-20160313dfsg0/debian/patches/20-system-lcms.patch --- foo2zjs-20151024dfsg0/debian/patches/20-system-lcms.patch 2015-12-11 17:27:02.000000000 +0000 +++ foo2zjs-20160313dfsg0/debian/patches/20-system-lcms.patch 2016-04-25 20:03:01.000000000 +0000 @@ -1,5 +1,6 @@ Description: don't build icc2ps (instead use psicc from liblcms2-utils) Author: Michael Gilbert +Last-Update: 2016-04-25 --- a/Makefile +++ b/Makefile @@ -35,7 +36,7 @@ install-extra install-crd install-foo install-ppd \ install-gui install-desktop install-filter \ install-man install-doc -@@ -1130,7 +1123,6 @@ +@@ -1126,7 +1119,6 @@ -rm -f $(MANDIR)/man1/foo2hbpl*.1 $(MANDIR)/man1/hbpldecode.1 -rm -f $(MANDIR)/man1/gipddecode.1 -rm -f $(MANDIR)/man1/arm2hpdl.1 $(MANDIR)/man1/usb_printerid.1 @@ -43,7 +44,7 @@ -rm -rf /usr/share/foo2zjs/ -rm -rf /usr/share/foo2hp/ -rm -rf /usr/share/foo2oak/ -@@ -1155,7 +1147,6 @@ +@@ -1151,7 +1143,6 @@ -rm -f /usr/bin/hbpldecode -rm -f /usr/bin/opldecode -rm -f /usr/bin/rodecode @@ -51,7 +52,7 @@ -rm -f /usr/bin/foo2zjs-pstops -rm -f /usr/bin/command2foo2lava-pjl -rm -f /usr/lib/cups/filter/command2foo2lava-pjl -@@ -1198,7 +1189,6 @@ +@@ -1194,7 +1185,6 @@ -rm -f *.zjs *.zm *.zc *.zc? *.zc?? *.oak *.pbm *.pksm *.cmyk -rm -f pksm2bitcmyk -rm -f *.icm.*.ps @@ -59,7 +60,7 @@ cd osx-hotplug; $(MAKE) $@ # -@@ -1348,7 +1338,7 @@ +@@ -1344,7 +1334,7 @@ # # icc2ps regression tests # @@ -68,7 +69,7 @@ icctest: for g in *.icm; do \ for i in 0 1 2 3; do \ -@@ -1447,7 +1437,7 @@ +@@ -1443,7 +1433,7 @@ # Manpage generation. No, I am not interested in "info" files or # HTML documentation. # @@ -77,7 +78,7 @@ $(MANPAGES): macros.man includer-man -@@ -1514,7 +1504,6 @@ +@@ -1510,7 +1500,6 @@ $(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/ $(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/ $(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/ @@ -85,7 +86,7 @@ ifeq ($(UNAME),Darwin) cd osx-hotplug; $(MAKE) install-man endif -@@ -1535,10 +1524,9 @@ +@@ -1531,10 +1520,9 @@ GROFF=/usr/local/test/bin/groff GROFF=groff diff -Nru foo2zjs-20151024dfsg0/debian/patches/98-build-manpages-reproducibly.patch foo2zjs-20160313dfsg0/debian/patches/98-build-manpages-reproducibly.patch --- foo2zjs-20151024dfsg0/debian/patches/98-build-manpages-reproducibly.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160313dfsg0/debian/patches/98-build-manpages-reproducibly.patch 2016-04-25 20:03:44.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Build manpages reproducibly, through reading the MODTIME from + debian/changelog exclusively, and giving LC_ALL=C.UTF-8 TZ=UTC to various + commands +Author: Didier Raboud +Last-Update: 2016-04-25 +--- a/Makefile ++++ b/Makefile +@@ -79,6 +79,8 @@ + ifeq ($(UNAME),SunOS) + MODTIME= `ls -e $$1 | cut -c42-61` + endif ++# Define modtime from the debian changelog, for all files ++MODTIME= LC_ALL=C.UTF-8 TZ=UTC date -d "$$(dpkg-parsechangelog -SDate)" "+%a %b %d %T %Y" + + # + # Files for tarball +@@ -1515,12 +1517,12 @@ + $(INSTALL) -c -m 644 ChangeLog $(DOCDIR) + + GROFF=/usr/local/test/bin/groff +-GROFF=groff ++GROFF=LC_ALL=C.UTF-8 TZ=UTC groff + manual.pdf: $(MANPAGES) osx-hotplug/osx-hplj-hotplug.1 + -$(GROFF) -t -man \ + `ls $(MANPAGES) \ + osx-hotplug/osx-hplj-hotplug.1 \ +- | sort` \ ++ | LC_ALL=C.UTF-8 sort` \ + | ps2pdf - $@ + + README: README.in diff -Nru foo2zjs-20151024dfsg0/debian/patches/series foo2zjs-20160313dfsg0/debian/patches/series --- foo2zjs-20151024dfsg0/debian/patches/series 2015-12-11 17:25:49.000000000 +0000 +++ foo2zjs-20160313dfsg0/debian/patches/series 2016-04-25 19:56:31.000000000 +0000 @@ -20,3 +20,4 @@ 95-udev-firmware-script-no-hplip-rules-removal.patch 96-hplj1000-fix-cups-usb-backend-firmware-upload.patch 97-hplj1000-fix-firmware-upload-infite-loop.patch +98-build-manpages-reproducibly.patch diff -Nru foo2zjs-20151024dfsg0/icc2ps/lcms.h foo2zjs-20160313dfsg0/icc2ps/lcms.h --- foo2zjs-20151024dfsg0/icc2ps/lcms.h 2015-12-11 17:25:37.000000000 +0000 +++ foo2zjs-20160313dfsg0/icc2ps/lcms.h 2016-04-25 19:28:24.000000000 +0000 @@ -55,7 +55,7 @@ // Some machines does not have a reliable 'swab' function. Usually // leave commented unless the testbed diagnoses the contrary. -// #define USE_CUSTOM_SWAB 1 +#define USE_CUSTOM_SWAB 1 // Uncomment this if your compiler supports inline #define USE_INLINE 1 diff -Nru foo2zjs-20151024dfsg0/Makefile foo2zjs-20160313dfsg0/Makefile --- foo2zjs-20151024dfsg0/Makefile 2015-12-11 17:25:37.000000000 +0000 +++ foo2zjs-20160313dfsg0/Makefile 2016-04-25 19:28:24.000000000 +0000 @@ -1077,6 +1077,7 @@ echo "w"; \ ) | ex $(CUPSDCONF); \ fi + # systemctl uses 2 things and no way to differentiate! if [ -x /etc/init.d/cups ]; then \ /etc/init.d/cups restart; \ if [ $$? != 0 ]; then \ @@ -1094,12 +1095,7 @@ cp /usr/local/etc/rc.d/cups.sh.sample /usr/local/etc/rc.d/cups.sh; \ /usr/local/etc/rc.d/cups.sh restart; \ elif [ -x /bin/systemctl ]; then \ - CUPS_MAJVER=`$(CUPSMAJVER)`; \ - if [ "$$CUPS_MAJVER" = 2 ]; then \ - systemctl restart org.cups.cupsd.service; \ - else \ - systemctl restart cups.service; \ - fi \ + systemctl restart cups.service org.cups.cupsd.service || exit 0; \ elif [ -x /bin/launchctl ]; then \ /bin/launchctl unload $(MACLOAD); \ /bin/launchctl load $(MACLOAD); \