pool/hplip
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=25

Browse Source
This commit is contained in:
OBS User unknown 2008-02-22 00:30:29 +00:00 committed by Git OBS Bridge
parent cdbecc5e16
commit cf311d9d57
9 changed files with 322 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
change-udev-rules.diff
View File

@ -5,26 +5,26 @@
ACTION!="add", GOTO="hpmud_rules_end" ACTION!="add", GOTO="hpmud_rules_end"
-SUBSYSTEM=="ppdev", OWNER="lp", GROUP="lp", MODE="0666" -SUBSYSTEM=="ppdev", OWNER="lp", GROUP="lp", MODE="0666"
+SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0666" +SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test" SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end" SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
LABEL="pid_test" LABEL="pid_test"
# Check for AiO products (0x03f0xx11). # Check for AiO products (0x03f0xx11).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="lp", GROUP="lp", MODE="0666" -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0666"
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0666" +SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0664"
# Check for Photosmart products (0x03f0xx02). # Check for Photosmart products (0x03f0xx02).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="lp", GROUP="lp", MODE="0666" -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0666"
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0666" +SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0664"
# Check for Business Inkjet products (0x03f0xx12). # Check for Business Inkjet products (0x03f0xx12).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="lp", GROUP="lp", MODE="0666" -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0666"
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0666" +SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0664"
# Check for Deskjet products (0x03f0xx04). # Check for Deskjet products (0x03f0xx04).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="lp", GROUP="lp", MODE="0666" -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0666"
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0666" +SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0664"
# Check for LaserJet products (0x03f0xx17). # Check for LaserJet products (0x03f0xx17).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="lp", GROUP="lp", MODE="0666" -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0666"
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0666" +SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0664"
LABEL="hpmud_rules_end" LABEL="hpmud_rules_end"

56
create_hal_global_fdi_from_models.dat Normal file
View File

@ -0,0 +1,56 @@
#! /bin/bash
#
# Johannes Meixner <jsmeix@suse.de>, 2004, 2005, 2006
#set -x
export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
MY_NAME=${0##*/}
# Input:
# Create temporary files:
TMP_DATA=$(mktemp -u /tmp/$MY_NAME.XXXXXX)
# Extract USB entries from the models.dat file:
test -n "$1" && RULES_FILE="$1" || RULES_FILE="models.dat"
ls $RULES_FILE &>/dev/null || { echo "$MY_NAME error: Required models.dat file '$RULES_FILE' not found." 1>&2 ; exit 3 ; }
tr '[:upper:]' '[:lower:]' <$RULES_FILE | egrep '^usb-pid=[0-9a-f][0-9a-f][0-9a-f][0-9a-f]$' | grep -v '0000' | cut -s -d '=' -f 2 | sort -u >$TMP_DATA
tr '[:upper:]' '[:lower:]' <$RULES_FILE | egrep '^usb-pid=[0-9a-f][0-9a-f][0-9a-f]$' | grep -v '000' | cut -s -d '=' -f 2 | sort -u | sed -e 's/^/0/' >>$TMP_DATA
# Output:
# Output header:
echo '<?xml version="1.0" encoding="ISO-8859-1"?>'
echo '<deviceinfo version="0.2">'
echo ' <device>'
# Output model specific HP USB device entries:
exec <$TMP_DATA
while read PRODUCT
do echo
echo ' <match key="info.bus" string="usb_device">'
echo ' <match key="usb_device.vendor_id" int="0x03f0">'
echo -n ' <match key="usb_device.product_id" int="'
echo -n "0x$PRODUCT"
echo '">'
echo ' <append key="info.capabilities" type="strlist">scanner</append>'
echo ' </match>'
echo ' </match>'
echo ' </match>'
done
# Output footer:
echo
echo ' </device>'
echo '</deviceinfo>'
# Remove the temporary file
rm $TMP_DATA
exit 0

17
hpijs-standalone.changes
View File

@ -1,10 +1,21 @@
-------------------------------------------------------------------
Thu Feb 21 14:57:24 CET 2008 - jsmeix@suse.de
- Updated to version 2.8.2:
Updated the krgb patch for gpl ghostscript 8.61.
Changed margins to 0.125 inch from 0.
Several more supported printers (some more ZJStream printers).
- Updated to version 2.7.12:
Several more supported LaserJet printers, one ZJStream printer,
one LJm1005 printer with binary-only plugin (LaserJet M1005 MFP).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 23 14:45:08 CEST 2007 - jsmeix@suse.de Tue Oct 23 14:45:08 CEST 2007 - jsmeix@suse.de
- Updated to version 2.7.10: - Updated to version 2.7.10:
New LJZjsMono printer device class for ZJStream printers. New LJZjsMono printer device class for ZJStream printers.
ZJStream printers require JBIG which has issues ZJStream printers require JBIG which has issues
(see Novell/Suse Bugzilla bug #263181). Therefore the support (see Novell/Suse Bugzilla bnc#263181). Therefore the support
for ZJStream printers is provided only via a binary-only plugin for ZJStream printers is provided only via a binary-only plugin
which is downloaded by "hp-setup" from the HP web-site only after which is downloaded by "hp-setup" from the HP web-site only after
the user has accepted the license terms. The "hp-setup" utility the user has accepted the license terms. The "hp-setup" utility
@ -72,12 +83,12 @@ Thu Mar 1 13:35:18 CET 2007 - jsmeix@suse.de
Fri Feb 16 13:02:45 CET 2007 - jsmeix@suse.de Fri Feb 16 13:02:45 CET 2007 - jsmeix@suse.de
- Re-enabled "Supplements: ghostscript_any" because - Re-enabled "Supplements: ghostscript_any" because
bug #243595 is fixed now. bnc#243595 is fixed now.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 12 10:10:15 CET 2007 - aj@suse.de Mon Feb 12 10:10:15 CET 2007 - aj@suse.de
- Do not add supplements to temporary workaround bug #243595. - Do not add supplements to temporary workaround bnc#243595.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 5 14:25:21 CET 2007 - jsmeix@suse.de Mon Feb 5 14:25:21 CET 2007 - jsmeix@suse.de

52
hpijs-standalone.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package hpijs-standalone (Version 2.7.10) # spec file for package hpijs-standalone (Version 2.8.2)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -10,19 +10,20 @@
# norootforbuild # norootforbuild
Name: hpijs-standalone Name: hpijs-standalone
BuildRequires: gcc-c++ libjpeg-devel BuildRequires: gcc-c++ libjpeg-devel
Summary: HPIJS stand-alone Summary: HPIJS stand-alone
# HPLIP has reached 1.0 status. With this release a date encoded revision number is used: # HPLIP has reached 1.0 status. With this release a date encoded revision number is used:
# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
Version: 2.7.10 Version: 2.8.2
Release: 4 Release: 1
Group: Hardware/Printing Group: Hardware/Printing
License: BSD 3-Clause License: BSD 3-Clause
Url: http://hpinkjet.sourceforge.net/ Url: http://hpinkjet.sourceforge.net/
# Source0...Source9 is for sources from HP: # Source0...Source9 is for sources from HP:
# URL for Source0: http://switch.dl.sourceforge.net/sourceforge/hplip/hplip-2.7.10.tar.gz # URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-2.8.2.tar.gz
Source0: hplip-%{version}.tar.bz2 Source0: hplip-%{version}.tar.bz2
# Patch10...Patch99 is for Suse patches for the sources from HP: # Patch10...Patch99 is for Suse patches for the sources from HP:
# The patch numbers are the same as in hplip.spec. # The patch numbers are the same as in hplip.spec.
@ -85,6 +86,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
--libdir=%_libdir \ --libdir=%_libdir \
--disable-foomatic-xml-install \ --disable-foomatic-xml-install \
--disable-foomatic-ppd-install \ --disable-foomatic-ppd-install \
--disable-foomatic-drv-install \
--disable-foomatic-rip-hplip-install \
--disable-doc-build \ --disable-doc-build \
--enable-hpijs-only-build --enable-hpijs-only-build
make make
@ -111,12 +114,21 @@ exit 0
%doc COPYING prnt/hpijs/README_LIBJPG doc/license.html doc/legal.html doc/tech_docs/hpijs.html doc/tech_docs/device_classes.html doc/tech_docs/page_sizes.html doc/tech_docs/printable_areas.html %doc COPYING prnt/hpijs/README_LIBJPG doc/license.html doc/legal.html doc/tech_docs/hpijs.html doc/tech_docs/device_classes.html doc/tech_docs/page_sizes.html doc/tech_docs/printable_areas.html
%doc %{_mandir}/man1/hpijs.1.gz %doc %{_mandir}/man1/hpijs.1.gz
%{_bindir}/hpijs %{_bindir}/hpijs
%changelog %changelog
* Tue Oct 23 2007 - jsmeix@suse.de * Thu Feb 21 2008 jsmeix@suse.de
- Updated to version 2.8.2:
Updated the krgb patch for gpl ghostscript 8.61.
Changed margins to 0.125 inch from 0.
Several more supported printers (some more ZJStream printers).
- Updated to version 2.7.12:
Several more supported LaserJet printers, one ZJStream printer,
one LJm1005 printer with binary-only plugin (LaserJet M1005 MFP).
* Tue Oct 23 2007 jsmeix@suse.de
- Updated to version 2.7.10: - Updated to version 2.7.10:
New LJZjsMono printer device class for ZJStream printers. New LJZjsMono printer device class for ZJStream printers.
ZJStream printers require JBIG which has issues ZJStream printers require JBIG which has issues
(see Novell/Suse Bugzilla bug #263181). Therefore the support (see Novell/Suse Bugzilla bnc#263181). Therefore the support
for ZJStream printers is provided only via a binary-only plugin for ZJStream printers is provided only via a binary-only plugin
which is downloaded by "hp-setup" from the HP web-site only after which is downloaded by "hp-setup" from the HP web-site only after
the user has accepted the license terms. The "hp-setup" utility the user has accepted the license terms. The "hp-setup" utility
@ -126,47 +138,47 @@ exit 0
- Updated to version 2.7.9: - Updated to version 2.7.9:
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
Some more supported Photosmart and Officejet printers. Some more supported Photosmart and Officejet printers.
* Thu Aug 02 2007 - jsmeix@suse.de * Thu Aug 02 2007 jsmeix@suse.de
- Updated to version 2.7.7: - Updated to version 2.7.7:
Some more supported Photosmart printers. Some more supported Photosmart printers.
- fix-printing-white-spaces-and-empty-lines.diff is no longer - fix-printing-white-spaces-and-empty-lines.diff is no longer
needed because the bug is now fixed in the source. needed because the bug is now fixed in the source.
* Fri Jul 06 2007 - jsmeix@suse.de * Fri Jul 06 2007 jsmeix@suse.de
- fix-printing-white-spaces-and-empty-lines.diff fixes printing - fix-printing-white-spaces-and-empty-lines.diff fixes printing
white spaces and empty lines according to a mail from HP white spaces and empty lines according to a mail from HP
on the hplip-help@lists.sourceforge.net list. on the hplip-help@lists.sourceforge.net list.
* Tue Jul 03 2007 - jsmeix@suse.de * Tue Jul 03 2007 jsmeix@suse.de
- Updated to version 2.7.6: - Updated to version 2.7.6:
Some more supported Photosmart, Color LaserJet, and DeskJet Some more supported Photosmart, Color LaserJet, and DeskJet
printers. printers.
* Fri Apr 27 2007 - jsmeix@suse.de * Fri Apr 27 2007 jsmeix@suse.de
- Updated to version 1.7.4a: - Updated to version 1.7.4a:
Resolved a build issue that caused a couple missing files Resolved a build issue that caused a couple missing files
in the 1.7.4 release (no Suse bug). in the 1.7.4 release (no Suse bug).
* Mon Apr 23 2007 - jsmeix@suse.de * Mon Apr 23 2007 jsmeix@suse.de
- Updated to version 1.7.4: - Updated to version 1.7.4:
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
Some more supported DeskJet printers. Some more supported DeskJet printers.
* Mon Mar 26 2007 - jsmeix@suse.de * Mon Mar 26 2007 jsmeix@suse.de
- Updated to version 1.7.3: - Updated to version 1.7.3:
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
No new supported models but enhancements for some models. No new supported models but enhancements for some models.
* Thu Mar 01 2007 - jsmeix@suse.de * Thu Mar 01 2007 jsmeix@suse.de
- Updated to version 1.7.2: - Updated to version 1.7.2:
Several more supported Officejet Pro devices. Several more supported Officejet Pro devices.
New OJProKx50 device class (derived from DJGenericVIP). New OJProKx50 device class (derived from DJGenericVIP).
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer
needed because the bugs are now fixed in the sources. needed because the bugs are now fixed in the sources.
* Fri Feb 16 2007 - jsmeix@suse.de * Fri Feb 16 2007 jsmeix@suse.de
- Re-enabled "Supplements: ghostscript_any" because - Re-enabled "Supplements: ghostscript_any" because
bug #243595 is fixed now. bnc#243595 is fixed now.
* Mon Feb 12 2007 - aj@suse.de * Mon Feb 12 2007 aj@suse.de
- Do not add supplements to temporary workaround bug #243595. - Do not add supplements to temporary workaround bnc#243595.
* Mon Feb 05 2007 - jsmeix@suse.de * Mon Feb 05 2007 jsmeix@suse.de
- fix-buffer-overflow.patch fixes a too small string buffer - fix-buffer-overflow.patch fixes a too small string buffer
which overflows in line 310 in ljcolor.cpp. which overflows in line 310 in ljcolor.cpp.
* Thu Feb 01 2007 - jsmeix@suse.de * Thu Feb 01 2007 jsmeix@suse.de
- Created new package hpijs-standalone and hpijs-standalone.spec - Created new package hpijs-standalone and hpijs-standalone.spec
for a special version of /usr/bin/hpijs which neither needs for a special version of /usr/bin/hpijs which neither needs
a HPLIP library nor a CUPS library to run it. a HPLIP library nor a CUPS library to run it.

3
hplip-2.7.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5739214779f48a61a2f9e3a06662c262eb1b672f1a03a4b0d020b6c65c9fc477
size 12717034

3
hplip-2.8.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f36420e3b2491606b2a11b6fea2e256419b00a198cc115d6011e939336506536
size 12663920

64
hplip.changes
View File

@ -1,10 +1,44 @@
-------------------------------------------------------------------
Thu Feb 21 14:35:36 CET 2008 - jsmeix@suse.de
- create_hal_global_fdi_from_models.dat creates the
global HAL 70-hpmud.fdi file during build-time from the
models.dat file (see Novell/Suse Bugzilla bnc#336658).
- Built version 2.8.2 in the traditional way with readymade
PPD files in /usr/share/cups/model/manufacturer-PPDs/hplip/
(i.e. without hpijs.drv and foomatic-rip-hplip)
- Updated to version 2.8.2:
HPIJS PPD files are now created with the CUPS DDK instead of
the foomatic database. Dynamic PPD files are now supported
via the hpijs.drv file.
Added foomatic-rip-hplip support. Foomatic-rip-hplip is for
distros that do not have the latest foomatic-rip which is
required for drv support.
Updated the krgb patch for gpl ghostscript 8.61.
Updated the "hp" backend to return only hplip supported devices
during device discovery. If the device is not in models.dat
the "hp" backend will exclude it.
Changed margins to 0.125 inch from 0.
Bumped libhpmud from 0.0.1 to 0.0.2 for support_type
in hpmud_query_model().
Several bug fixes (no Suse bugs).
Several more supported printers (some more ZJStream printers).
- Updated to version 2.7.12:
Added PJL support to "hp" backend which provides in-band
printer status.
Bumped libhpmud from 0.0.0 to 0.0.1 for statustype support
in hpmud_query_model().
Several bug fixes (no Suse bugs).
Several more supported LaserJet printers, one ZJStream printer,
one LJm1005 printer with binary-only plugin (LaserJet M1005 MFP).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 9 14:29:44 CET 2007 - jsmeix@suse.de Fri Nov 9 14:29:44 CET 2007 - jsmeix@suse.de
- Changed rchplip (i.e. /etc/init.d/hplip): - Changed rchplip (i.e. /etc/init.d/hplip):
Added "$local_fs $remote_fs $syslog" to Required-Start Added "$local_fs $remote_fs $syslog" to Required-Start
to be on the safe side and added a line "export HOME=/tmp" to be on the safe side and added a line "export HOME=/tmp"
to mitigate Novell/Suse Bugzilla bug #339443. to mitigate Novell/Suse Bugzilla bnc#339443.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 23 14:24:27 CEST 2007 - jsmeix@suse.de Tue Oct 23 14:24:27 CEST 2007 - jsmeix@suse.de
@ -12,7 +46,7 @@ Tue Oct 23 14:24:27 CEST 2007 - jsmeix@suse.de
- Updated to version 2.7.10: - Updated to version 2.7.10:
New LJZjsMono printer device class for ZJStream printers. New LJZjsMono printer device class for ZJStream printers.
ZJStream printers require JBIG which has issues ZJStream printers require JBIG which has issues
(see Novell/Suse Bugzilla bug #263181). Therefore the support (see Novell/Suse Bugzilla bnc#263181). Therefore the support
for ZJStream printers is provided only via a binary-only plugin for ZJStream printers is provided only via a binary-only plugin
which is downloaded by "hp-setup" from the HP web-site only after which is downloaded by "hp-setup" from the HP web-site only after
the user has accepted the license terms. the user has accepted the license terms.
@ -38,7 +72,7 @@ Tue Oct 23 14:24:27 CEST 2007 - jsmeix@suse.de
Tue Sep 18 12:18:25 CEST 2007 - jsmeix@suse.de Tue Sep 18 12:18:25 CEST 2007 - jsmeix@suse.de
- Add a line-feed to the end of all PPDs to fix those PPDs where - Add a line-feed to the end of all PPDs to fix those PPDs where
it is missing. See Novell/Suse Bugzilla bug #309832: it is missing. See Novell/Suse Bugzilla bnc#309832:
Unix/Linux text files must end with a line-feed. Unix/Linux text files must end with a line-feed.
Otherwise reading the last line results EOF and then some Otherwise reading the last line results EOF and then some
programs may ignore the last line. programs may ignore the last line.
@ -49,7 +83,7 @@ Wed Sep 12 16:17:46 CEST 2007 - jsmeix@suse.de
- Ignore cupstestppd FAILs because of errors in UIConstraints - Ignore cupstestppd FAILs because of errors in UIConstraints
and/or NonUIConstraints which are detected since cupstestppd and/or NonUIConstraints which are detected since cupstestppd
in CUPS > 1.2.7 (i.e. since openSUSE 10.3). in CUPS > 1.2.7 (i.e. since openSUSE 10.3).
See Novell/Suse Bugzilla bug #309822: When this bug is fixed, See Novell/Suse Bugzilla bnc#309822: When this bug is fixed,
cupstestppd would no longer result zero exit code. cupstestppd would no longer result zero exit code.
In the long run the PPDs should be fixed but as far as we know In the long run the PPDs should be fixed but as far as we know
there have been no problems because of such UIConstraints errors there have been no problems because of such UIConstraints errors
@ -87,7 +121,7 @@ Thu Jul 26 09:15:21 CEST 2007 - jsmeix@suse.de
- Changed change-udev-rules.diff so that 55-hpmud.rules matches - Changed change-udev-rules.diff so that 55-hpmud.rules matches
also against the new SUBSYSTEM=="usb" but keep "usb_device" also against the new SUBSYSTEM=="usb" but keep "usb_device"
for backward compatibility (Novell/Suse Bugzilla bug #294161). for backward compatibility (Novell/Suse Bugzilla bnc#294161).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 6 10:26:21 CEST 2007 - jsmeix@suse.de Fri Jul 6 10:26:21 CEST 2007 - jsmeix@suse.de
@ -162,10 +196,10 @@ Fri Feb 16 11:52:28 CET 2007 - jsmeix@suse.de
- Added a fix for fat.c to fix-buffer-overflow.patch - Added a fix for fat.c to fix-buffer-overflow.patch
to aviod access when array subscript is above array bounds to aviod access when array subscript is above array bounds
(Suse Bugzilla bug #243047). (Suse Bugzilla bnc#243047).
- Remove all byte-compiled Python .pyc (and perhaps .pyo) - Remove all byte-compiled Python .pyc (and perhaps .pyo)
files which are created at run-time in /usr/share/hplip/ files which are created at run-time in /usr/share/hplip/
via preun script (Suse Bugzilla bug #244451). via preun script (Suse Bugzilla bnc#244451).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 5 14:24:24 CET 2007 - jsmeix@suse.de Mon Feb 5 14:24:24 CET 2007 - jsmeix@suse.de
@ -216,7 +250,7 @@ Thu Jan 25 14:53:05 CET 2007 - jsmeix@suse.de
Fri Jan 19 16:01:20 CET 2007 - jsmeix@suse.de Fri Jan 19 16:01:20 CET 2007 - jsmeix@suse.de
- Added fix for uninitialized file pointer in api/model.c to - Added fix for uninitialized file pointer in api/model.c to
fix-uninitialized-variables.diff (Suse Bugzilla bug #236709). fix-uninitialized-variables.diff (Suse Bugzilla bnc#236709).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 12 15:13:35 CET 2007 - jsmeix@suse.de Fri Jan 12 15:13:35 CET 2007 - jsmeix@suse.de
@ -238,9 +272,9 @@ Wed Dec 20 14:45:25 CET 2006 - jsmeix@suse.de
The new models.dat file replaces the .xml files. The hplip_api The new models.dat file replaces the .xml files. The hplip_api
can be used to get model attributes without running the HPLIP can be used to get model attributes without running the HPLIP
daemons. See hplip_api.h for reference (this affects the Suse daemons. See hplip_api.h for reference (this affects the Suse
Bugzilla bugs #184798 and #184824). Bugzilla bugs bnc#184798 and bnc#184824).
- Fixed hp-toolbox.wrapper to catch 'error' regardless of the case - Fixed hp-toolbox.wrapper to catch 'error' regardless of the case
(see Suse Bugzilla bug #229620). (see Suse Bugzilla bnc#229620).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 17 09:59:50 CEST 2006 - jsmeix@suse.de Tue Oct 17 09:59:50 CEST 2006 - jsmeix@suse.de
@ -360,13 +394,13 @@ Fri May 19 13:04:46 CEST 2006 - jsmeix@suse.de
Wed Apr 26 12:11:00 CEST 2006 - jsmeix@suse.de Wed Apr 26 12:11:00 CEST 2006 - jsmeix@suse.de
- Fixed PPDs for "LaserJet 5Si" and "LaserJet 5MP" - Fixed PPDs for "LaserJet 5Si" and "LaserJet 5MP"
(see Suse bugzilla bug #164991). (see Suse Bugzilla bnc#164991).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 24 14:11:01 CET 2006 - jsmeix@suse.de Fri Feb 24 14:11:01 CET 2006 - jsmeix@suse.de
- Fixed an array index underflow (for LJ1010, LJ1012) - Fixed an array index underflow (for LJ1010, LJ1012)
in ljfastraster.cpp (Suse Bugzilla #152720). in ljfastraster.cpp (Suse Bugzilla bnc#152720).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 25 21:36:29 CET 2006 - mls@suse.de Wed Jan 25 21:36:29 CET 2006 - mls@suse.de
@ -403,7 +437,7 @@ Thu Dec 1 16:01:58 CET 2005 - jsmeix@suse.de
- Removed unneeded KDE packages from "neededforbuild" since - Removed unneeded KDE packages from "neededforbuild" since
the new package python-qt was split from kdebindings3-python the new package python-qt was split from kdebindings3-python
(see Suse bugzilla bug #135250). (see Suse Bugzilla bnc#135250).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 28 11:30:30 CET 2005 - jsmeix@suse.de Mon Nov 28 11:30:30 CET 2005 - jsmeix@suse.de
@ -411,7 +445,7 @@ Mon Nov 28 11:30:30 CET 2005 - jsmeix@suse.de
- Replaced requirement for the package kdebindings3-python - Replaced requirement for the package kdebindings3-python
by a generic requirement for the RPM capability PyQt by a generic requirement for the RPM capability PyQt
to avoid needless dependencies to KDE libraries to avoid needless dependencies to KDE libraries
(see Suse bugzilla bug #135250). (see Suse Bugzilla bnc#135250).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 12:31:52 CET 2005 - jsmeix@suse.de Tue Nov 22 12:31:52 CET 2005 - jsmeix@suse.de
@ -436,7 +470,7 @@ Mon Sep 12 14:02:17 CEST 2005 - jsmeix@suse.de
- Several PPDs contain "600x600x2dpi" which is not allowed - Several PPDs contain "600x600x2dpi" which is not allowed
according to the Adobe PPD specification section 5.9 according to the Adobe PPD specification section 5.9
and which is therefore simply replaced by "600x1200dpi" and which is therefore simply replaced by "600x1200dpi"
(see Suse bugzilla bug #116393). (see Suse Bugzilla bnc#116393).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 17:09:07 CEST 2005 - jsmeix@suse.de Mon Aug 29 17:09:07 CEST 2005 - jsmeix@suse.de

236
hplip.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package hplip (Version 2.7.10) # spec file for package hplip (Version 2.8.2)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -10,19 +10,20 @@
# norootforbuild # norootforbuild
Name: hplip Name: hplip
BuildRequires: cups cups-devel libdrm-devel libgphoto2-devel libjpeg-devel libusb-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt python-tk python-xml qt3-devel readline-devel sane-backends update-desktop-files BuildRequires: cups cups-devel libdrm-devel libgphoto2-devel libjpeg-devel libusb-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt python-tk python-xml qt3-devel readline-devel sane-backends update-desktop-files
Summary: HP's Printing, Scanning, and Faxing Software Summary: HP's Printing, Scanning, and Faxing Software
# HPLIP has reached 1.0 status. With this release a date encoded revision number is used: # HPLIP has reached 1.0 status. With this release a date encoded revision number is used:
# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
Version: 2.7.10 Version: 2.8.2
Release: 10 Release: 1
Group: Hardware/Printing Group: Hardware/Printing
License: BSD 3-Clause; GPL v2 or later; X11/MIT License: BSD 3-Clause; GPL v2 or later; X11/MIT
Url: http://hpinkjet.sourceforge.net/ Url: http://hpinkjet.sourceforge.net/
# Source0...Source9 is for sources from HP: # Source0...Source9 is for sources from HP:
# URL for Source0: http://switch.dl.sourceforge.net/sourceforge/hplip/hplip-2.7.10.tar.gz # URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-2.8.2.tar.gz
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
# Patch0...Patch9 is for patches from HP: # Patch0...Patch9 is for patches from HP:
# Patch10...Patch99 is for Suse patches for the sources from HP: # Patch10...Patch99 is for Suse patches for the sources from HP:
@ -39,6 +40,8 @@ Source101: hp-toolbox.wrapper
Source102: hpijs.1.gz Source102: hpijs.1.gz
# Source103 is the init script for hpssd: # Source103 is the init script for hpssd:
Source103: rchplip Source103: rchplip
# Script which outputs a global HAL fdi file for HP USB devices which are known to HPLIP:
Source104: create_hal_global_fdi_from_models.dat
# Patch100... is for special Suse patches: # Patch100... is for special Suse patches:
# Patch101 changes in the udev rules file the owner from "lp" to "root" # Patch101 changes in the udev rules file the owner from "lp" to "root"
# to avoid that the permissions can be changed e.g. by any CUPS filter script # to avoid that the permissions can be changed e.g. by any CUPS filter script
@ -155,10 +158,19 @@ export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
./configure --prefix=/usr \ ./configure --prefix=/usr \
--libdir=%_libdir \ --libdir=%_libdir \
--enable-doc-build \
--enable-network-build \
--enable-pp-build \
--enable-scan-build \
--enable-gui-build \
--enable-fax-build \
--disable-foomatic-xml-install \ --disable-foomatic-xml-install \
--disable-foomatic-rip-hplip-install \
--disable-foomatic-drv-install \
--enable-foomatic-ppd-install \ --enable-foomatic-ppd-install \
--with-hpppddir=%{_datadir}/cups/model/manufacturer-PPDs/%{name} \ --with-hpppddir=%{_datadir}/cups/model/manufacturer-PPDs/%{name} \
--with-cupsbackenddir=%{_libdir}/cups/backend \ --with-cupsbackenddir=%{_libdir}/cups/backend \
--with-cupsfilterdir=%{_libdir}/cups/filter \
--with-docdir=%{_defaultdocdir}/%{name} --with-docdir=%{_defaultdocdir}/%{name}
make make
@ -185,17 +197,17 @@ done
# which cannot work because there is no "hppostprocessing" filter. # which cannot work because there is no "hppostprocessing" filter.
# Some PPDs contain "1284DeviceId" which must be "1284DeviceID". # Some PPDs contain "1284DeviceId" which must be "1284DeviceID".
# Some PPDs contain "* PageRegion" which must be "*PageRegion". # Some PPDs contain "* PageRegion" which must be "*PageRegion".
# Some HPIJS PPDs contain a too long ShortNickName (longer than 31 chars)
# therefore from all ShortNickName entries " Foomatic/hpijs" is simply removed
# but they still exists in the NickName entries which are shown to the user
# when the user selects a PPD to set up a print queue:
for p in *.ppd for p in *.ppd
do perl -pi -e 's/600x600x2dpi/600x1200dpi/;' $p do perl -pi -e 's/600x600x2dpi/600x1200dpi/;' $p
grep -q '^\*cupsFilter:.*hppostprocessing' $p && rm -v $p grep -q '^\*cupsFilter:.*hppostprocessing' $p && rm -v $p
perl -pi -e 's/1284DeviceId/1284DeviceID/;' $p perl -pi -e 's/1284DeviceId/1284DeviceID/;' $p
perl -pi -e 's/\* PageRegion/*PageRegion/;' $p perl -pi -e 's/\* PageRegion/*PageRegion/;' $p
sed -i -e '/^\*ShortNickName:/s/ Foomatic\/hpijs//;' $p
done done
# HP_LaserJet_5Si.ppd works only when this printer has the optional PostScript module:
sed -i -e '/^\*NickName:/s/ (recommended)//' HP_LaserJet_5Si.ppd
sed -i -e '/^\*ModelName:/s/5Si/5Si MX/' HP_LaserJet_5Si.ppd
# HP_LaserJet_5MP.ppd works only for the model with the built-in PostScript module ("MP"):
sed -i -e '/^\*ModelName:/s/5P/5MP/' HP_LaserJet_5MP.ppd
# Change default media size to A4 if this is an available choice in the PPD and then # Change default media size to A4 if this is an available choice in the PPD and then
# set DefaultPageSize, DefaultPageRegion, DefaultImageableArea, DefaultPaperDimension to A4: # set DefaultPageSize, DefaultPageRegion, DefaultImageableArea, DefaultPaperDimension to A4:
for p in *.ppd for p in *.ppd
@ -221,6 +233,11 @@ do egrep -v '^\*UIConstraints:|^\*NonUIConstraints:' $p | cupstestppd - || { rm
done done
popd popd
# End of the general tests and adjustments for all PPDs. # End of the general tests and adjustments for all PPDs.
# Run the script which outputs a global HAL fdi file for HP USB devices which are known to HPLIP
# and install its output as /etc/hal/fdi/policy/10osvendor/70-hpmud.fdi:
bash %{SOURCE104} data/models/models.dat >70-hpmud.fdi
install -d %{buildroot}%{_sysconfdir}/hal/fdi/policy/10osvendor
install -m644 70-hpmud.fdi %{buildroot}%{_sysconfdir}/hal/fdi/policy/10osvendor/70-hpmud.fdi
# Desktop menue entry stuff: # Desktop menue entry stuff:
# Install the wrapper for hp-toolbox: # Install the wrapper for hp-toolbox:
install -m 755 %{SOURCE101} %{buildroot}%{_bindir}/hp-toolbox.wrapper install -m 755 %{SOURCE101} %{buildroot}%{_bindir}/hp-toolbox.wrapper
@ -308,6 +325,11 @@ exit 0
%dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev
%dir %{_sysconfdir}/udev/rules.d %dir %{_sysconfdir}/udev/rules.d
%config %{_sysconfdir}/udev/rules.d/55-hpmud.rules %config %{_sysconfdir}/udev/rules.d/55-hpmud.rules
%dir %{_sysconfdir}/hal
%dir %{_sysconfdir}/hal/fdi
%dir %{_sysconfdir}/hal/fdi/policy
%dir %{_sysconfdir}/hal/fdi/policy/10osvendor
%{_sysconfdir}/hal/fdi/policy/10osvendor/70-hpmud.fdi
%{_initrddir}/hplip %{_initrddir}/hplip
%{_sbindir}/rchplip %{_sbindir}/rchplip
%{_datadir}/%{name}/ %{_datadir}/%{name}/
@ -356,17 +378,49 @@ exit 0
%{_bindir}/hpijs %{_bindir}/hpijs
%{_libdir}/libhpip.* %{_libdir}/libhpip.*
%{_libdir}/libhpmud.* %{_libdir}/libhpmud.*
%changelog %changelog
* Fri Nov 09 2007 - jsmeix@suse.de * Thu Feb 21 2008 jsmeix@suse.de
- create_hal_global_fdi_from_models.dat creates the
global HAL 70-hpmud.fdi file during build-time from the
models.dat file (see Novell/Suse Bugzilla bnc#336658).
- Built version 2.8.2 in the traditional way with readymade
PPD files in /usr/share/cups/model/manufacturer-PPDs/hplip/
(i.e. without hpijs.drv and foomatic-rip-hplip)
- Updated to version 2.8.2:
HPIJS PPD files are now created with the CUPS DDK instead of
the foomatic database. Dynamic PPD files are now supported
via the hpijs.drv file.
Added foomatic-rip-hplip support. Foomatic-rip-hplip is for
distros that do not have the latest foomatic-rip which is
required for drv support.
Updated the krgb patch for gpl ghostscript 8.61.
Updated the "hp" backend to return only hplip supported devices
during device discovery. If the device is not in models.dat
the "hp" backend will exclude it.
Changed margins to 0.125 inch from 0.
Bumped libhpmud from 0.0.1 to 0.0.2 for support_type
in hpmud_query_model().
Several bug fixes (no Suse bugs).
Several more supported printers (some more ZJStream printers).
- Updated to version 2.7.12:
Added PJL support to "hp" backend which provides in-band
printer status.
Bumped libhpmud from 0.0.0 to 0.0.1 for statustype support
in hpmud_query_model().
Several bug fixes (no Suse bugs).
Several more supported LaserJet printers, one ZJStream printer,
one LJm1005 printer with binary-only plugin (LaserJet M1005 MFP).
* Fri Nov 09 2007 jsmeix@suse.de
- Changed rchplip (i.e. /etc/init.d/hplip): - Changed rchplip (i.e. /etc/init.d/hplip):
Added "$local_fs $remote_fs $syslog" to Required-Start Added "$local_fs $remote_fs $syslog" to Required-Start
to be on the safe side and added a line "export HOME=/tmp" to be on the safe side and added a line "export HOME=/tmp"
to mitigate Novell/Suse Bugzilla bug #339443. to mitigate Novell/Suse Bugzilla bnc#339443.
* Tue Oct 23 2007 - jsmeix@suse.de * Tue Oct 23 2007 jsmeix@suse.de
- Updated to version 2.7.10: - Updated to version 2.7.10:
New LJZjsMono printer device class for ZJStream printers. New LJZjsMono printer device class for ZJStream printers.
ZJStream printers require JBIG which has issues ZJStream printers require JBIG which has issues
(see Novell/Suse Bugzilla bug #263181). Therefore the support (see Novell/Suse Bugzilla bnc#263181). Therefore the support
for ZJStream printers is provided only via a binary-only plugin for ZJStream printers is provided only via a binary-only plugin
which is downloaded by "hp-setup" from the HP web-site only after which is downloaded by "hp-setup" from the HP web-site only after
the user has accepted the license terms. the user has accepted the license terms.
@ -387,23 +441,23 @@ exit 0
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
Some more supported Photosmart and Officejet printers. Some more supported Photosmart and Officejet printers.
For details see release_notes.html For details see release_notes.html
* Tue Sep 18 2007 - jsmeix@suse.de * Tue Sep 18 2007 jsmeix@suse.de
- Add a line-feed to the end of all PPDs to fix those PPDs where - Add a line-feed to the end of all PPDs to fix those PPDs where
it is missing. See Novell/Suse Bugzilla bug #309832: it is missing. See Novell/Suse Bugzilla bnc#309832:
Unix/Linux text files must end with a line-feed. Unix/Linux text files must end with a line-feed.
Otherwise reading the last line results EOF and then some Otherwise reading the last line results EOF and then some
programs may ignore the last line. programs may ignore the last line.
* Wed Sep 12 2007 - jsmeix@suse.de * Wed Sep 12 2007 jsmeix@suse.de
- Ignore cupstestppd FAILs because of errors in UIConstraints - Ignore cupstestppd FAILs because of errors in UIConstraints
and/or NonUIConstraints which are detected since cupstestppd and/or NonUIConstraints which are detected since cupstestppd
in CUPS > 1.2.7 (i.e. since openSUSE 10.3). in CUPS > 1.2.7 (i.e. since openSUSE 10.3).
See Novell/Suse Bugzilla bug #309822: When this bug is fixed, See Novell/Suse Bugzilla bnc#309822: When this bug is fixed,
cupstestppd would no longer result zero exit code. cupstestppd would no longer result zero exit code.
In the long run the PPDs should be fixed but as far as we know In the long run the PPDs should be fixed but as far as we know
there have been no problems because of such UIConstraints errors there have been no problems because of such UIConstraints errors
so that it should be o.k. let those PPDs pass even if they are so that it should be o.k. let those PPDs pass even if they are
not strictly compliant. not strictly compliant.
* Tue Aug 07 2007 - jsmeix@suse.de * Tue Aug 07 2007 jsmeix@suse.de
- Changed /etc/udev/rules.d/55-hpmud.rules (via a change in - Changed /etc/udev/rules.d/55-hpmud.rules (via a change in
change-udev-rules.diff) from OWNER="root" GROUP="lp" MODE="0660" change-udev-rules.diff) from OWNER="root" GROUP="lp" MODE="0660"
to OWNER="root" GROUP="lp" MODE="0664" (i.e. allow read to OWNER="root" GROUP="lp" MODE="0664" (i.e. allow read
@ -416,22 +470,22 @@ exit 0
in upstream HPLIP and it should be sufficiently secure because in upstream HPLIP and it should be sufficiently secure because
for retrieving data from the device a matching request must be for retrieving data from the device a matching request must be
sent to the device which requires write permissions. sent to the device which requires write permissions.
* Thu Aug 02 2007 - jsmeix@suse.de * Thu Aug 02 2007 jsmeix@suse.de
- Updated to version 2.7.7: - Updated to version 2.7.7:
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
Some more supported Photosmart printers. Some more supported Photosmart printers.
For details see release_notes.html For details see release_notes.html
- fix-printing-white-spaces-and-empty-lines.diff is no longer - fix-printing-white-spaces-and-empty-lines.diff is no longer
needed because the bug is now fixed in the source. needed because the bug is now fixed in the source.
* Thu Jul 26 2007 - jsmeix@suse.de * Thu Jul 26 2007 jsmeix@suse.de
- Changed change-udev-rules.diff so that 55-hpmud.rules matches - Changed change-udev-rules.diff so that 55-hpmud.rules matches
also against the new SUBSYSTEM=="usb" but keep "usb_device" also against the new SUBSYSTEM=="usb" but keep "usb_device"
for backward compatibility (Novell/Suse Bugzilla bug #294161). for backward compatibility (Novell/Suse Bugzilla bnc#294161).
* Fri Jul 06 2007 - jsmeix@suse.de * Fri Jul 06 2007 jsmeix@suse.de
- fix-printing-white-spaces-and-empty-lines.diff fixes printing - fix-printing-white-spaces-and-empty-lines.diff fixes printing
white spaces and empty lines according to a mail from HP white spaces and empty lines according to a mail from HP
on the hplip-help@lists.sourceforge.net list. on the hplip-help@lists.sourceforge.net list.
* Tue Jul 03 2007 - jsmeix@suse.de * Tue Jul 03 2007 jsmeix@suse.de
- Updated to version 2.7.6: - Updated to version 2.7.6:
No more start-up daemons: No more start-up daemons:
hpiod is replaced by new direct device I/O (via hpmud library), hpiod is replaced by new direct device I/O (via hpmud library),
@ -444,26 +498,26 @@ exit 0
Some more supported Photosmart, Color LaserJet, and DeskJet Some more supported Photosmart, Color LaserJet, and DeskJet
printers. printers.
For details see release_notes.html For details see release_notes.html
* Thu Jun 21 2007 - jsmeix@suse.de * Thu Jun 21 2007 jsmeix@suse.de
- Added stop_on_removal to preun, insserv_cleanup to postun, - Added stop_on_removal to preun, insserv_cleanup to postun,
and ldconfig to post and postun for the hpijs sub-package. and ldconfig to post and postun for the hpijs sub-package.
* Thu May 24 2007 - ro@suse.de * Thu May 24 2007 ro@suse.de
- Added libusb-devel to BuildRequires. - Added libusb-devel to BuildRequires.
* Fri Apr 27 2007 - jsmeix@suse.de * Fri Apr 27 2007 jsmeix@suse.de
- Updated to version 1.7.4a: - Updated to version 1.7.4a:
Resolved a build issue that caused a couple missing files Resolved a build issue that caused a couple missing files
in the 1.7.4 release and a fix for hp-check (no Suse bugs). in the 1.7.4 release and a fix for hp-check (no Suse bugs).
* Mon Apr 23 2007 - jsmeix@suse.de * Mon Apr 23 2007 jsmeix@suse.de
- Updated to version 1.7.4: - Updated to version 1.7.4:
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
Some more supported DeskJet printers. Some more supported DeskJet printers.
For details see release_notes.html For details see release_notes.html
* Mon Mar 26 2007 - jsmeix@suse.de * Mon Mar 26 2007 jsmeix@suse.de
- Updated to version 1.7.3: - Updated to version 1.7.3:
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
No new supported models but enhancements for some models. No new supported models but enhancements for some models.
For details see release_notes.html For details see release_notes.html
* Thu Mar 01 2007 - jsmeix@suse.de * Thu Mar 01 2007 jsmeix@suse.de
- Updated to version 1.7.2: - Updated to version 1.7.2:
Several more supported Officejet Pro devices. Several more supported Officejet Pro devices.
New OJProKx50 device class (derived from DJGenericVIP). New OJProKx50 device class (derived from DJGenericVIP).
@ -471,20 +525,20 @@ exit 0
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer
needed because the bugs are now fixed in the sources. needed because the bugs are now fixed in the sources.
* Fri Feb 16 2007 - jsmeix@suse.de * Fri Feb 16 2007 jsmeix@suse.de
- Added a fix for fat.c to fix-buffer-overflow.patch - Added a fix for fat.c to fix-buffer-overflow.patch
to aviod access when array subscript is above array bounds to aviod access when array subscript is above array bounds
(Suse Bugzilla bug #243047). (Suse Bugzilla bnc#243047).
- Remove all byte-compiled Python .pyc (and perhaps .pyo) - Remove all byte-compiled Python .pyc (and perhaps .pyo)
files which are created at run-time in /usr/share/hplip/ files which are created at run-time in /usr/share/hplip/
via preun script (Suse Bugzilla bug #244451). via preun script (Suse Bugzilla bnc#244451).
* Mon Feb 05 2007 - jsmeix@suse.de * Mon Feb 05 2007 jsmeix@suse.de
- fix-buffer-overflow.patch fixes a too small string buffer - fix-buffer-overflow.patch fixes a too small string buffer
which overflows in line 310 in ljcolor.cpp. which overflows in line 310 in ljcolor.cpp.
- Moved the hpijs man page to the hplip-hpijs sub-package - Moved the hpijs man page to the hplip-hpijs sub-package
so that there is no same file in hplip and hpijs-standalone so that there is no same file in hplip and hpijs-standalone
(hplip-hpijs and hpijs-standalone conflict with each other). (hplip-hpijs and hpijs-standalone conflict with each other).
* Thu Feb 01 2007 - jsmeix@suse.de * Thu Feb 01 2007 jsmeix@suse.de
- hplip-1.7.1-1.patch from HP fixes Deskjet D4100/D4160 - hplip-1.7.1-1.patch from HP fixes Deskjet D4100/D4160
christmas-tree (firmware hangs up with flashing LEDs) christmas-tree (firmware hangs up with flashing LEDs)
on second print job. on second print job.
@ -494,13 +548,13 @@ exit 0
- Created new package hpijs-standalone and hpijs-standalone.spec - Created new package hpijs-standalone and hpijs-standalone.spec
for a special version of /usr/bin/hpijs which neither needs for a special version of /usr/bin/hpijs which neither needs
a HPLIP library nor a CUPS library to run it. a HPLIP library nor a CUPS library to run it.
* Wed Jan 31 2007 - jsmeix@suse.de * Wed Jan 31 2007 jsmeix@suse.de
- Removed explicite fstack-protector-all from CFLAGS and CXXFLAGS - Removed explicite fstack-protector-all from CFLAGS and CXXFLAGS
because fstack-protector will be enabled by default. because fstack-protector will be enabled by default.
* Mon Jan 29 2007 - jsmeix@suse.de * Mon Jan 29 2007 jsmeix@suse.de
- Package 'sane' was renamed to 'sane-backends'. - Package 'sane' was renamed to 'sane-backends'.
Adapted it so that it works with 'sane-backends'. Adapted it so that it works with 'sane-backends'.
* Thu Jan 25 2007 - jsmeix@suse.de * Thu Jan 25 2007 jsmeix@suse.de
- Updated to version 1.7.1: - Updated to version 1.7.1:
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
No new supported models but enhancements for several models. No new supported models but enhancements for several models.
@ -508,16 +562,16 @@ exit 0
- Removed the fix for uninitialized file pointer in api/model.c - Removed the fix for uninitialized file pointer in api/model.c
from fix-uninitialized-variables.diff because it is now from fix-uninitialized-variables.diff because it is now
fixed in the sources. fixed in the sources.
* Fri Jan 19 2007 - jsmeix@suse.de * Fri Jan 19 2007 jsmeix@suse.de
- Added fix for uninitialized file pointer in api/model.c to - Added fix for uninitialized file pointer in api/model.c to
fix-uninitialized-variables.diff (Suse Bugzilla bug #236709). fix-uninitialized-variables.diff (Suse Bugzilla bnc#236709).
* Fri Jan 12 2007 - jsmeix@suse.de * Fri Jan 12 2007 jsmeix@suse.de
- Since version 1.6.12 /usr/bin/hpijs is linked with libcups - Since version 1.6.12 /usr/bin/hpijs is linked with libcups
so that the package hplip-hpijs could be no longer installed so that the package hplip-hpijs could be no longer installed
without at least the package cups-libs. Therefore an additional without at least the package cups-libs. Therefore an additional
special /usr/bin/hpijs.without-libcups is built which does not special /usr/bin/hpijs.without-libcups is built which does not
require the CUPS library. require the CUPS library.
* Wed Dec 20 2006 - jsmeix@suse.de * Wed Dec 20 2006 jsmeix@suse.de
- Updated to version 1.6.12: - Updated to version 1.6.12:
Three more supported LaserJet printers. Three more supported LaserJet printers.
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
@ -526,45 +580,45 @@ exit 0
The new models.dat file replaces the .xml files. The hplip_api The new models.dat file replaces the .xml files. The hplip_api
can be used to get model attributes without running the HPLIP can be used to get model attributes without running the HPLIP
daemons. See hplip_api.h for reference (this affects the Suse daemons. See hplip_api.h for reference (this affects the Suse
Bugzilla bugs #184798 and #184824). Bugzilla bugs bnc#184798 and bnc#184824).
- Fixed hp-toolbox.wrapper to catch 'error' regardless of the case - Fixed hp-toolbox.wrapper to catch 'error' regardless of the case
(see Suse Bugzilla bug #229620). (see Suse Bugzilla bnc#229620).
* Tue Oct 17 2006 - jsmeix@suse.de * Tue Oct 17 2006 jsmeix@suse.de
- Updated to version 1.6.10: - Updated to version 1.6.10:
Several more supported LaserJet printers. Several more supported LaserJet printers.
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
- Fixed typo in keyword in some LaserJet PPDs - Fixed typo in keyword in some LaserJet PPDs
("* PageRegion" -> "*PageRegion"). ("* PageRegion" -> "*PageRegion").
* Mon Sep 18 2006 - jsmeix@suse.de * Mon Sep 18 2006 jsmeix@suse.de
- Updated to version 1.6.9: - Updated to version 1.6.9:
Added support CD/DVD label printing (ie: PS D5100). Added support CD/DVD label printing (ie: PS D5100).
Several more supported Photosmart printers. Several more supported Photosmart printers.
Many bug fixes (no Suse bugs). Many bug fixes (no Suse bugs).
* Mon Sep 11 2006 - jsmeix@suse.de * Mon Sep 11 2006 jsmeix@suse.de
- Using generalised cupsext* and pcardext* in the files section - Using generalised cupsext* and pcardext* in the files section
(instead of explicit only cupsext.so and pcardext.so) (instead of explicit only cupsext.so and pcardext.so)
so that it works now both for Python 2.4 and 2.5 so that it works now both for Python 2.4 and 2.5
(the latter installs additional *.egg-info files). (the latter installs additional *.egg-info files).
* Mon Sep 04 2006 - jsmeix@suse.de * Mon Sep 04 2006 jsmeix@suse.de
- Exchanged the hard RPM requirement for ghostscript_any by a - Exchanged the hard RPM requirement for ghostscript_any by a
supplements entry for hplip-hpijs so that there is no longer supplements entry for hplip-hpijs so that there is no longer
a mutual (cyclic) hard RPM dependency between hplip-hpijs a mutual (cyclic) hard RPM dependency between hplip-hpijs
and ghostscript-library. and ghostscript-library.
* Thu Aug 03 2006 - jsmeix@suse.de * Thu Aug 03 2006 jsmeix@suse.de
- Updated to version 1.6.7: - Updated to version 1.6.7:
Changed from dynamic IP ports to static IANA IP ports Changed from dynamic IP ports to static IANA IP ports
for hpiod (2208) and hpssd (2207). for hpiod (2208) and hpssd (2207).
Two more supported Photosmart printers. Two more supported Photosmart printers.
Several bug fixes (no Suse bugs). Several bug fixes (no Suse bugs).
* Mon Jul 17 2006 - jsmeix@suse.de * Mon Jul 17 2006 jsmeix@suse.de
- Fixed PPDs which contain "1284DeviceId" which must be - Fixed PPDs which contain "1284DeviceId" which must be
"1284DeviceID" (detected by new CUPS 1.2 cupstestppd). "1284DeviceID" (detected by new CUPS 1.2 cupstestppd).
* Wed Jun 28 2006 - jsmeix@suse.de * Wed Jun 28 2006 jsmeix@suse.de
- Updated to maintenance release 1.6.6a: - Updated to maintenance release 1.6.6a:
This provides various minor fixes and enhancements. This provides various minor fixes and enhancements.
For details see doc/release_notes.html in the source For details see doc/release_notes.html in the source
or /usr/share/doc/packages/hplip/release_notes.html or /usr/share/doc/packages/hplip/release_notes.html
* Mon Jun 19 2006 - jsmeix@suse.de * Mon Jun 19 2006 jsmeix@suse.de
- Updated to version 1.6.6: - Updated to version 1.6.6:
HPLIP has reached 1.0 status. HPLIP has reached 1.0 status.
With this release a date encoded revision number x.y.m is used: With this release a date encoded revision number x.y.m is used:
@ -582,15 +636,15 @@ exit 0
Links to work around inconsistent naming of python scripts Links to work around inconsistent naming of python scripts
and links to hpfax backend and its associated PPD file and links to hpfax backend and its associated PPD file
are no longer needed. are no longer needed.
* Fri Jun 09 2006 - jsmeix@suse.de * Fri Jun 09 2006 jsmeix@suse.de
- Added man page for /usr/bin/hpijs (hpijs.1.gz). - Added man page for /usr/bin/hpijs (hpijs.1.gz).
- Fixed wrong URLs in HTML documentation (fix-doc-hrefs.diff). - Fixed wrong URLs in HTML documentation (fix-doc-hrefs.diff).
- Added links to work around inconsistent naming of python scripts. - Added links to work around inconsistent naming of python scripts.
- Added links to hpfax backend and its associated PPD file - Added links to hpfax backend and its associated PPD file
to make them available as usual for CUPS setup tools. to make them available as usual for CUPS setup tools.
* Mon May 22 2006 - jsmeix@suse.de * Mon May 22 2006 jsmeix@suse.de
- Fixed typo (missing '"') in hplip-init-script.diff - Fixed typo (missing '"') in hplip-init-script.diff
* Fri May 19 2006 - jsmeix@suse.de * Fri May 19 2006 jsmeix@suse.de
- Updated to version 0.9.11: - Updated to version 0.9.11:
Revised and updated documentation. Revised and updated documentation.
Some more supported all-in-one devices and printers. Some more supported all-in-one devices and printers.
@ -610,96 +664,96 @@ exit 0
and a new send fax UI (hp-sendfax). and a new send fax UI (hp-sendfax).
Some more supported printers. Some more supported printers.
Several bug fixes (no Suse bugs). Several bug fixes (no Suse bugs).
* Wed Apr 26 2006 - jsmeix@suse.de * Wed Apr 26 2006 jsmeix@suse.de
- Fixed PPDs for "LaserJet 5Si" and "LaserJet 5MP" - Fixed PPDs for "LaserJet 5Si" and "LaserJet 5MP"
(see Suse bugzilla bug #164991). (see Suse Bugzilla bnc#164991).
* Fri Feb 24 2006 - jsmeix@suse.de * Fri Feb 24 2006 jsmeix@suse.de
- Fixed an array index underflow (for LJ1010, LJ1012) - Fixed an array index underflow (for LJ1010, LJ1012)
in ljfastraster.cpp (Suse Bugzilla #152720). in ljfastraster.cpp (Suse Bugzilla bnc#152720).
* Wed Jan 25 2006 - mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Thu Jan 12 2006 - jsmeix@suse.de * Thu Jan 12 2006 jsmeix@suse.de
- Set compiler flag "-fstack-protector-all" to build it with - Set compiler flag "-fstack-protector-all" to build it with
"Stack Protector" via a so called "canary" (requires gcc >= 4.1) "Stack Protector" via a so called "canary" (requires gcc >= 4.1)
* Wed Jan 04 2006 - jsmeix@suse.de * Wed Jan 04 2006 jsmeix@suse.de
- Moved /usr/lib[64]/libhpip.* library files to the hplip-hpijs - Moved /usr/lib[64]/libhpip.* library files to the hplip-hpijs
sub-package because /usr/bin/hpijs requires libhpip but for sub-package because /usr/bin/hpijs requires libhpip but for
special cases (e.g. for a minimal printing system) it should special cases (e.g. for a minimal printing system) it should
be possible to use only HPIJS without the rest of HPLIP. be possible to use only HPIJS without the rest of HPLIP.
* Tue Jan 03 2006 - jsmeix@suse.de * Tue Jan 03 2006 jsmeix@suse.de
- Updated to version 0.9.7 - Updated to version 0.9.7
including the additional hplip-0.9.7-2.patch from HP. including the additional hplip-0.9.7-2.patch from HP.
* Thu Dec 22 2005 - ro@suse.de * Thu Dec 22 2005 ro@suse.de
- requires: PyQt -> python-qt - requires: PyQt -> python-qt
* Thu Dec 01 2005 - jsmeix@suse.de * Thu Dec 01 2005 jsmeix@suse.de
- Removed unneeded KDE packages from "neededforbuild" since - Removed unneeded KDE packages from "neededforbuild" since
the new package python-qt was split from kdebindings3-python the new package python-qt was split from kdebindings3-python
(see Suse bugzilla bug #135250). (see Suse Bugzilla bnc#135250).
* Mon Nov 28 2005 - jsmeix@suse.de * Mon Nov 28 2005 jsmeix@suse.de
- Replaced requirement for the package kdebindings3-python - Replaced requirement for the package kdebindings3-python
by a generic requirement for the RPM capability PyQt by a generic requirement for the RPM capability PyQt
to avoid needless dependencies to KDE libraries to avoid needless dependencies to KDE libraries
(see Suse bugzilla bug #135250). (see Suse Bugzilla bnc#135250).
* Tue Nov 22 2005 - jsmeix@suse.de * Tue Nov 22 2005 jsmeix@suse.de
- Added -fno-strict-aliasing to the CXXFLAGS to avoid problems - Added -fno-strict-aliasing to the CXXFLAGS to avoid problems
in ljfastraster.cpp (line 1213) and hpijs.cpp (lines 86, 223). in ljfastraster.cpp (line 1213) and hpijs.cpp (lines 86, 223).
* Fri Nov 18 2005 - jsmeix@suse.de * Fri Nov 18 2005 jsmeix@suse.de
- Updated to version 0.9.6 - Updated to version 0.9.6
* Wed Sep 21 2005 - jsmeix@suse.de * Wed Sep 21 2005 jsmeix@suse.de
- Updated to version 0.9.5 - Updated to version 0.9.5
including the additional hplip-0.9.5-3.patch from HP. including the additional hplip-0.9.5-3.patch from HP.
* Mon Sep 12 2005 - jsmeix@suse.de * Mon Sep 12 2005 jsmeix@suse.de
- Several PPDs contain "600x600x2dpi" which is not allowed - Several PPDs contain "600x600x2dpi" which is not allowed
according to the Adobe PPD specification section 5.9 according to the Adobe PPD specification section 5.9
and which is therefore simply replaced by "600x1200dpi" and which is therefore simply replaced by "600x1200dpi"
(see Suse bugzilla bug #116393). (see Suse Bugzilla bnc#116393).
* Mon Aug 29 2005 - jsmeix@suse.de * Mon Aug 29 2005 jsmeix@suse.de
- Removed a non-working PPD. - Removed a non-working PPD.
- Fix "... is used uninitialized ..." warning. - Fix "... is used uninitialized ..." warning.
* Tue Jul 26 2005 - jsmeix@suse.de * Tue Jul 26 2005 jsmeix@suse.de
- Updated to version 0.9.4 - Updated to version 0.9.4
- Removed obsolete fixes for missing class prototypes. - Removed obsolete fixes for missing class prototypes.
- Removed obsolete fixes for HP_Business_Inkjet_3000.ppd - Removed obsolete fixes for HP_Business_Inkjet_3000.ppd
- Added a fix for condrestart in /etc/init.d/hplip - Added a fix for condrestart in /etc/init.d/hplip
* Tue May 31 2005 - jsmeix@suse.de * Tue May 31 2005 jsmeix@suse.de
- Updated to version 0.9.3 - Updated to version 0.9.3
* Tue May 24 2005 - jsmeix@suse.de * Tue May 24 2005 jsmeix@suse.de
- Fixed missing class prototypes, otherwise it fails with - Fixed missing class prototypes, otherwise it fails with
"error: ISO C++ forbids declaration of 'xxx' with no type". "error: ISO C++ forbids declaration of 'xxx' with no type".
* Tue May 17 2005 - jsmeix@suse.de * Tue May 17 2005 jsmeix@suse.de
- Fix "... is used uninitialized ..." warnings. - Fix "... is used uninitialized ..." warnings.
* Wed May 04 2005 - jsmeix@suse.de * Wed May 04 2005 jsmeix@suse.de
- Updated to version 0.9.2 which does no longer need - Updated to version 0.9.2 which does no longer need
the "fix C" (i.e. hplip-0.8.8.diff) from below. the "fix C" (i.e. hplip-0.8.8.diff) from below.
* Sun Apr 10 2005 - coolo@suse.de * Sun Apr 10 2005 coolo@suse.de
- fix C - fix C
* Tue Mar 22 2005 - jsmeix@suse.de * Tue Mar 22 2005 jsmeix@suse.de
- Added PreReq. - Added PreReq.
* Thu Mar 17 2005 - jsmeix@suse.de * Thu Mar 17 2005 jsmeix@suse.de
- Fixed a bug in HP-DeskJet_3740-hpijs.ppd.gz: - Fixed a bug in HP-DeskJet_3740-hpijs.ppd.gz:
According to hpijs_readme.html the DeskJet 3740 belongs to the According to hpijs_readme.html the DeskJet 3740 belongs to the
DJ3320 device class. DJ3320 device class.
* Tue Mar 08 2005 - jsmeix@suse.de * Tue Mar 08 2005 jsmeix@suse.de
- Added %%suse_update_desktop_file stuff for hp-toolbox. - Added %%suse_update_desktop_file stuff for hp-toolbox.
- Moved %%{_libdir}/libsane-hpaio.* to %%{_libdir}/sane/ - Moved %%{_libdir}/libsane-hpaio.* to %%{_libdir}/sane/
instead of creating symlinks (see Tue Mar 1 11:15:33). instead of creating symlinks (see Tue Mar 1 11:15:33).
* Tue Mar 01 2005 - jsmeix@suse.de * Tue Mar 01 2005 jsmeix@suse.de
- Added python-xml to RPM requirements because otherwise - Added python-xml to RPM requirements because otherwise
hpssd (i.e. /usr/share/hplip/hpssd.py) doesn't work. hpssd (i.e. /usr/share/hplip/hpssd.py) doesn't work.
- Create symlinks (via '%%triggerin -- sane') to all - Create symlinks (via '%%triggerin -- sane') to all
%%{_libdir}/libsane-hpaio.* so that SANE will find them. %%{_libdir}/libsane-hpaio.* so that SANE will find them.
- Added kdebindings3-python to RPM requirements because otherwise - Added kdebindings3-python to RPM requirements because otherwise
hp-toolbox (i.e. /usr/share/hplip/toolbox) doesn't work. hp-toolbox (i.e. /usr/share/hplip/toolbox) doesn't work.
* Tue Feb 22 2005 - jsmeix@suse.de * Tue Feb 22 2005 jsmeix@suse.de
- Changed default media size from Letter to A4 - Changed default media size from Letter to A4
if this is an available choice in the PPD. if this is an available choice in the PPD.
* Tue Feb 15 2005 - jsmeix@suse.de * Tue Feb 15 2005 jsmeix@suse.de
- Updated to version 0.8.8, for details see ChangeLog and - Updated to version 0.8.8, for details see ChangeLog and
http://hpinkjet.sourceforge.net/updates.php http://hpinkjet.sourceforge.net/updates.php
- Removed the "compatibility"-links because they are not needed. - Removed the "compatibility"-links because they are not needed.
- Fixed basic stuff in the init script (needs further improvement). - Fixed basic stuff in the init script (needs further improvement).
- Source should be x86_64 clean (SUSE patch no longer needed). - Source should be x86_64 clean (SUSE patch no longer needed).
* Tue Feb 01 2005 - jsmeix@suse.de * Tue Feb 01 2005 jsmeix@suse.de
- Updated to version 0.8.7, for details see ChangeLog and - Updated to version 0.8.7, for details see ChangeLog and
http://hpinkjet.sourceforge.net/updates.php http://hpinkjet.sourceforge.net/updates.php
- Added triggerin and postun scripts to add and remove - Added triggerin and postun scripts to add and remove
@ -707,7 +761,7 @@ exit 0
- Replaced hplip-0.8.4-models.xml.diff by - Replaced hplip-0.8.4-models.xml.diff by
hplip-0.8.7-models.xml.diff because the "HP LaserJet 1220" hplip-0.8.7-models.xml.diff because the "HP LaserJet 1220"
is now in the models.xml file but the entry is buggy. is now in the models.xml file but the entry is buggy.
* Tue Jan 25 2005 - jsmeix@suse.de * Tue Jan 25 2005 jsmeix@suse.de
- Branched the sub-package hplip-hpijs which contains only - Branched the sub-package hplip-hpijs which contains only
the plain HPIJS binary so that Ghostscript can require the plain HPIJS binary so that Ghostscript can require
only this sub-package (without all the other stuff). only this sub-package (without all the other stuff).
@ -721,11 +775,11 @@ exit 0
HPLIP will be also used for plain printers.) HPLIP will be also used for plain printers.)
- Exchanged the destructive line for the cupsd in the runlevel script - Exchanged the destructive line for the cupsd in the runlevel script
because cupsd runs as user lp and dies in case of a SIGHUP. because cupsd runs as user lp and dies in case of a SIGHUP.
* Tue Jan 18 2005 - jsmeix@suse.de * Tue Jan 18 2005 jsmeix@suse.de
- patch hplip-0.8.4-models.xml.diff adds the "HP LaserJet 1220" - patch hplip-0.8.4-models.xml.diff adds the "HP LaserJet 1220"
to the list of known models of the SANE backend "hpaio" to the list of known models of the SANE backend "hpaio"
* Wed Jan 12 2005 - sf@suse.de * Wed Jan 12 2005 sf@suse.de
- add --libdir=%%_libdir to build on multilib archs - add --libdir=%%_libdir to build on multilib archs
- add patch for cups search path for backends - add patch for cups search path for backends
* Thu Dec 02 2004 - jsmeix@suse.de * Thu Dec 02 2004 jsmeix@suse.de
- initial version - initial version

23
rchplip
View File

@ -22,8 +22,9 @@
# Should-Start: # Should-Start:
# Should-Stop: # Should-Stop:
# Default-Start: 3 5 # Default-Start: 3 5
# Default-Stop: # Default-Stop:
# Description: Start/stop script for HP Linux Imaging and Printing (HPLIP) # Short-Description: Start/stop hpssd
# Description: Start/stop script for hpssd from HP Linux Imaging and Printing (HPLIP)
### END INIT INFO ### END INIT INFO
HPSSDDIR=/usr/share/hplip HPSSDDIR=/usr/share/hplip
@ -98,8 +99,8 @@ start() {
daemon ./hpssd.py daemon ./hpssd.py
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL = 0 ] && [ -d /var/lock/subsys ] && touch /var/lock/subsys/hpssd.py [ $RETVAL = 0 ] && [ -d /var/lock/subsys ] && touch /var/lock/subsys/hplip
if [ -f /var/lock/subsys/hpssd.py ]; then if [ -f /var/lock/subsys/hplip ]; then
touch /var/lock/subsys/hplip touch /var/lock/subsys/hplip
fi fi
return $RETVAL return $RETVAL
@ -110,7 +111,7 @@ stop() {
killproc hpssd killproc hpssd
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/hpssd.py [ $RETVAL = 0 ] && rm -f /var/lock/subsys/hplip
for pidfile in $RUNDIR/*; do for pidfile in $RUNDIR/*; do
case "$( basename $pidfile )" in case "$( basename $pidfile )" in
hpguid-*.pid) hpguid-*.pid)
@ -119,7 +120,7 @@ stop() {
rm $pidfile rm $pidfile
esac esac
done done
if [ ! -f /var/lock/subsys/hpssd.py ]; then if [ ! -f /var/lock/subsys/hplip ]; then
rm -f /var/lock/subsys/hplip rm -f /var/lock/subsys/hplip
fi fi
return $RETVAL return $RETVAL
@ -144,8 +145,8 @@ debug() {
echo -ne " [FAILED]\r" echo -ne " [FAILED]\r"
fi fi
echo echo
[ $RETVAL = 0 ] && [ -d /var/lock/subsys ] && touch /var/lock/subsys/hpssd.py [ $RETVAL = 0 ] && [ -d /var/lock/subsys ] && touch /var/lock/subsys/hplip
if [ -f /var/lock/subsys/hpssd.py ]; then if [ -f /var/lock/subsys/hplip ]; then
touch /var/lock/subsys/hplip touch /var/lock/subsys/hplip
return 0 return 0
else else
@ -170,14 +171,14 @@ case "$1" in
## Restart the service only if it was running before: ## Restart the service only if it was running before:
mystatus hpssd &>/dev/null && restart || : mystatus hpssd &>/dev/null && restart || :
;; ;;
condrestart) force-reload)
[ -f /var/lock/subsys/hpssd.py ] && restart || : restart
;; ;;
debug) debug)
debug debug
;; ;;
*) *)
echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart}" echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
exit 1 exit 1
esac esac