From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jul 16 22:40:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C11ED16A4DD for ; Sun, 16 Jul 2006 22:40:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68D7043D4C for ; Sun, 16 Jul 2006 22:40:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6GMeFsB000783 for ; Sun, 16 Jul 2006 22:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6GMeFwZ000779; Sun, 16 Jul 2006 22:40:15 GMT (envelope-from gnats) Resent-Date: Sun, 16 Jul 2006 22:40:15 GMT Resent-Message-Id: <200607162240.k6GMeFwZ000779@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, "Anish Mistry" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D77AB16A4DE for ; Sun, 16 Jul 2006 22:32:30 +0000 (UTC) (envelope-from amistry@am-productions.biz) Received: from smtp3.fuse.net (mail-out3.fuse.net [216.68.8.177]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E3D443D45 for ; Sun, 16 Jul 2006 22:32:30 +0000 (GMT) (envelope-from amistry@am-productions.biz) Received: from gx6.fuse.net ([69.61.164.22]) by smtp3.fuse.net (InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id <20060716223225.DLIY26508.smtp3.fuse.net@gx6.fuse.net> for ; Sun, 16 Jul 2006 18:32:25 -0400 Received: from bigguy.am-productions.biz ([69.61.164.22]) by gx6.fuse.net (InterMail vG.1.02.00.02 201-2136-104-102-20041210) with ESMTP id <20060716223224.ISAA24896.gx6.fuse.net@bigguy.am-productions.biz> for ; Sun, 16 Jul 2006 18:32:24 -0400 Message-Id: <1153089194.81677@bigguy.am-productions.biz> Date: Sun, 16 Jul 2006 18:33:14 -0400 From: "Anish Mistry" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/100413: Update print/hplip to 1.6.6a X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jul 2006 22:40:16 -0000 >Number: 100413 >Category: ports >Synopsis: Update print/hplip to 1.6.6a >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jul 16 22:40:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Anish Mistry >Release: FreeBSD 6.1-RELEASE-p1 i386 >Organization: AM Productions >Environment: System: FreeBSD 6.1-RELEASE-p1 #0: Thu Jun 1 21:16:20 EDT 2006 amistry@bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY >Description: Update to 1.6.6a. The reason for the delay is that 1.6.6 was a mess, so I just decided to let the Linux folks find and fix the problems. I've "enhanced" the pkg-message file so hopefully I'll get fewer support requests. Note: The 1.x designation indicates that this is now a "stable" release, but full error handling support for FreeBSD has yet been implemented. >How-To-Repeat: >Fix: --- hplip-1.6.6a.patch begins here --- diff -ruN hplip.orig/Makefile hplip/Makefile --- hplip.orig/Makefile Sun Jul 16 16:44:30 2006 +++ hplip/Makefile Sun Jul 16 18:17:29 2006 @@ -6,7 +6,7 @@ # PORTNAME= hplip -PORTVERSION= 0.9.11 +PORTVERSION= 1.6.6a CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hplip @@ -40,7 +40,7 @@ OPTIONS= GUI "build with Python QT" on -PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.1.10 +PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.6.6a .include @@ -100,6 +100,6 @@ @${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd @${LN} -sf ${PREFIX}/bin/foomatic-rip \ ${PREFIX}/libexec/cups/filter/foomatic-rip - @${CAT} ${PKGMESSAGE} + @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE} .include diff -ruN hplip.orig/distinfo hplip/distinfo --- hplip.orig/distinfo Sun Jul 16 16:44:30 2006 +++ hplip/distinfo Sun Jul 16 16:49:09 2006 @@ -1,3 +1,3 @@ -MD5 (hplip-0.9.11.tar.gz) = 5cf362c972d5b1733af4fb8e2ade92e4 -SHA256 (hplip-0.9.11.tar.gz) = 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42 -SIZE (hplip-0.9.11.tar.gz) = 9924094 +MD5 (hplip-1.6.6a.tar.gz) = 606704fc8b2fe344e49190b592b438e0 +SHA256 (hplip-1.6.6a.tar.gz) = e87ab9bc4e4a3229dafc154f91d9860a9ae15532118bfad7fb791331340a9d8d +SIZE (hplip-1.6.6a.tar.gz) = 10447071 diff -ruN hplip.orig/files/patch-0.9.11-2-official hplip/files/patch-0.9.11-2-official --- hplip.orig/files/patch-0.9.11-2-official Sun Jul 16 16:44:30 2006 +++ hplip/files/patch-0.9.11-2-official Wed Dec 31 19:00:00 1969 @@ -1,276 +0,0 @@ -diff -uNr hplip-0.9.11.old/data/xml/models.xml data/xml/models.xml ---- hplip-0.9.11.old/data/xml/models.xml 2006-05-08 12:27:06.000000000 -0700 -+++ data/xml/models.xml 2006-05-12 15:30:54.754891424 -0700 -@@ -7797,6 +7797,84 @@ - - - -+ -+ MFG:Hewlett-Packard;MDL:PSC 900 Series;SKU:PSC 950;CMD:2,PCL,PML;CLASS:PRINTER;DESCRIPTION:Hewlett-Packard PSC 900 Series;1284.3M:f7f,f7f;1284.4DL:4d,4e,1;SERN:MY15U31143WP;VSTATUS:$AU0$AU0,ff,DN,PENF,CUT,K0,C0,SM,NR,KP066,CP095;AiO:00;DW-PCL; -+ PSC_900_Series.png -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ MFG:Hewlett-Packard;MDL:PSC 900 Series;SKU:PSC 950;CMD:2,PCL,PML;CLASS:PRINTER;DESCRIPTION:Hewlett-Packard PSC 900 Series;1284.3M:f7f,f7f;1284.4DL:4d,4e,1;SERN:MY15U31143WP;VSTATUS:$AU0$AU0,ff,DN,PENF,CUT,K0,C0,SM,NR,KP066,CP095;AiO:00;DW-PCL; -+ PSC_900_Series.png -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ MFG:Hewlett-Packard;MDL:PSC 900 Series;SKU:PSC 950;CMD:2,PCL,PML;CLASS:PRINTER;DESCRIPTION:Hewlett-Packard PSC 900 Series;1284.3M:f7f,f7f;1284.4DL:4d,4e,1;SERN:MY15U31143WP;VSTATUS:$AU0$AU0,ff,DN,PENF,CUT,K0,C0,SM,NR,KP066,CP095;AiO:00;DW-PCL; -+ PSC_900_Series.png -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - psc_2300_series.png -diff -uNr hplip-0.9.11.old/prnt/hpijs/colormatch.cpp prnt/hpijs/colormatch.cpp ---- hplip-0.9.11.old/prnt/hpijs/colormatch.cpp 2006-05-09 11:04:30.000000000 -0700 -+++ prnt/hpijs/colormatch.cpp 2006-05-11 16:17:17.000000000 -0700 -@@ -221,15 +221,21 @@ - { - for (unsigned int r = 0; r < 9; r++) - { -+#ifndef NDEBUG - unsigned long ul_RedMapPtr = r * 9 * 9; -+#endif - for (unsigned int g = 0; g < 9; g++) - { -+#ifndef NDEBUG - unsigned long ul_GreenMapPtr = g * 9; -+#endif - for (unsigned int b = 0; b < 9; b++) - { - unsigned long mapptr = b + (g * 9) + (r * 9 * 9); // get address in map -+#ifndef NDEBUG - unsigned long ul_MapPtr = b + ul_GreenMapPtr + ul_RedMapPtr; - ASSERT(mapptr == ul_MapPtr); -+#endif - // put r,g,b in monitor range - unsigned int oldR = r * 255 >> 3; - unsigned int oldG = g * 255 >> 3; -diff -uNr hplip-0.9.11.old/prnt/hpijs/hpijs.cpp prnt/hpijs/hpijs.cpp ---- hplip-0.9.11.old/prnt/hpijs/hpijs.cpp 2006-02-23 14:31:17.000000000 -0800 -+++ prnt/hpijs/hpijs.cpp 2006-05-12 15:44:27.509333968 -0700 -@@ -177,7 +177,7 @@ - char *tail; - int status = 0; - char svalue[IJS_MAX_PARAM+1]; -- float w, h; -+ float w, h, dx, dy; - - /* Sanity check input value. */ - if (value_size > IJS_MAX_PARAM) -@@ -256,8 +256,12 @@ - } - else - { -+ -+ dx = w > pSS->PaperWidth ? w - pSS->PaperWidth : pSS->PaperWidth - w; -+ dy = h > pSS->PaperHeight ? h - pSS->PaperHeight : pSS->PaperHeight - h; -+ - /* Middle of print Job, ignore paper size if same. */ -- if (!(w == pSS->PaperWidth && h == pSS->PaperHeight)) -+ if ((dx > 0.03) || (dy > 0.03)) - { - pSS->FirstRaster = 1; /* force new Job */ - pSS->PaperWidth = w; /* set new paper size */ -@@ -272,19 +276,19 @@ - } - else if (!strcmp (key, "Quality:Quality")) - { -- pSS->Quality = strtol(svalue, &tail, 10); -+ pSS->Quality = (QUALITY_MODE) strtol(svalue, &tail, 10); - } - else if (!strcmp (key, "Quality:MediaType")) - { -- pSS->MediaType = strtol(svalue, &tail, 10); -+ pSS->MediaType = (MEDIATYPE) strtol(svalue, &tail, 10); - } - else if (!strcmp (key, "Quality:ColorMode")) - { -- pSS->ColorMode = strtol(svalue, &tail, 10); -+ pSS->ColorMode = (COLORMODE) strtol(svalue, &tail, 10); - } - else if (!strcmp (key, "Quality:PenSet")) - { -- pSS->PenSet = strtol(svalue, &tail, 10); -+ pSS->PenSet = (PEN_TYPE) strtol(svalue, &tail, 10); - } - else if (!strcmp (key, "Quality:FullBleed")) - { -diff -uNr hplip-0.9.11.old/prnt/hpijs/ljfastraster.cpp prnt/hpijs/ljfastraster.cpp ---- hplip-0.9.11.old/prnt/hpijs/ljfastraster.cpp 2006-05-09 11:04:30.000000000 -0700 -+++ prnt/hpijs/ljfastraster.cpp 2006-05-11 16:34:57.000000000 -0700 -@@ -1215,7 +1215,7 @@ - - m_compressedsize = 2 * inputsize * INDY_STRIP_HEIGHT; - BOOL bRet = Compress (compressBuf, -- (uint32_t *) &m_compressedsize, -+ &m_compressedsize, - pbyInputImageBuffer, - inputsize, - m_lCurrCDRasterRow, -diff -uNr hplip-0.9.11.old/prnt/hpijs/ljfastraster.h prnt/hpijs/ljfastraster.h ---- hplip-0.9.11.old/prnt/hpijs/ljfastraster.h 2006-05-09 11:04:30.000000000 -0700 -+++ prnt/hpijs/ljfastraster.h 2006-05-11 16:34:57.000000000 -0700 -@@ -32,6 +32,7 @@ - #ifndef APDK_LJFASTRASTER_H - #define APDK_LJFASTRASTER_H - -+#include "global_types.h" - - APDK_BEGIN_NAMESPACE - /*! -@@ -136,7 +137,7 @@ - long m_lCurrBlockHeight; - long m_lPrinterRasterRow; // Current printer raster row. - -- unsigned long m_compressedsize; -+ uint32_t m_compressedsize; - BOOL m_bCompressed; - float m_fRatio; - HPUInt8 *pbySeedRow; -diff -uNr hplip-0.9.11.old/prnt/hpijs/ljjetready.cpp prnt/hpijs/ljjetready.cpp ---- hplip-0.9.11.old/prnt/hpijs/ljjetready.cpp 2006-05-09 11:04:30.000000000 -0700 -+++ prnt/hpijs/ljjetready.cpp 2006-05-11 15:49:52.000000000 -0700 -@@ -473,7 +473,7 @@ - //----------------------------------------------------------------------------- - DRIVER_ERROR HeaderLJJetReady::MapPCLMediaTypeToString (MEDIATYPE eM) - { -- DRIVER_ERROR err; -+ DRIVER_ERROR err = SYSTEM_ERROR; - BYTE szPlain[] = {"\xC8\xC1\x05\x00Plain\xF8\x27"}; - BYTE szPhoto[] = {"\xC8\xC1\x05\x00Gloss\xF8\x27"}; - -diff -uNr hplip-0.9.11.old/prnt/hpijs/services.cpp prnt/hpijs/services.cpp ---- hplip-0.9.11.old/prnt/hpijs/services.cpp 2006-02-23 14:31:47.000000000 -0800 -+++ prnt/hpijs/services.cpp 2006-05-12 15:44:44.645728840 -0700 -@@ -46,6 +46,12 @@ - - int UXServices::InitDuplexBuffer() - { -+ /* Free buffer if new page size in middle of print job. */ -+ if (RastersOnPage) -+ delete [] RastersOnPage; -+ if (KRastersOnPage) -+ delete [] KRastersOnPage; -+ - /* Calculate duplex page buffer */ - CurrentRaster = ph.height - 1; /* Height = physical page in pixels */ - RastersOnPage = (BYTE **) new BYTE[(ph.height) * sizeof (BYTE *)]; -@@ -270,12 +276,13 @@ - } - } - -- Quality = 0; /* normal */ -- MediaType = 0; /* plain */ -- ColorMode = 2; /* color */ -+ Quality = QUALITY_NORMAL; -+ MediaType = MEDIA_PLAIN; -+ ColorMode = COLOR; - PenSet = DUMMY_PEN; - - RastersOnPage = 0; -+ KRastersOnPage = 0; - pPC = NULL; - pJob = NULL; - Duplex = 0; -@@ -294,6 +301,8 @@ - { - if (RastersOnPage) - delete [] RastersOnPage; -+ if (KRastersOnPage) -+ delete [] KRastersOnPage; - if (hpFD >= 0) - hplip_CloseHP(hpFD); - hplip_Exit(); -diff -uNr hplip-0.9.11.old/prnt/hpijs/services.h prnt/hpijs/services.h ---- hplip-0.9.11.old/prnt/hpijs/services.h 2005-09-14 10:19:08.000000000 -0700 -+++ prnt/hpijs/services.h 2006-05-12 15:44:40.360380312 -0700 -@@ -35,6 +35,8 @@ - #include - #include - -+#include "global_types.h" -+ - APDK_USING_NAMESPACE - - class UXServices:public SystemServices -@@ -123,10 +125,10 @@ - const float *Margin; - int Model; /* selected device: -1=no, 1=yes */ - int OutputPath; /* open file descriptor */ -- int Quality; /* 0=normal, 1=draft, 2=best */ -- int MediaType; /* 0=plain, 1=premium, 2=photo */ -- int ColorMode; /* 0=grey_k, 1=grey_cmy, 2=color */ -- int PenSet; /* 0=black_pen, 1=color_pen, 2=both_pens, 3=mdl_pen, 4=mdl_both */ -+ QUALITY_MODE Quality; -+ MEDIATYPE MediaType; -+ COLORMODE ColorMode; -+ PEN_TYPE PenSet; - int MediaPosition; - float PaperWidth; /* physical width in inches */ - float PaperHeight; /* physical height in inches */ diff -ruN hplip.orig/files/patch-io_hpiod hplip/files/patch-io_hpiod --- hplip.orig/files/patch-io_hpiod Sun Jul 16 16:44:30 2006 +++ hplip/files/patch-io_hpiod Wed Dec 31 19:00:00 1969 @@ -1,24 +0,0 @@ -diff -ruN io/hpiod.orig/usbext.c io/hpiod/usbext.c ---- io/hpiod.orig/usbext.c Sat Apr 1 16:11:45 2006 -+++ io/hpiod/usbext.c Sat Apr 1 16:10:29 2006 -@@ -33,7 +33,7 @@ - int fd; - }; - --#if defined(__APPLE__) && defined(__MACH__) -+#if defined(__APPLE__) && defined(__MACH__) || defined(__FreeBSD__) - - #else - -diff -ruN io/hpiod.orig/usbext.h io/hpiod/usbext.h ---- io/hpiod.orig/usbext.h Sat Apr 1 16:11:45 2006 -+++ io/hpiod/usbext.h Sat Apr 1 16:05:57 2006 -@@ -32,7 +32,7 @@ - #include - #include - --#if defined(__APPLE__) && defined(__MACH__) -+#if defined(__APPLE__) && defined(__MACH__) || defined(__FreeBSD__) - #else - #include - diff -ruN hplip.orig/files/patch-io_hpiod_device.cpp hplip/files/patch-io_hpiod_device.cpp --- hplip.orig/files/patch-io_hpiod_device.cpp Sun Jul 16 16:44:30 2006 +++ hplip/files/patch-io_hpiod_device.cpp Sun Jul 16 16:59:06 2006 @@ -1,5 +1,5 @@ ---- io/hpiod/device.cpp.orig Fri Mar 3 00:07:26 2006 -+++ io/hpiod/device.cpp Wed Apr 5 02:57:32 2006 +--- io/hpiod/device.cpp.orig Thu Jun 15 02:02:11 2006 ++++ io/hpiod/device.cpp Sun Jul 16 16:57:30 2006 @@ -25,6 +25,9 @@ \*****************************************************************************/ @@ -10,14 +10,19 @@ const unsigned char Venice_Power_On[] = {0x1b, '%','P','u','i','f','p','.', 'p','o','w','e','r',' ','1',';', -@@ -109,6 +112,244 @@ - return -2; - } +@@ -111,21 +114,240 @@ -+#elif defined(__FreeBSD__) -+ -+int Device::Write(int fd, const void *buf, int size) -+{ + #elif defined(__FreeBSD__) + +-/* +- * Anish Mistry amistry@am-productions.biz is working on libusb extensions for FreeBSD. His current implementation does not handle device exceptions (ie: paperout). +- * Once this issue is resolved we will be glade to add his code to the project. +- */ +- + int Device::Write(int fd, const void *buf, int size) + { +- syslog(LOG_ERR, "error Write: unimplemented (freebsd) %s %s %d\n", URI, __FILE__, __LINE__); +- return -1; + int nwrote, total, write_len, r, ep, endpoint_fd; + void *tmp_buf = (void *)buf; + fd_set ready; @@ -82,10 +87,12 @@ + + close(endpoint_fd); + return size; -+} -+ -+int Device::Read(int fd, void *buf, int size, int usec) -+{ + } + + int Device::Read(int fd, void *buf, int size, int usec) + { +- syslog(LOG_ERR, "error Read: unimplemented (freebsd) %s %s %d\n", URI, __FILE__, __LINE__); +- return -2; + int nwrote, total, r, ep=0, endpoint_fd, i; + struct timeval t1, t2; + fd_set ready; @@ -250,18 +257,6 @@ + + close(endpoint_fd); + return size; -+} -+ - #else - - /* -@@ -589,7 +830,8 @@ + } - if (FD[fd].urb_write_active) - { --#if defined(__APPLE__) && defined(__MACH__) -+#if defined(__APPLE__) && defined(__MACH__) || defined(__FreeBSD__) -+ syslog(LOG_ERR, "danger! Device::ReleaseInterface, releasing an interface with an active write %s: %s %d\n", URI, __FILE__, __LINE__); #else - usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_write); - #endif \ No newline at end of file diff -ruN hplip.orig/files/patch-io_hpiod_device.h hplip/files/patch-io_hpiod_device.h --- hplip.orig/files/patch-io_hpiod_device.h Sun Jul 16 16:44:30 2006 +++ hplip/files/patch-io_hpiod_device.h Wed Dec 31 19:00:00 1969 @@ -1,12 +0,0 @@ ---- io/hpiod/device.h.orig Tue Feb 28 19:40:55 2006 -+++ io/hpiod/device.h Sun Apr 2 23:38:58 2006 -@@ -72,6 +72,9 @@ - int AltSetting; - int urb_write_active; /* 0=no, 1=yes */ - #if defined(__APPLE__) && defined(__MACH__) -+ -+#elif defined(__FreeBSD__) -+ - #else - struct usbdevfs_urb urb_write; /* host to device */ - struct usbdevfs_urb urb_read; /* device to host */ diff -ruN hplip.orig/pkg-message hplip/pkg-message --- hplip.orig/pkg-message Sun Jul 16 16:44:30 2006 +++ hplip/pkg-message Sun Jul 16 18:20:12 2006 @@ -12,4 +12,23 @@ add path 'ugen*' group operator add path 'ugen*' mode 0660 +If you have never setup devfs.rules please read the +manpage and see: +http://am-productions.biz/docs/devfs.rules.php + +The printer MUST attach as a ugen(4) device. This means +that you must NOT have "device ulpt" in your kernel and +ulpt must NOT be loaded as a kernel module. + +If you are seeing device connection error restart the +printing chain with the following command. NOTE: It MUST +be restarted in the stated order. +%%PREFIX%%/etc/rc.d/hpiod restart && \ +%%PREFIX%%/etc/rc.d/hpssd restart && \ +%%PREFIX%%/etc/rc.d/cupsd restart + +If you are still having problems send the relevant part of +your /var/log/messages, console output from the hp-* +utility that you are trying to run, and your rc.conf + +devfs.rules files to the maintainer. ********************************************************** diff -ruN hplip.orig/pkg-plist hplip/pkg-plist --- hplip.orig/pkg-plist Sun Jul 16 16:44:30 2006 +++ hplip/pkg-plist Sun Jul 16 17:49:30 2006 @@ -7,7 +7,6 @@ bin/hp-info bin/hp-levels bin/hp-makeuri -bin/hp-photo bin/hp-print bin/hp-sendfax bin/hp-setup @@ -15,7 +14,7 @@ bin/hp-toolbox bin/hp-unload bin/hpijs -etc/hp/hplip.conf +bin/hp-makecopies lib/libhpip.la lib/libhpip.so lib/libhpip.so.0 @@ -32,11 +31,11 @@ %%PYTHON_SITELIBDIR%%/cupsext.so sbin/hpiod sbin/hpssd -share/applications/hplip.desktop share/cups/model/foomatic-ppds %%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/COPYING %%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/README_LIBJPG %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/about.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/contacts.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/faqs.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/features.html @@ -48,8 +47,10 @@ %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/redhat.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/scanning.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/toolbox.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/hpaio.desc %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManagePrint.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManageSend_Fax-1.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManageSend_Fax-2.png @@ -80,6 +81,16 @@ %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_kind.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_printer.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_printer_model.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_left.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_1.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_3.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_4.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp_invent_logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linux_printing_logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/osi_certified.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/rest2web.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html @@ -92,6 +103,7 @@ %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/other.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/suse10.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu510.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu606.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step3/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/local.html @@ -104,6 +116,7 @@ %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/legal.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/license.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/mailing_lists.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/other_support.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/release_notes.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/screenshots.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/styles/default.css @@ -132,8 +145,10 @@ %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/info.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/levels.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makeuri.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makecopies.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/photo.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/sendfax.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/setup.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/testpage.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/toolbox.html @@ -174,12 +189,16 @@ %%DATADIR%%/base/slp.py %%DATADIR%%/base/status.py %%DATADIR%%/base/strings.py -%%DATADIR%%/base/subproc.py %%DATADIR%%/base/utils.py %%DATADIR%%/check %%DATADIR%%/clean %%DATADIR%%/colorcal +%%DATADIR%%/copier/__init__.py +%%DATADIR%%/copier/copier.py %%DATADIR%%/data/hplip.desktop +%%DATADIR%%/data/xml/HPLIP-06-2006.xml +%%DATADIR%%/hpaio.desc +%%DATADIR%%/makecopies %%DATADIR%%/data/images/120.png %%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png %%DATADIR%%/data/images/CP_1700.png @@ -446,7 +465,6 @@ %%DATADIR%%/makeuri %%DATADIR%%/pcard/__init__.py %%DATADIR%%/pcard/photocard.py -%%DATADIR%%/photo %%DATADIR%%/plugins/Deskjet_460.py %%DATADIR%%/plugins/__init__.py %%DATADIR%%/plugins/dj450.py @@ -459,6 +477,7 @@ %%DATADIR%%/prnt/cups.py %%DATADIR%%/prnt/ldl.py %%DATADIR%%/prnt/pcl.py +%%DATADIR%%/prnt/printable_areas.py %%DATADIR%%/scan/__init__.py %%DATADIR%%/sendfax %%DATADIR%%/setup @@ -510,6 +529,8 @@ %%DATADIR%%/ui/informationform_base.py %%DATADIR%%/ui/loadpaperform.py %%DATADIR%%/ui/loadpaperform_base.py +%%DATADIR%%/ui/makecopiesform.py +%%DATADIR%%/ui/makecopiesform_base.py %%DATADIR%%/ui/nodevicesform.py %%DATADIR%%/ui/nodevicesform_base.py %%DATADIR%%/ui/paperedgealignform.py @@ -519,8 +540,6 @@ %%DATADIR%%/ui/printerform_base.ui %%DATADIR%%/ui/settingsdialog.py %%DATADIR%%/ui/settingsdialog_base.py -%%DATADIR%%/ui/supportform.py -%%DATADIR%%/ui/supportform_base.py %%DATADIR%%/ui/unloadform.py %%DATADIR%%/ui/unloadform_base.py %%DATADIR%%/ui/waitform.py @@ -691,6 +710,9 @@ share/ppd/HP/HP-DeskJet_980C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_990C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_995C-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_D1300-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_D2300-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_D4100-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_F300-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_1010-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_1012-hpijs.ppd.gz @@ -898,6 +920,13 @@ share/ppd/HP/HP-PhotoSmart_8200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8400-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8700-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A430-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A510-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A610-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A710-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C3100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C4100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D7300-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P1000-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P1100-hpijs.ppd.gz @@ -1005,11 +1034,12 @@ @dirrm %%DATADIR%%/fax/ppd @dirrm %%DATADIR%%/fax/backend @dirrm %%DATADIR%%/fax -@dirrm %%DATADIR%%/data/xml +@dirrm %%DATADIR%%/copier @dirrm %%DATADIR%%/data/ps @dirrm %%DATADIR%%/data/pcl @dirrm %%DATADIR%%/data/ldl @dirrm %%DATADIR%%/data/images +@dirrm %%DATADIR%%/data/xml @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/base @dirrm %%DATADIR%% @@ -1030,4 +1060,3 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%% %%PORTDOCS%%@dirrm share/doc/hpijs-%%IJSVER%% -@dirrm etc/hp --- hplip-1.6.6a.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: