rpms/hplip/devel hplip-0.9.8-4.patch, NONE, 1.1 hplip.spec, 1.47, 1.48 hplip-0.9.8-3.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Feb 27 15:58:54 UTC 2006
- Previous message (by thread): rpms/mod_python/devel mod_python-3.1.4-apr1x.patch, 1.2, 1.3 mod_python.spec, 1.29, 1.30
- Next message (by thread): rpms/gcc/devel gcc41-fortran-matmul.patch, NONE, 1.1 gcc41-fortran-where-opt.patch, NONE, 1.1 gcc41-mni.patch, NONE, 1.1 gcc41-x86_64-sse3.patch, NONE, 1.1 .cvsignore, 1.136, 1.137 gcc41.spec, 1.39, 1.40 sources, 1.138, 1.139 gcc41-c++-parser.patch, 1.1, NONE gcc41-expr_nonzero_p.patch, 1.1, NONE gcc41-fortran-where.patch, 1.1, NONE gcc41-libstdc++-bitset.patch, 1.1, NONE gcc41-mmintrin.patch, 1.1, NONE gcc41-pr25626.patch, 1.1, NONE gcc41-sparc64-g7.patch, 1.1, NONE gcc41-vrp.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31304
Modified Files:
hplip.spec
Added Files:
hplip-0.9.8-4.patch
Removed Files:
hplip-0.9.8-3.patch
Log Message:
* Mon Feb 27 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-5
- Patchlevel 4.
hplip-0.9.8-4.patch:
ChangeLog | 19 +++
Makefile.am | 13 +-
base/device.py | 248 +++++++++++++++++++++----------------------
base/status.py | 113 +++++++++----------
data/xml/HPLIP-02-2006.xml | 83 --------------
hplip_readme.html | 15 --
prnt/hpijs/Makefile.am | 4
prnt/hpijs/hpijs_readme.html | 3
prnt/hpijs/ljfastraster.cpp | 5
9 files changed, 217 insertions(+), 286 deletions(-)
--- NEW FILE hplip-0.9.8-4.patch ---
diff -uNr hplip-0.9.8.old/base/device.py hplip-0.9.8.new/base/device.py
--- hplip-0.9.8.old/base/device.py 2006-01-27 14:14:45.000000000 -0800
+++ hplip-0.9.8.new/base/device.py 2006-02-06 13:49:33.000000000 -0800
@@ -438,8 +438,6 @@
self.panel_check = True
self.io_state = IO_STATE_HP_READY
self.is_local = isLocal(self.bus)
- self.dev_file = ''
- self.serial = ''
self.supported = False
@@ -829,11 +827,12 @@
log.error("Error getting 3-bit status.")
raise Error(ERROR_DEVICE_IO_ERROR)
- try:
- self.getDeviceID()
- except Error, e:
- log.error("Error getting device ID.")
- raise Error(ERROR_DEVICE_IO_ERROR)
+ if self.tech_type in (TECH_TYPE_MONO_INK, TECH_TYPE_COLOR_INK):
+ try:
+ self.getDeviceID()
+ except Error, e:
+ log.error("Error getting device ID.")
+ raise Error(ERROR_DEVICE_IO_ERROR)
try:
self.getDevFile()
@@ -868,102 +867,101 @@
status_block = {}
+ if status_type == STATUS_TYPE_NONE:
+ log.warn("No status available for device.")
+ status_block = {'status-code' : STATUS_PRINTER_IDLE}
+
+ elif status_type in (STATUS_TYPE_VSTATUS, STATUS_TYPE_S, STATUS_TYPE_S_SNMP):
+ log.debug("Type 1/2 (S: or VSTATUS:) status")
+ status_block = status.parseStatus(self.deviceID)
+
+ elif status_type == STATUS_TYPE_LJ:
+ log.debug("Type 3 LaserJet status")
+ status_block = status.StatusType3(self, self.deviceID)
+
+ elif status_type == STATUS_TYPE_S_W_BATTERY:
+ log.debug("Type 4 S: status with battery check")
+ status_block = status.parseStatus(self.deviceID)
+ status.BatteryCheck(self, status_block)
+
+ else:
+ log.error("Unimplemented status type: %d" % status_type)
+
+ if status_block:
+ log.debug(status_block)
+ self.dq.update(status_block)
+ try:
+ status_block['agents']
+ except KeyError:
+ pass
+ else:
+ agents = status_block['agents']
+ del self.dq['agents']
+
+
+ status_code = self.dq.get('status-code', STATUS_UNKNOWN)
+
+ if self.mq.get('fax-type', 0) and status_code == STATUS_PRINTER_IDLE:
+ tx_active, rx_active = status.getFaxStatus(self)
+
+ if tx_active:
+ status_code = STATUS_FAX_TX_ACTIVE
+ elif rx_active:
+ status_code = STATUS_FAX_RX_ACTIVE
+
+
try:
- if status_type == STATUS_TYPE_NONE:
- log.warn("No status available for device.")
- status_block = {'status-code' : STATUS_PRINTER_IDLE}
-
- elif status_type in (STATUS_TYPE_VSTATUS, STATUS_TYPE_S, STATUS_TYPE_S_SNMP):
- log.debug("Type 1/2 (S: or VSTATUS:) status")
- status_block = status.parseStatus(self.deviceID)
-
- elif status_type == STATUS_TYPE_LJ:
- log.debug("Type 3 LaserJet status")
- status_block = status.StatusType3(self, self.deviceID)
-
- elif status_type == STATUS_TYPE_S_W_BATTERY:
- log.debug("Type 4 S: status with battery check")
- status_block = status.parseStatus(self.deviceID)
- status.BatteryCheck(self, status_block)
+ self.dq.update({'status-desc' : self.queryString(status_code),
+ 'error-state' : STATUS_TO_ERROR_STATE_MAP.get(status_code, ERROR_STATE_CLEAR),
+ })
+
+ except (KeyError, Error):
+ self.dq.update({'status-desc' : '',
+ 'error-state' : ERROR_STATE_CLEAR,
+ })
- else:
- log.error("Unimplemented status type: %d" % status_type)
+ self.sendEvent(status_code)
+
+ if not quick:
+ r_value, rg, rr, r_value_str = 0, '000', '000000', '000000000'
- if status_block:
- log.debug(status_block)
- self.dq.update(status_block)
- try:
- status_block['agents']
- except KeyError:
- pass
- else:
- agents = status_block['agents']
- del self.dq['agents']
+ if status_type != STATUS_TYPE_NONE:
-
- status_code = self.dq.get('status-code', STATUS_UNKNOWN)
-
- if self.mq.get('fax-type', 0) and status_code == STATUS_PRINTER_IDLE:
- tx_active, rx_active = status.getFaxStatus(self)
-
- if tx_active:
- status_code = STATUS_FAX_TX_ACTIVE
- elif rx_active:
- status_code = STATUS_FAX_RX_ACTIVE
-
-
- try:
- self.dq.update({'status-desc' : self.queryString(status_code),
- 'error-state' : STATUS_TO_ERROR_STATE_MAP.get(status_code, ERROR_STATE_CLEAR),
- })
-
- except (KeyError, Error):
- self.dq.update({'status-desc' : '',
- 'error-state' : ERROR_STATE_CLEAR,
- })
-
- self.sendEvent(status_code)
+ if self.panel_check:
+ self.panel_check = bool(self.mq.get('panel-check-type', 0))
- if not quick:
- r_value, rg, rr, r_value_str = 0, '000', '000000', '000000000'
-
- if status_type != STATUS_TYPE_NONE:
-
- if self.panel_check:
- self.panel_check = bool(self.mq.get('panel-check-type', 0))
-
- if self.panel_check and status_type != STATUS_TYPE_NONE:
- #try:
+ if self.panel_check and status_type != STATUS_TYPE_NONE:
+ try:
self.panel_check, line1, line2 = status.PanelCheck(self)
- #finally:
- # self.closePML()
-
- self.dq.update({'panel': int(self.panel_check),
- 'panel-line1': line1,
- 'panel-line2': line2,})
-
-
- if r_type > 0:
+ finally:
+ self.closePML()
+
+ self.dq.update({'panel': int(self.panel_check),
+ 'panel-line1': line1,
+ 'panel-line2': line2,})
+
+
+ if r_type > 0:
+ if self.r_values is None:
+ fields, data, result_code = \
+ self.xmitHpssdMessage('GetValue', {'device-uri': self.device_uri, 'key': 'r_value'})
+
+ if result_code == ERROR_SUCCESS and data:
+ try:
+ r_value = int(data.strip())
+ except:
+ pass
+ else:
+ log.debug("r_value=%d" % r_value)
+ r_value_str = str(r_value)
+ r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
+ rg, rr = r_value_str[:3], r_value_str[3:]
+ r_value = int(rr)
+ self.r_values = r_value, r_value_str, rg, rr
+
if self.r_values is None:
- fields, data, result_code = \
- self.xmitHpssdMessage('GetValue', {'device-uri': self.device_uri, 'key': 'r_value'})
-
- if result_code == ERROR_SUCCESS and data:
+ if status_type == STATUS_TYPE_S and self.is_local:
try:
- r_value = int(data.strip())
- except:
- pass
- else:
- log.debug("r_value=%d" % r_value)
- r_value_str = str(r_value)
- r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
- rg, rr = r_value_str[:3], r_value_str[3:]
- r_value = int(rr)
- self.r_values = r_value, r_value_str, rg, rr
-
- if self.r_values is None:
- if status_type == STATUS_TYPE_S:
- #try:
try:
r_value = self.getDynamicCounter(140)
@@ -984,42 +982,40 @@
except Error:
log.error("Error attempting to read r-value (1).")
r_value = 0
-
- #finally:
- # self.closePrint()
-
- elif status_type == STATUS_TYPE_S_SNMP:
+
+ finally:
+ self.closePrint()
+
+ elif status_type == STATUS_TYPE_S_SNMP:
+ try:
result_code, r_value = self.getPML(pml.OID_R_SETTING)
- #self.closePML()
+ finally:
+ self.closePML()
+
+ if r_value is not None:
+ log.debug("r_value=%d" % r_value)
+ r_value_str = str(r_value)
+ r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
+ rg, rr = r_value_str[:3], r_value_str[3:]
+ r_value = int(rr)
+ self.r_values = r_value, r_value_str, rg, rr
- if r_value is not None:
- log.debug("r_value=%d" % r_value)
- r_value_str = str(r_value)
- r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
- rg, rr = r_value_str[:3], r_value_str[3:]
- r_value = int(rr)
- self.r_values = r_value, r_value_str, rg, rr
-
- fields, data, result_code = \
- self.xmitHpssdMessage('SetValue', {'device-uri': self.device_uri, 'key': 'r_value', 'value': r_value})
- else:
- r_value = 0
-
+ fields, data, result_code = \
+ self.xmitHpssdMessage('SetValue', {'device-uri': self.device_uri, 'key': 'r_value', 'value': r_value})
+ else:
+ r_value = 0
- else:
- r_value, r_value_str, rg, rr = self.r_values
-
- self.dq.update({'r' : r_value,
- 'rs' : r_value_str,
- 'rg' : rg,
- 'rr' : rr,
- })
- finally:
- self.closePML()
- self.closePrint()
+
+ else:
+ r_value, r_value_str, rg, rr = self.r_values
+
+ self.dq.update({'r' : r_value,
+ 'rs' : r_value_str,
+ 'rg' : rg,
+ 'rr' : rr,
+ })
if not quick:
-
a = 1
while True:
mq_agent_kind = self.mq.get('r%d-agent%d-kind' % (r_value, a), 0)
diff -uNr hplip-0.9.8.old/base/status.py hplip-0.9.8.new/base/status.py
--- hplip-0.9.8.old/base/status.py 2006-01-24 10:35:53.000000000 -0800
+++ hplip-0.9.8.new/base/status.py 2006-02-06 13:49:35.000000000 -0800
@@ -668,64 +668,64 @@
# Assumes dev is already open (i.e., dev.io_state==IO_STATE_HP_OPEN)
try_dynamic_counters = False
try:
- #channel = dev.openChannel( 'HP-MESSAGE' )
- dev.openPML()
- except Error:
- log.error("PML channel open failed.")
- try_dynamic_counters = True
- else:
- result, battery_level = dev.getPML(pml.OID_BATTERY_LEVEL)
- result, power_mode = dev.getPML(pml.OID_POWER_MODE)
-
- if battery_level is not None and \
- power_mode is not None:
-
- if power_mode & pml.POWER_MODE_BATTERY_LEVEL_KNOWN and \
- battery_level >= 0:
-
- for x in BATTERY_PML_TRIGGER_MAP:
- if x[0] >= battery_level > x[1]:
- battery_trigger_level = BATTERY_PML_TRIGGER_MAP[x]
- break
-
- if power_mode & pml.POWER_MODE_CHARGING:
- agent_health = AGENT_HEALTH_CHARGING
-
- elif power_mode & pml.POWER_MODE_DISCHARGING:
- agent_health = AGENT_HEALTH_DISCHARGING
-
+ try:
+ dev.openPML()
+ except Error:
+ log.error("PML channel open failed.")
+ try_dynamic_counters = True
+ else:
+ result, battery_level = dev.getPML(pml.OID_BATTERY_LEVEL)
+ result, power_mode = dev.getPML(pml.OID_POWER_MODE)
+
+ if battery_level is not None and \
+ power_mode is not None:
+
+ if power_mode & pml.POWER_MODE_BATTERY_LEVEL_KNOWN and \
+ battery_level >= 0:
+
+ for x in BATTERY_PML_TRIGGER_MAP:
+ if x[0] >= battery_level > x[1]:
+ battery_trigger_level = BATTERY_PML_TRIGGER_MAP[x]
+ break
+
+ if power_mode & pml.POWER_MODE_CHARGING:
+ agent_health = AGENT_HEALTH_CHARGING
+
+ elif power_mode & pml.POWER_MODE_DISCHARGING:
+ agent_health = AGENT_HEALTH_DISCHARGING
+
+ else:
+ agent_health = AGENT_HEALTH_OK
+
+ status_block['agents'].append({
+ 'kind' : AGENT_KIND_INT_BATTERY,
+ 'type' : AGENT_TYPE_UNSPECIFIED,
+ 'health' : agent_health,
+ 'level' : battery_level,
+ 'level-trigger' : battery_trigger_level,
+ })
else:
- agent_health = AGENT_HEALTH_OK
-
- status_block['agents'].append({
- 'kind' : AGENT_KIND_INT_BATTERY,
- 'type' : AGENT_TYPE_UNSPECIFIED,
- 'health' : agent_health,
- 'level' : battery_level,
- 'level-trigger' : battery_trigger_level,
- })
+ status_block['agents'].append({
+ 'kind' : AGENT_KIND_INT_BATTERY,
+ 'type' : AGENT_TYPE_UNSPECIFIED,
+ 'health' : AGENT_HEALTH_UNKNOWN,
+ 'level' : 0,
+ 'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
+ })
+
else:
- status_block['agents'].append({
- 'kind' : AGENT_KIND_INT_BATTERY,
- 'type' : AGENT_TYPE_UNSPECIFIED,
- 'health' : AGENT_HEALTH_UNKNOWN,
- 'level' : 0,
- 'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
- })
-
- else:
- try_dynamic_counters = True
-
- #dev.closeChannel( 'HP-MESSAGE' )
- #dev.closePML()
-
- if try_dynamic_counters:
+ try_dynamic_counters = True
+
+ finally:
+ dev.closePML()
+ if try_dynamic_counters:
+ try:
try:
battery_health = dev.getDynamicCounter(200)
battery_trigger_level = dev.getDynamicCounter(201)
battery_level = dev.getDynamicCounter(202)
-
+
status_block['agents'].append({
'kind' : AGENT_KIND_INT_BATTERY,
'type' : AGENT_TYPE_UNSPECIFIED,
@@ -741,7 +741,8 @@
'level' : 0,
'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
})
-
+ finally:
+ dev.closePrint()
# this works for 2 pen products that allow 1 or 2 pens inserted
# from: k, kcm, cmy, ggk
@@ -785,8 +786,8 @@
def getFaxStatus(dev):
tx_active, rx_active = False, False
- #try:
- if 1:
+
+ try:
dev.openPML()
result_code, tx_state = dev.getPML(pml.OID_FAXJOB_TX_STATUS)
@@ -801,7 +802,7 @@
if rx_state not in (pml.FAXJOB_RX_STATUS_IDLE, pml.FAXJOB_RX_STATUS_DONE):
rx_active = True
- #finally:
- # dev.closePML()
+ finally:
+ dev.closePML()
return tx_active, rx_active
diff -uNr hplip-0.9.8.old/ChangeLog hplip-0.9.8.new/ChangeLog
--- hplip-0.9.8.old/ChangeLog 2006-01-31 12:00:08.000000000 -0800
+++ hplip-0.9.8.new/ChangeLog 2006-02-23 10:51:00.000000000 -0800
@@ -1,3 +1,22 @@
+2006-02-23 dsuffield
+ * Created hplip-0.9.8-4.patch
+
+2006-02-23 rcauligi
+ * Fixed an array index underflow in ljfastraster.cpp
+
+2006-02-06 dsuffield
+ * Created hplip-0.9.8-3.patch
+
+2006-02-06 syie
+ * Remove Jedi from models.xml
+
+2006-02-06 dwelch
+ * Fixed defect 832 (An r-value (1) error occurs while launching toolbox.) [aka, the RAW mode defect as reported by Henrique de Moraes Holschuh (Debian)]
+
+2006-02-06 dsuffield
+ * Applied hplip-0.9.8-2.patch.
+ * Removed Jedi for readme files.
+
2006-01-30 dsuffield
* Release 0.9.8.22 (public release 0.9.8)
diff -uNr hplip-0.9.8.old/data/xml/HPLIP-02-2006.xml hplip-0.9.8.new/data/xml/HPLIP-02-2006.xml
--- hplip-0.9.8.old/data/xml/HPLIP-02-2006.xml 2006-01-31 11:57:04.000000000 -0800
+++ hplip-0.9.8.new/data/xml/HPLIP-02-2006.xml 2006-02-06 13:07:03.000000000 -0800
@@ -24,7 +24,7 @@
This file automatically generated by model_editor.py.
Please do not hand edit this file.
-Last written on Tue, 31 Jan 2006 12:02:06 by syie
+Last written on Mon, 06 Feb 2006 13:07:03 by dsuffiel
using model_editor version 6.2.
-->
@@ -168,87 +168,6 @@
<r type="1"/>
</model>
-<model name="HP_Color_LaserJet_2605">
- <id></id>
- <icon>hp_color_LaserJet_2550.png</icon>
- <support type="2"/>
- <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
- <align type="0"/>
- <clean type="0"/>
- <color-cal type="0"/>
- <status type="0"/>
- <scan type="0"/>
- <fax type="0"/>
- <pcard type="0"/>
- <copy type="0"/>
- <tech class="Postscript" type="4"/>
- <embedded-server type="1"/>
- <panel-check type="1"/>
- <linefeed-cal type="0"/>
- <pq-diag type="0"/>
- <r0>
- <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
- <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
- <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
- <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
- <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
- </r0>
-</model>
-
-<model name="HP_Color_LaserJet_2605dn">
- <id></id>
- <icon>hp_color_LaserJet_2550.png</icon>
- <support type="2"/>
- <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
- <align type="0"/>
- <clean type="0"/>
- <color-cal type="0"/>
- <status type="0"/>
- <scan type="0"/>
- <fax type="0"/>
- <pcard type="0"/>
- <copy type="0"/>
- <tech class="Postscript" type="4"/>
- <embedded-server type="1"/>
- <panel-check type="1"/>
- <linefeed-cal type="0"/>
- <pq-diag type="0"/>
- <r0>
- <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
- <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
- <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
- <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
- <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
- </r0>
-</model>
-
-<model name="HP_Color_LaserJet_2605dtn">
- <id></id>
- <icon>hp_color_LaserJet_2550.png</icon>
- <support type="2"/>
- <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
- <align type="0"/>
- <clean type="0"/>
- <color-cal type="0"/>
- <status type="0"/>
- <scan type="0"/>
- <fax type="0"/>
- <pcard type="0"/>
- <copy type="0"/>
- <tech class="Postscript" type="4"/>
- <embedded-server type="1"/>
- <panel-check type="1"/>
- <linefeed-cal type="0"/>
- <pq-diag type="0"/>
- <r0>
- <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
- <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
- <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
- <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
- <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
- </r0>
-</model>
-
<model name="HP_LaserJet_3050">
<id></id>
<icon>hp_LaserJet_3015.png</icon>
diff -uNr hplip-0.9.8.old/hplip_readme.html hplip-0.9.8.new/hplip_readme.html
--- hplip-0.9.8.old/hplip_readme.html 2006-01-31 12:02:53.000000000 -0800
+++ hplip-0.9.8.new/hplip_readme.html 2006-02-23 10:53:35.000000000 -0800
@@ -890,18 +890,6 @@
<td class=xl19 width=144 style='width:108pt'><b>Services/Status</b></td>
</tr>
<tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605dn</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605dtn</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
<td height=17 style='height:12.75pt'>Color_LaserJet_3000</td>
<td>No</td><td>Yes</td><td>Yes</td><td>LJColor</td>
<td>No</td><td>No</td><td>No</td>
@@ -1793,7 +1781,6 @@
3. Moved OfficeJet 6100 and 6150 to DJ55xx.h; margins on these devices are same as those on DJ5550.
4. Added support for the following new printers.
- HP Color LaserJet 2605 (PS)
HP LaserJet 3050 (LJMono/PS)
HP LaserJet 3060/3062 (LJMono/PS)
HP LaserJet 3390/3392 (LJMono/PS)
@@ -2563,7 +2550,7 @@
© 2004-2006 Hewlett-Packard Company<br>
This document is provided "AS IS" without warranties of any kind including warranties of merchantability, fitness for a particular purpose, or non-infringement of intellectual property.
<br>
-HPLIP 0.9.8, last updated January 27, 2006
+HPLIP 0.9.8, last updated February 6, 2006
</font>
</BODY>
</HTML>
diff -uNr hplip-0.9.8.old/Makefile.am hplip-0.9.8.new/Makefile.am
--- hplip-0.9.8.old/Makefile.am 2006-01-09 12:20:27.000000000 -0800
+++ hplip-0.9.8.new/Makefile.am 2006-02-06 11:41:17.000000000 -0800
@@ -20,8 +20,10 @@
dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py photo.py unload.py testpage.py makeuri.py check.py fab.py levels.py \
sendfax.py setup.py
-# hp backend.
cupsdir = $(CUPS_BACKEND_PATH)
+cupsppddir = $(CUPS_PPD_PATH)
+
+# hp backend.
cups_PROGRAMS = hp
hp_SOURCES = backend/hp/hp.c
hp_LDADD = libhplip-api.la
@@ -232,7 +234,7 @@
#
# Edit hpiod.conf in destdir.
echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(CUPS_PPD_PATH)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
+ echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(cupsppddir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
#
# Edit hpiod.sh in destdir.
sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \
@@ -260,12 +262,15 @@
cp -f data/xml/unreleased/*.xml $(DESTDIR)$(hplipdir)/data/xml/; \
fi
#
-# Install fax support, let hpijs install ppd for now.
+# Install fax support.
mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax
if [ "$(rpm_install)" = "no" ]; then \
+ $(mkinstalldirs) $(DESTDIR)$(cupsdir); \
$(INSTALL_SCRIPT) $(DESTDIR)$(hpfaxdir)/hpfax $(DESTDIR)$(cupsdir); \
+ $(mkinstalldirs) $(DESTDIR)$(cupsppddir)/model; \
+ $(INSTALL_SCRIPT) $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd $(DESTDIR)$(cupsppddir)/model; \
+ gzip -f $(DESTDIR)$(cupsppddir)/model/HP-Fax-hplip.ppd; \
fi
- cp fax/ppd/HP-Fax-hplip.ppd prnt/hpijs/ppd/
#
# Add prerequisites for testing (or building?) "make install DESTDIR=/build".
diff -uNr hplip-0.9.8.old/prnt/hpijs/hpijs_readme.html hplip-0.9.8.new/prnt/hpijs/hpijs_readme.html
--- hplip-0.9.8.old/prnt/hpijs/hpijs_readme.html 2006-01-27 16:19:10.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/hpijs_readme.html 2006-02-06 13:45:38.000000000 -0800
@@ -3279,7 +3279,6 @@
3. Moved OfficeJet 6100 and 6150 to DJ55xx.h; margins on these devices are same as those on DJ5550.
4. Added support for the following new printers.
- HP Color LaserJet 2605 (PS)
HP LaserJet 3050 (LJMono/PS)
HP LaserJet 3060/3062 (LJMono/PS)
HP LaserJet 3390/3392 (LJMono/PS)
@@ -4141,7 +4140,7 @@
© 2001-2006 Hewlett-Packard Company<br>
This document is provided "AS IS" without warranties of any kind including warranties of merchantability, fitness for a particular purpose, or non-infringement of intellectual property.
<br>
-HPIJS 2.1.8, last updated January 27, 2006
+HPIJS 2.1.8, last updated February 6, 2006
</font>
</BODY>
</HTML>
diff -uNr hplip-0.9.8.old/prnt/hpijs/ljfastraster.cpp hplip-0.9.8.new/prnt/hpijs/ljfastraster.cpp
--- hplip-0.9.8.old/prnt/hpijs/ljfastraster.cpp 2006-01-30 12:48:09.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/ljfastraster.cpp 2006-02-23 10:46:25.000000000 -0800
@@ -1078,6 +1078,7 @@
&&
(
/* seedrow and run */
+ ((col + 2) >= horz_ht_dist) &&
(cur_row[col+2-horz_ht_dist] == cur_row[col+2])
||
/* seedrow and northeast predict */
@@ -1091,6 +1092,8 @@
(
(cur_row[col] != seedrow[col])
&&
+ ((col + 1) >= horz_ht_dist)
+ &&
(cur_row[col+1-horz_ht_dist] == cur_row[col+1])
&&
(
@@ -1098,6 +1101,8 @@
(
((col+2) < row_width)
&&
+ ((col + 2) >= horz_ht_dist)
+ &&
(cur_row[col+2-horz_ht_dist] == cur_row[col+2])
)
||
diff -uNr hplip-0.9.8.old/prnt/hpijs/Makefile.am hplip-0.9.8.new/prnt/hpijs/Makefile.am
--- hplip-0.9.8.old/prnt/hpijs/Makefile.am 2006-01-24 12:19:06.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/Makefile.am 2006-02-06 11:41:17.000000000 -0800
@@ -80,8 +80,8 @@
rm -f $(DESTDIR)$(ppddir)/hp*.ppd*
install-cups:
- rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
- rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
+# rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
+# rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
rm -f $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds
$(mkinstalldirs) $(DESTDIR)$(CUPS_PPD_PATH)
ln -s $(datadir)/ppd $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds
Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- hplip.spec 14 Feb 2006 16:18:28 -0000 1.47
+++ hplip.spec 27 Feb 2006 15:58:51 -0000 1.48
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 0.9.8
-Release: 4
+Release: 5
License: GPL/MIT/BSD
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -13,7 +13,7 @@
Patch1: hplip-quiet.patch
Patch2: hplip-desktop.patch
Patch3: hplip-config.patch
-Patch4: hplip-0.9.8-3.patch
+Patch4: hplip-0.9.8-4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires: desktop-file-utils >= 0.2.92
@@ -67,8 +67,8 @@
# Use static IP ports (for SELinux policy).
%patch3 -p1 -b .config
-# Apply patch 0.9.8-2
-%patch4 -p1 -b .0.9.8-3
+# Apply patch 0.9.8-4
+%patch4 -p1 -b .0.9.8-4
%build
%configure --disable-foomatic-install --disable-cups-install
@@ -159,6 +159,9 @@
fi
%changelog
+* Mon Feb 27 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-5
+- Patchlevel 4.
+
* Tue Feb 14 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-4
- Added Obsoletes: hpoj tags back in (bug #181476).
--- hplip-0.9.8-3.patch DELETED ---
- Previous message (by thread): rpms/mod_python/devel mod_python-3.1.4-apr1x.patch, 1.2, 1.3 mod_python.spec, 1.29, 1.30
- Next message (by thread): rpms/gcc/devel gcc41-fortran-matmul.patch, NONE, 1.1 gcc41-fortran-where-opt.patch, NONE, 1.1 gcc41-mni.patch, NONE, 1.1 gcc41-x86_64-sse3.patch, NONE, 1.1 .cvsignore, 1.136, 1.137 gcc41.spec, 1.39, 1.40 sources, 1.138, 1.139 gcc41-c++-parser.patch, 1.1, NONE gcc41-expr_nonzero_p.patch, 1.1, NONE gcc41-fortran-where.patch, 1.1, NONE gcc41-libstdc++-bitset.patch, 1.1, NONE gcc41-mmintrin.patch, 1.1, NONE gcc41-pr25626.patch, 1.1, NONE gcc41-sparc64-g7.patch, 1.1, NONE gcc41-vrp.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list