control: tag -1 patch On Fri, Aug 8, 2014 at 3:04 PM, Michael Gilbert wrote: > icc2ps was renamed to psicc between lcms1 and lcms2. So, this should > be easily fixed via s/foo2zjs-icc2ps/psicc/g, dropping foo2zjs-icc2ps > from make, and adding a liblcms2-utils dependency.
Hi, I've uploaded an nmu with these changes. Please see attached patch. Best wishes, Mike
diff -Nru foo2zjs-20140519dfsg0/debian/changelog foo2zjs-20140519dfsg0/debian/changelog --- foo2zjs-20140519dfsg0/debian/changelog 2014-08-01 15:02:19.000000000 +0000 +++ foo2zjs-20140519dfsg0/debian/changelog 2014-09-28 21:47:37.000000000 +0000 @@ -1,3 +1,10 @@ +foo2zjs (20140519dfsg0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use psicc from lcms2 (closes: #757384). + + -- Michael Gilbert <mgilb...@debian.org> Sun, 28 Sep 2014 21:34:38 +0000 + foo2zjs (20140519dfsg0-2) unstable; urgency=medium * Add autopkgtest suite diff -Nru foo2zjs-20140519dfsg0/debian/control foo2zjs-20140519dfsg0/debian/control --- foo2zjs-20140519dfsg0/debian/control 2014-08-01 15:02:19.000000000 +0000 +++ foo2zjs-20140519dfsg0/debian/control 2014-09-28 21:47:37.000000000 +0000 @@ -8,7 +8,7 @@ foomatic-filters, foomatic-db-engine, libcups2-dev, - liblcms1-dev, + liblcms2-utils, dc, time, pyppd (>= 1.0.2-1~), @@ -21,7 +21,7 @@ Package: printer-driver-foo2zjs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ubuntu:mscompress}, foomatic-filters, dc, printer-driver-foo2zjs-common (>= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ubuntu:mscompress}, foomatic-filters, dc, printer-driver-foo2zjs-common (>= ${source:Version}), liblcms2-utils Recommends: wget, unzip, ${debian:mscompress}, cups, cups-client Suggests: psutils, hannah-foo2zjs Breaks: udev (<< 136-1), cups (<< 1.5.0-3~), foo2zjs (<< 20111023dfsg0-1~) diff -Nru foo2zjs-20140519dfsg0/debian/patches/99-system-lcms.patch foo2zjs-20140519dfsg0/debian/patches/99-system-lcms.patch --- foo2zjs-20140519dfsg0/debian/patches/99-system-lcms.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20140519dfsg0/debian/patches/99-system-lcms.patch 2014-09-28 21:47:37.000000000 +0000 @@ -0,0 +1,99 @@ +Description: don't build icc2ps (instead use psicc from liblcms2-utils) +Author: Michael Gilbert <mgilb...@debian.org> + +--- a/Makefile ++++ b/Makefile +@@ -184,13 +184,6 @@ FILES = \ + foomatic-db/*/*.xml \ + foomatic-test \ + getweb.in \ +- icc2ps/*.[ch] \ +- icc2ps/*.1in \ +- icc2ps/Makefile \ +- icc2ps/AUTHORS \ +- icc2ps/COPYING \ +- icc2ps/README \ +- icc2ps/README.foo2zjs \ + osx-hotplug/Makefile \ + osx-hotplug/*.m \ + osx-hotplug/*.1in \ +@@ -371,7 +364,7 @@ JBGOPTS=-m 16 -d 0 -p 92 # Equivalent op + # The usual build rules + # + all: all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb \ +- all-icc2ps all-osx-hotplug man doc \ ++ all-osx-hotplug man doc \ + all-done + + all-test: +@@ -593,7 +586,7 @@ command2foo2lava-pjl.o: command2foo2lava + # + # Installation rules + # +-install: all install-test install-prog install-icc2ps install-osx-hotplug \ ++install: all install-test install-prog install-osx-hotplug \ + install-extra install-crd install-foo install-ppd \ + install-gui install-desktop install-filter \ + install-man install-doc +@@ -1109,7 +1102,6 @@ uninstall: + -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 +- -rm -f $(MANDIR)/man1/foo2zjs-icc2ps.1 + -rm -rf /usr/share/foo2zjs/ + -rm -rf /usr/share/foo2hp/ + -rm -rf /usr/share/foo2oak/ +@@ -1134,7 +1126,6 @@ uninstall: + -rm -f /usr/bin/hbpldecode + -rm -f /usr/bin/opldecode + -rm -f /usr/bin/rodecode +- -rm -f /usr/bin/foo2zjs-icc2ps + -rm -f /usr/bin/foo2zjs-pstops + -rm -f /usr/bin/command2foo2lava-pjl + -rm -f /usr/lib/cups/filter/command2foo2lava-pjl +@@ -1177,7 +1168,6 @@ clean: + -rm -f *.zjs *.zm *.zc *.zc? *.zc?? *.oak *.pbm *.pksm *.cmyk + -rm -f pksm2bitcmyk + -rm -f *.icm.*.ps +- cd icc2ps; $(MAKE) $@ + cd osx-hotplug; $(MAKE) $@ + + # +@@ -1327,7 +1317,7 @@ pprtest-3.oak: FRC + # + # icc2ps regression tests + # +-ICC2PS=./icc2ps/foo2zjs-icc2ps ++ICC2PS=/usr/bin/psicc + icctest: + for g in *.icm; do \ + for i in 0 1 2 3; do \ +@@ -1424,7 +1414,7 @@ oldppd: + # Manpage generation. No, I am not interested in "info" files or + # HTML documentation. + # +-man: $(MANPAGES) man-icc2ps man-osx-hotplug ++man: $(MANPAGES) man-osx-hotplug + + $(MANPAGES): macros.man includer-man + +@@ -1491,7 +1481,6 @@ install-man: man + $(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/ +- cd icc2ps; $(MAKE) install-man + ifeq ($(UNAME),Darwin) + cd osx-hotplug; $(MAKE) install-man + endif +@@ -1512,10 +1501,9 @@ install-doc: doc + + GROFF=/usr/local/test/bin/groff + GROFF=groff +-manual.pdf: $(MANPAGES) icc2ps/foo2zjs-icc2ps.1 osx-hotplug/osx-hplj-hotplug.1 ++manual.pdf: $(MANPAGES) osx-hotplug/osx-hplj-hotplug.1 + -$(GROFF) -t -man \ + `ls $(MANPAGES) \ +- icc2ps/foo2zjs-icc2ps.1 \ + osx-hotplug/osx-hplj-hotplug.1 \ + | sort` \ + | ps2pdf - $@ diff -Nru foo2zjs-20140519dfsg0/debian/patches/series foo2zjs-20140519dfsg0/debian/patches/series --- foo2zjs-20140519dfsg0/debian/patches/series 2014-08-01 15:02:19.000000000 +0000 +++ foo2zjs-20140519dfsg0/debian/patches/series 2014-09-28 21:47:37.000000000 +0000 @@ -18,3 +18,4 @@ 92-udev-firmware-script-fixes.patch 95-udev-firmware-script-no-hplip-rules-removal.patch 96-hplj1000-fix-cups-usb-backend-firmware-upload.patch +99-system-lcms.patch diff -Nru foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs-common.install foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs-common.install --- foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs-common.install 2014-06-05 09:16:27.000000000 +0000 +++ foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs-common.install 2014-09-28 21:47:37.000000000 +0000 @@ -49,7 +49,6 @@ usr/share/man/man1/foo2xqx.1 usr/share/man/man1/foo2xqx-wrapper.1 usr/share/man/man1/foo2zjs.1 -usr/share/man/man1/foo2zjs-icc2ps.1 usr/share/man/man1/foo2zjs-pstops.1 usr/share/man/man1/foo2zjs-wrapper.1 usr/share/man/man1/gipddecode.1 diff -Nru foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.install foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.install --- foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.install 2014-06-05 09:16:27.000000000 +0000 +++ foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.install 2014-09-28 21:47:37.000000000 +0000 @@ -8,7 +8,6 @@ usr/bin/foo2slx usr/bin/foo2xqx usr/bin/foo2zjs -usr/bin/foo2zjs-icc2ps usr/bin/gipddecode usr/bin/hbpldecode usr/bin/hipercdecode diff -Nru foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.links foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.links --- foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.links 2014-06-05 09:16:27.000000000 +0000 +++ foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.links 2014-09-28 21:47:37.000000000 +0000 @@ -7,3 +7,5 @@ lib/udev/hplj1000 lib/udev/hpljP1008 lib/udev/hplj1000 lib/udev/hpljP1505 lib/udev/hplj1000 lib/udev/hpljP1505n + +usr/bin/psicc usr/bin/foo2zjs-icc2ps