From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 14 19:20:08 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBD541065670 for ; Sun, 14 Mar 2010 19:20:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C74F28FC0A for ; Sun, 14 Mar 2010 19:20:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o2EJK61i076689 for ; Sun, 14 Mar 2010 19:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2EJK61k076688; Sun, 14 Mar 2010 19:20:06 GMT (envelope-from gnats) Resent-Date: Sun, 14 Mar 2010 19:20:06 GMT Resent-Message-Id: <201003141920.o2EJK61k076688@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pierre Guinoiseau Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B7211065670 for ; Sun, 14 Mar 2010 19:16:27 +0000 (UTC) (envelope-from geekounet@poildetroll.net) Received: from tritus.poildetroll.net (tritus.poildetroll.net [IPv6:2001:758:f00:3::4:1]) by mx1.freebsd.org (Postfix) with ESMTP id 6BED98FC0A for ; Sun, 14 Mar 2010 19:16:26 +0000 (UTC) Received: from kyleck.poildetroll.net (kyleck.poildetroll.net [IPv6:2001:758:f00:3:bad:cafe:42:1]) by tritus.poildetroll.net (Postfix) with SMTP id E527B4A21 for ; Sun, 14 Mar 2010 20:16:23 +0100 (CET) Received: by kyleck.poildetroll.net (sSMTP sendmail emulation); Sun, 14 Mar 2010 20:16:23 +0100 Message-Id: <20100314191627.3B7211065670@hub.freebsd.org> Date: Sun, 14 Mar 2010 20:16:23 +0100 From: "Pierre Guinoiseau" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/144745: [patch] print/hplip3: update to 3.10.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Pierre Guinoiseau List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2010 19:20:09 -0000 >Number: 144745 >Category: ports >Synopsis: [patch] print/hplip3: update to 3.10.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Mar 14 19:20:06 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Pierre Guinoiseau >Release: FreeBSD 8.0-STABLE amd64 >Organization: >Environment: System: FreeBSD korriban.home.poildetroll.net 8.0-STABLE FreeBSD 8.0-STABLE #0 r204828: Sun Mar 7 16:57:30 CET 2010 root@korriban.home.poildetroll.net:/usr/obj/usr/src/sys/KORRIBAN amd64 >Description: The attached patch updates print/hplip3 to 3.10.2. It includes 2 more patches to fix build, and updates pkg-plist (and fix the python related @rmdir). >How-To-Repeat: >Fix: --- hplip-3.10.2.diff begins here --- diff -ruN --exclude=CVS /usr/ports/print/hplip3.orig/Makefile /usr/ports/print/hplip3/Makefile --- /usr/ports/print/hplip3.orig/Makefile 2010-03-14 12:45:09.304195123 +0100 +++ /usr/ports/print/hplip3/Makefile 2010-03-14 19:21:48.261790000 +0100 @@ -6,8 +6,7 @@ # PORTNAME= hplip -PORTVERSION= 3.9.8 -PORTREVISION= 3 +PORTVERSION= 3.10.2 CATEGORIES= print MASTER_SITES= SF diff -ruN --exclude=CVS /usr/ports/print/hplip3.orig/distinfo /usr/ports/print/hplip3/distinfo --- /usr/ports/print/hplip3.orig/distinfo 2009-09-07 02:40:22.000000000 +0200 +++ /usr/ports/print/hplip3/distinfo 2010-03-13 17:28:54.413752000 +0100 @@ -1,3 +1,3 @@ -MD5 (hplip-3.9.8.tar.gz) = cb1cf49c5f062993b78fc2768f531ed8 -SHA256 (hplip-3.9.8.tar.gz) = 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36 -SIZE (hplip-3.9.8.tar.gz) = 15715640 +MD5 (hplip-3.10.2.tar.gz) = 4df6f16c47ae7edd015bf2cf5155f26f +SHA256 (hplip-3.10.2.tar.gz) = bb9a3aeda9a8d31f0cc790e629f14d2122f9bff111b0d3cc97ac19a8607d7956 +SIZE (hplip-3.10.2.tar.gz) = 21446275 diff -ruN --exclude=CVS /usr/ports/print/hplip3.orig/files/patch-Makefile.in /usr/ports/print/hplip3/files/patch-Makefile.in --- /usr/ports/print/hplip3.orig/files/patch-Makefile.in 2009-09-07 02:40:22.000000000 +0200 +++ /usr/ports/print/hplip3/files/patch-Makefile.in 2010-03-13 18:23:14.553201000 +0100 @@ -1,9 +1,9 @@ ---- Makefile.in.old 2009-06-22 23:34:25.000000000 -0500 -+++ Makefile.in 2009-06-22 23:41:26.000000000 -0500 -@@ -2006,22 +2006,11 @@ - data/rules/40-hplip.rules data/rules/55-hpmud.rules - dist_rulesDATA_INSTALL = $(INSTALL_DATA) - dist_unrelDATA_INSTALL = $(INSTALL_DATA) +--- Makefile.in.orig 2010-02-25 00:10:02.000000000 +0100 ++++ Makefile.in 2010-03-13 18:22:52.633078016 +0100 +@@ -2077,20 +2077,9 @@ + ui/pluginlicenseform_base.py ui/pluginlicenseform.py \ + ui/align13form_base.py ui/align13form.py + am__dist_ui4_DATA_DIST = ui4/*.py -am__dist_www0_DATA_DIST = $(wwwsrc)/index.html \ - $(wwwsrc)/commandline.html $(wwwsrc)/copying.html \ - $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html \ @@ -16,18 +16,16 @@ - $(wwwsrc)/setup.html $(wwwsrc)/systray.html \ - $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html \ - $(wwwsrc)/upgrading.html -+am__dist_www0_DATA_DIST = $(wwwsrc)/*.html - dist_www0DATA_INSTALL = $(INSTALL_DATA) -am__dist_www3_DATA_DIST = $(wwwsrc)/styles/* -+am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*.css - dist_www3DATA_INSTALL = $(INSTALL_DATA) -am__dist_www4_DATA_DIST = $(wwwsrc)/images/* ++am__dist_www0_DATA_DIST = $(wwwsrc)/*.html ++am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*.css +am__dist_www4_DATA_DIST = $(wwwsrc)/images/*.png $(wwwsrc)/images/*.ico - dist_www4DATA_INSTALL = $(INSTALL_DATA) - docDATA_INSTALL = $(INSTALL_DATA) - hplip_confDATA_INSTALL = $(INSTALL_DATA) -@@ -3679,11 +3668,12 @@ - @HPLIP_BUILD_TRUE@hp_mkuri_LDADD = -ldl libhpmud.la + DATA = $(cupsdrv_DATA) $(cupsdrv2_DATA) $(dist_base_DATA) \ + $(dist_copier_DATA) $(dist_fax_DATA) $(dist_fax_filters_DATA) \ + $(dist_halpre_DATA) $(dist_hpcupsfaxppd_DATA) \ +@@ -3777,11 +3766,12 @@ + @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" # hpmud.rules -@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d @@ -44,3 +42,12 @@ # hplip.conf @HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp +@@ -4070,7 +4060,7 @@ + @HPCUPS_INSTALL_TRUE@ prnt/hpcups/dj4100PrintModes.h + + @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) +-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage ++@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage -lcompat + #else + #hpcupsdir = $(cupsfilterdir) + #hpcups_PROGRAMS = hpcups diff -ruN --exclude=CVS /usr/ports/print/hplip3.orig/files/patch-prnt-hpcups-ErnieFilter.cpp /usr/ports/print/hplip3/files/patch-prnt-hpcups-ErnieFilter.cpp --- /usr/ports/print/hplip3.orig/files/patch-prnt-hpcups-ErnieFilter.cpp 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/print/hplip3/files/patch-prnt-hpcups-ErnieFilter.cpp 2010-03-13 18:04:49.877679000 +0100 @@ -0,0 +1,12 @@ +--- prnt/hpcups/ErnieFilter.cpp.orig 2010-03-13 17:59:45.892021756 +0100 ++++ prnt/hpcups/ErnieFilter.cpp 2010-03-13 18:03:53.566338755 +0100 +@@ -50,9 +50,7 @@ + #include "ErnieFilter.h" + + +-#if defined(__APPLE__) || defined(__linux) + #include +-#endif + + + #if kGatherStats == 1 diff -ruN --exclude=CVS /usr/ports/print/hplip3.orig/pkg-plist /usr/ports/print/hplip3/pkg-plist --- /usr/ports/print/hplip3.orig/pkg-plist 2010-02-12 09:49:31.000000000 +0100 +++ /usr/ports/print/hplip3/pkg-plist 2010-03-14 19:33:05.979251000 +0100 @@ -51,48 +51,49 @@ lib/sane/libsane-hpaio.la lib/sane/libsane-hpaio.so lib/sane/libsane-hpaio.so.1 -libexec/cups/filter/hpcac -libexec/cups/filter/hpcups -libexec/cups/filter/hpcupsfax -libexec/cups/filter/hplipjs libexec/cups/backend/hp libexec/cups/backend/hpfax libexec/cups/driver/hpcups.drv libexec/cups/filter/foomatic-rip-hplip -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/COPYING -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/README_LIBJPG -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/commandline.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/copying.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/copyright -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/devicemanager.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/faxtrouble.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/gettinghelp.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/hpscan.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/favicon.ico -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/print.png -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_actions.png -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_fax.png -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_print_control.png -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_print_settings.png -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_status.png -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_supplies.png -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/xsane.png -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/index.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/mainttask.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/plugins.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/print.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printing.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printoptions.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printtroubleshooting.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/scanning.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/scantrouble.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/sendfax.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/setup.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/styles/css.css -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/systray.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/troubleshooting.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/uninstalling.html -%%PORTDOCS%%%%DOCSDIR%%-3.9.8/upgrading.html +libexec/cups/filter/hpcac +libexec/cups/filter/hpcups +libexec/cups/filter/hpcupsfax +libexec/cups/filter/hplipjs +libexec/cups/filter/pstotiff +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/COPYING +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/README_LIBJPG +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/commandline.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/copying.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/copyright +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/devicemanager.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/faxtrouble.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/gettinghelp.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/hpscan.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/images/favicon.ico +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/images/print.png +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/images/toolbox_actions.png +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/images/toolbox_fax.png +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/images/toolbox_print_control.png +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/images/toolbox_print_settings.png +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/images/toolbox_status.png +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/images/toolbox_supplies.png +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/images/xsane.png +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/index.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/mainttask.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/plugins.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/print.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/printing.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/printoptions.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/printtroubleshooting.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/scanning.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/scantrouble.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/sendfax.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/setup.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/styles/css.css +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/systray.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/troubleshooting.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/uninstalling.html +%%PORTDOCS%%%%DOCSDIR%%-3.10.2/upgrading.html %%DATADIR%%/__init__.py %%DATADIR%%/align.py %%DATADIR%%/base/__init__.py @@ -190,6 +191,7 @@ %%DATADIR%%/data/images/24x24/remove_user.png %%DATADIR%%/data/images/24x24/rename_group.png %%DATADIR%%/data/images/256x256/hp_logo.png +%%DATADIR%%/data/images/256x256/logo.png %%DATADIR%%/data/images/32x32/align.png %%DATADIR%%/data/images/32x32/battery.png %%DATADIR%%/data/images/32x32/busy.png @@ -478,7 +480,11 @@ %%DATADIR%%/fax/coverpages.py %%DATADIR%%/fax/fax.py %%DATADIR%%/fax/faxdevice.py +%%DATADIR%%/fax/marvellfax.py %%DATADIR%%/fax/pmlfax.py +%%DATADIR%%/fax/pstotiff +%%DATADIR%%/fax/pstotiff.convs +%%DATADIR%%/fax/pstotiff.types %%DATADIR%%/fax/soapfax.py %%DATADIR%%/faxsetup.py %%DATADIR%%/firmware.py @@ -579,8 +585,13 @@ %%DATADIR%%/ui4/wifisetupdialog_base.py %%DATADIR%%/unload.py %%DATADIR%%/wificonfig.py +share/applications/hplip.desktop share/ppd/HP/HP-Fax-hpcups.ppd.gz +share/ppd/HP/HP-Fax-hpijs.ppd.gz share/ppd/HP/HP-Fax2-hpcups.ppd.gz +share/ppd/HP/HP-Fax2-hpijs.ppd.gz +share/ppd/HP/HP-Fax3-hpcups.ppd.gz +share/ppd/HP/HP-Fax3-hpijs.ppd.gz share/ppd/HP/hp-2000c-hpijs.ppd.gz share/ppd/HP/hp-2500c-hpijs.ppd.gz share/ppd/HP/hp-910-hpijs.ppd.gz @@ -688,6 +699,7 @@ share/ppd/HP/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz share/ppd/HP/hp-color_laserjet_cm6030_mfp-ps.ppd.gz share/ppd/HP/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz +share/ppd/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz share/ppd/HP/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz share/ppd/HP/hp-color_laserjet_cm6049_mfp-ps.ppd.gz share/ppd/HP/hp-color_laserjet_cp1215-hpijs.ppd.gz @@ -711,15 +723,27 @@ share/ppd/HP/hp-color_laserjet_cp3525-ps.ppd.gz share/ppd/HP/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz share/ppd/HP/hp-color_laserjet_cp4005-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz +share/ppd/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz +share/ppd/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz share/ppd/HP/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz +share/ppd/HP/hp-color_laserjet_cp5225-ps.ppd.gz share/ppd/HP/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz +share/ppd/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz share/ppd/HP/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz +share/ppd/HP/hp-color_laserjet_cp5225n-ps.ppd.gz share/ppd/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz share/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz share/ppd/HP/hp-cp1160-hpijs.ppd.gz share/ppd/HP/hp-designjet_4020ps-ps.ppd.gz share/ppd/HP/hp-designjet_4520mfp-ps.ppd.gz share/ppd/HP/hp-designjet_4520ps-ps.ppd.gz +share/ppd/HP/hp-designjet_t1120ps_24in-ps.ppd.gz +share/ppd/HP/hp-designjet_t1120ps_44in-ps.ppd.gz +share/ppd/HP/hp-designjet_t1200_postscript-ps.ppd.gz +share/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz +share/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz share/ppd/HP/hp-deskjet_1100-hpijs.ppd.gz share/ppd/HP/hp-deskjet_1120-hpijs.ppd.gz share/ppd/HP/hp-deskjet_1125-hpijs.ppd.gz @@ -788,6 +812,7 @@ share/ppd/HP/hp-deskjet_660-hpijs.ppd.gz share/ppd/HP/hp-deskjet_6600-hpijs.ppd.gz share/ppd/HP/hp-deskjet_670-hpijs.ppd.gz +share/ppd/HP/hp-deskjet_670c-hpijs.ppd.gz share/ppd/HP/hp-deskjet_670tv-hpijs.ppd.gz share/ppd/HP/hp-deskjet_672c-hpijs.ppd.gz share/ppd/HP/hp-deskjet_680-hpijs.ppd.gz @@ -847,6 +872,7 @@ share/ppd/HP/hp-deskjet_d1300_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_d1400_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_d1500_series-hpijs.ppd.gz +share/ppd/HP/hp-deskjet_d1600_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_d2300_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_d2400_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_d2500_series-hpijs.ppd.gz @@ -854,16 +880,21 @@ share/ppd/HP/hp-deskjet_d4100_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_d4200_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_d4300_series-hpijs.ppd.gz +share/ppd/HP/hp-deskjet_d5500_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_d730-hpijs.ppd.gz share/ppd/HP/hp-deskjet_f2100_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_f2200_series-hpijs.ppd.gz +share/ppd/HP/hp-deskjet_f2400_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_f300_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_f4100_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_f4200_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_f4210_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_f4213_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_f4400_series-hpijs.ppd.gz +share/ppd/HP/hp-deskjet_f4500_series-hpijs.ppd.gz share/ppd/HP/hp-deskjet_f735-hpijs.ppd.gz +share/ppd/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz +share/ppd/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz share/ppd/HP/hp-dj350-hpijs.ppd.gz share/ppd/HP/hp-dj450-hpijs.ppd.gz share/ppd/HP/hp-laserjet_1000-hpijs.ppd.gz @@ -940,13 +971,10 @@ share/ppd/HP/hp-laserjet_3055-hpijs.ppd.gz share/ppd/HP/hp-laserjet_3100-hpijs.ppd.gz share/ppd/HP/hp-laserjet_3150-hpijs.ppd.gz -share/ppd/HP/hp-laserjet_3200-hpijs-pcl3.ppd.gz -share/ppd/HP/hp-laserjet_3200-ps.ppd.gz -share/ppd/HP/hp-laserjet_3200_series-ps.ppd.gz -share/ppd/HP/hp-laserjet_3200m-hpijs.ppd.gz +share/ppd/HP/hp-laserjet_3200-hpijs.ppd.gz +share/ppd/HP/hp-laserjet_3200m-hpijs-pcl3.ppd.gz share/ppd/HP/hp-laserjet_3200m-ps.ppd.gz share/ppd/HP/hp-laserjet_3200se-hpijs.ppd.gz -share/ppd/HP/hp-laserjet_3200se-ps.ppd.gz share/ppd/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz share/ppd/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz share/ppd/HP/hp-laserjet_3330-hpijs.ppd.gz @@ -1108,6 +1136,8 @@ share/ppd/HP/hp-laserjet_p3004-ps.ppd.gz share/ppd/HP/hp-laserjet_p3005-hpijs-pcl3.ppd.gz share/ppd/HP/hp-laserjet_p3005-ps.ppd.gz +share/ppd/HP/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz +share/ppd/HP/hp-laserjet_p3010_series-ps.ppd.gz share/ppd/HP/hp-laserjet_p4014-hpijs.ppd.gz share/ppd/HP/hp-laserjet_p4014-ps.ppd.gz share/ppd/HP/hp-laserjet_p4014dn-hpijs.ppd.gz @@ -1145,6 +1175,8 @@ share/ppd/HP/hp-officejet_4200_series-hpijs.ppd.gz share/ppd/HP/hp-officejet_4255-hpijs.ppd.gz share/ppd/HP/hp-officejet_4300_series-hpijs.ppd.gz +share/ppd/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz +share/ppd/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz share/ppd/HP/hp-officejet_5100_series-hpijs.ppd.gz share/ppd/HP/hp-officejet_5105-hpijs.ppd.gz share/ppd/HP/hp-officejet_5110-hpijs.ppd.gz @@ -1159,6 +1191,7 @@ share/ppd/HP/hp-officejet_6300_series-hpijs.ppd.gz share/ppd/HP/hp-officejet_6500_e709a-hpijs.ppd.gz share/ppd/HP/hp-officejet_6500_e709n-hpijs.ppd.gz +share/ppd/HP/hp-officejet_7000_e809a-hpijs.ppd.gz share/ppd/HP/hp-officejet_7100_series-hpijs.ppd.gz share/ppd/HP/hp-officejet_7200_series-hpijs.ppd.gz share/ppd/HP/hp-officejet_7300_series-hpijs.ppd.gz @@ -1171,7 +1204,6 @@ share/ppd/HP/hp-officejet_g85xi-hpijs.ppd.gz share/ppd/HP/hp-officejet_g95-hpijs.ppd.gz share/ppd/HP/hp-officejet_h470-hpijs.ppd.gz -share/ppd/HP/hp-officejet_j3500_series-hpijs.ppd.gz share/ppd/HP/hp-officejet_j3600_series-hpijs.ppd.gz share/ppd/HP/hp-officejet_j4500_series-hpijs.ppd.gz share/ppd/HP/hp-officejet_j4660_series-hpijs.ppd.gz @@ -1276,8 +1308,10 @@ share/ppd/HP/hp-photosmart_a610_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_a620_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_a630_series-hpijs.ppd.gz +share/ppd/HP/hp-photosmart_a640_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_a710_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_a820_series-hpijs.ppd.gz +share/ppd/HP/hp-photosmart_b109a_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_b8500_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_c309a_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_c3100_series-hpijs.ppd.gz @@ -1288,6 +1322,7 @@ share/ppd/HP/hp-photosmart_c4400_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_c4500_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_c4600_series-hpijs.ppd.gz +share/ppd/HP/hp-photosmart_c4700_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_c5100_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_c5200_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_c5300_series-hpijs.ppd.gz @@ -1310,8 +1345,12 @@ share/ppd/HP/hp-photosmart_d7500_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_p1000-hpijs.ppd.gz share/ppd/HP/hp-photosmart_p1100-hpijs.ppd.gz +share/ppd/HP/hp-photosmart_plus_b209a-m-hpijs.ppd.gz +share/ppd/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz +share/ppd/HP/hp-photosmart_premium_c309g-m-hpijs.ppd.gz share/ppd/HP/hp-photosmart_pro_b8300_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_pro_b8800_series-hpijs.ppd.gz +share/ppd/HP/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz share/ppd/HP/hp-printer_scanner_copier_300-hpijs.ppd.gz share/ppd/HP/hp-psc_1000_series-hpijs.ppd.gz share/ppd/HP/hp-psc_1100_series-hpijs.ppd.gz @@ -1344,19 +1383,6 @@ share/ppd/HP/hp-psc_950-hpijs.ppd.gz share/ppd/HP/hp-psc_950vr-hpijs.ppd.gz share/ppd/HP/hp-psc_950xi-hpijs.ppd.gz -share/ppd/HP/HP-Fax-hpijs.ppd.gz -share/ppd/HP/HP-Fax2-hpijs.ppd.gz -share/ppd/HP/hp-laserjet_p3010_series-ps.ppd.gz -share/ppd/HP/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz -share/ppd/HP/hp-officejet_7000_e809a-hpijs.ppd.gz -share/ppd/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz -share/ppd/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz -share/ppd/HP/hp-photosmart_plus_b209a-m-hpijs.ppd.gz -share/ppd/HP/hp-photosmart_c4700_series-hpijs.ppd.gz -share/ppd/HP/hp-deskjet_670c-hpijs.ppd.gz -share/ppd/HP/hp-deskjet_d1600_series-hpijs.ppd.gz -share/ppd/HP/hp-deskjet_d5500_series-hpijs.ppd.gz -share/applications/hplip.desktop @dirrmtry share/ppd/HP @dirrmtry share/ppd @dirrmtry share/applications @@ -1385,13 +1411,13 @@ @dirrm %%DATADIR%%/copier @dirrm %%DATADIR%%/base @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8/styles -%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8/images -%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8 +%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.10.2/styles +%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.10.2/images +%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.10.2 @dirrmtry share/applications @dirrmtry lib/sane -@dirrmtry lib/python2.5/site-packages -@dirrmtry lib/python2.5 +@dirrmtry lib/%%PYTHON_VERSION%%/site-packages +@dirrmtry lib/%%PYTHON_VERSION%% @dirrmtry libexec/cups/filter @dirrmtry libexec/cups/backends @dirrmtry libexec/cups --- hplip-3.10.2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: