[arch-commits] CVS update of extra/office/hplip (4 files)
Tobias Powalowski
tpowa at archlinux.org
Sat Oct 6 12:52:14 UTC 2007
Date: Saturday, October 6, 2007 @ 08:52:14
Author: tpowa
Path: /home/cvs-extra/extra/office/hplip
Modified: PKGBUILD (1.32 -> 1.33) hplip.install (1.5 -> 1.6)
Removed: hplip (1.5) hplip-1.7.1-1.patch (1.2)
'upgpkg: update to new version'
---------------------+
PKGBUILD | 23 ++------
hplip | 135 --------------------------------------------------
hplip-1.7.1-1.patch | 24 --------
hplip.install | 12 +++-
4 files changed, 18 insertions(+), 176 deletions(-)
Index: extra/office/hplip/PKGBUILD
diff -u extra/office/hplip/PKGBUILD:1.32 extra/office/hplip/PKGBUILD:1.33
--- extra/office/hplip/PKGBUILD:1.32 Thu May 31 10:18:39 2007
+++ extra/office/hplip/PKGBUILD Sat Oct 6 08:52:13 2007
@@ -1,37 +1,30 @@
-# $Id: PKGBUILD,v 1.32 2007/05/31 14:18:39 tpowa Exp $
+# $Id: PKGBUILD,v 1.33 2007/10/06 12:52:13 tpowa Exp $
# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
pkgname=hplip
-pkgver=1.7.4a
-pkgrel=3
+pkgver=2.7.9
+pkgrel=1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet."
arch=(i686 x86_64)
url="http://hplip.sourceforge.net/"
license="GPL"
makedepends=('pyqt')
-depends=('cups' 'python' 'net-snmp>=5.4' 'ghostscript' 'foomatic-db-engine' 'libjpeg' 'portmap' 'libusb' 'gcc' 'libcups')
+depends=('cups' 'python' 'net-snmp>=5.4' 'ghostscript' 'foomatic-db-engine' 'libjpeg' 'portmap' 'libusb' 'libcups' 'sane')
replaces=('hpijs')
install=hplip.install
-source=(http://heanet.dl.sourceforge.net/sourceforge/hplip/$pkgname-$pkgver.tar.gz hplip)
+source=(http://heanet.dl.sourceforge.net/sourceforge/hplip/$pkgname-$pkgver.tar.gz)
force=y
build() {
cd $startdir/src/$pkgname-$pkgver
./configure --prefix=/usr
+
make || return 1
- mkdir -p $startdir/pkg/usr/bin
+ #mkdir -p $startdir/pkg/usr/bin
#rm -f prnt/hpijs/ppd/HP-Fax-hplip.ppd
make DESTDIR=$startdir/pkg install
- rm -fr $startdir/pkg/etc/init.d
rm -rf $startdir/pkg/etc/sane.d
- # remove foomatic stuff
- rm -r $startdir/pkg/usr/lib/cups/filter
- rm $startdir/pkg/usr/bin/foomatic-rip
- mkdir $startdir/pkg/etc/rc.d
- install -Dm755 $startdir/src/hplip $startdir/pkg/etc/rc.d/hplip
- find $startdir/pkg -name '*.la' -exec rm {} \;
}
-md5sums=('210e948d1f1f376426a2cca0ed9d1e6c'
- '9591d0fb6e9266c880a42e4d805cb00b')
+md5sums=('a05aeb5679c3ce429bea7f3335609aee')
Index: extra/office/hplip/hplip
diff -u extra/office/hplip/hplip:1.5 extra/office/hplip/hplip:removed
--- extra/office/hplip/hplip:1.5 Mon Feb 6 06:01:06 2006
+++ extra/office/hplip/hplip Sat Oct 6 08:52:14 2007
@@ -1,135 +0,0 @@
-#!/bin/bash
-# Startup/shutdown script for HPLIP
-#
-# Note, this script file must start before cupsd.
-#
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-HPIODDIR=/usr/sbin
-HPSSDDIR=/usr/share/hplip/
-RUNDIR=/var/run
-
-daemon() {
- $* >/dev/null 2>&1
- if [ $? -eq 0 ]; then
- stat_done
- else
- stat_fail
- fi
-}
-
-killproc() {
- pid=`pidof -s $1`
- pidfile=$RUNDIR/${1}.pid
- if [ -z $pid ]; then
- if [ -f $pidfile ]; then
- read pid < $pidfile
- kill $pid
- fi
- else
- kill $pid
- fi
- retval=$?
- if [ -f $pidfile ]; then
- rm $pidfile
- fi
- if [ $retval -eq 0 ]; then
- stat_done
- else
- stat_fail
- fi
-}
-
-mystatus() {
- pid=`pidof -s $1`
- if [ -z $pid ]; then
- pidfile=$RUNDIR/${1}.pid
- if [ -f $pidfile ]; then
- read pid < $pidfile
- fi
- fi
-
- if [ -n "$pid" ]; then
- echo $"$1 (pid $pid) is running..."
- return 0
- fi
-
- echo $"$1 is stopped"
- return 3
-}
-
-RETVAL=0
-
-start() {
- stat_busy $"Starting hplip: hpiod ..."
- cd $HPIODDIR
- daemon ./hpiod
- RETVAL=$?
- [ $RETVAL = 0 ] && [ -d /var/lock/ ] && touch /var/lock/hpiod
- stat_busy "Starting hplip: hpssd ... "
- cd $HPSSDDIR
- daemon ./hpssd.py
- RETVAL=$?
- [ $RETVAL = 0 ] && [ -d /var/lock/ ] && touch /var/lock/hpssd.py
- killall -HUP cupsd > /dev/null 2>&1
- if [ -f /var/lock/hpiod -a -f /var/lock/hpssd.py ]; then
- touch /var/lock/hplip
- return 0
- else
- return 1
- fi
-}
-
-stop() {
- stat_busy "Stopping hplip: hpiod ... "
- killproc hpiod
- RETVAL=$?
- [ $RETVAL = 0 ] && rm -f /var/lock/hpiod
- stat_busy "Stopping hplip: hpssd... "
- killproc hpssd
- RETVAL=$?
- [ $RETVAL = 0 ] && rm -f /var/lock/hpssd.py
- for pidfile in $RUNDIR/*; do
- case "$( basename $pidfile )" in
- hpguid-*.pid)
- read pid < $pidfile
- kill $pid
- rm $pidfile
- esac
- done
- if [ ! -f /var/lock/hpiod -o ! -f /var/lock/hpssd.py ]; then
- rm -f /var/lock/hplip
- fi
- return $RETVAL
-}
-
-restart() {
- stop
- start
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- restart
- ;;
- status)
- mystatus hpiod
- mystatus hpssd
- ;;
- condrestart)
- [ -f /var/lock/hpiod ] && [ -f /var/lock/hpssd.py ] && restart || :
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|condrestart}"
- exit 1
-esac
-
-exit $?
-
Index: extra/office/hplip/hplip-1.7.1-1.patch
diff -u extra/office/hplip/hplip-1.7.1-1.patch:1.2 extra/office/hplip/hplip-1.7.1-1.patch:removed
--- extra/office/hplip/hplip-1.7.1-1.patch:1.2 Sun Feb 25 08:40:11 2007
+++ extra/office/hplip/hplip-1.7.1-1.patch Sat Oct 6 08:52:14 2007
@@ -1,24 +0,0 @@
-diff -uNr hplip-1.7.1_old/prnt/hpijs/dj3320.cpp hplip-1.7.1_new/prnt/hpijs/dj3320.cpp
---- hplip-1.7.1_old/prnt/hpijs/dj3320.cpp 2007-01-24 15:42:03.000000000 -0800
-+++ hplip-1.7.1_new/prnt/hpijs/dj3320.cpp 2007-01-31 13:33:42.000000000 -0800
-@@ -3066,7 +3066,7 @@
- }
-
- // Send Sync packet
-- err = pPrinterXBow->Send (pbySync, (DWORD) sizeof (pbySync));
-+ err = pPrinterXBow->Send (pbySync, SYNCSIZE);
- if(err)
- {
- return err;
---- hplip-1.7.1/levels.py~ 2007-01-23 19:08:48.000000000 +0100
-+++ hplip-1.7.1/levels.py 2007-02-25 12:08:49.000000000 +0100
-@@ -201,8 +201,7 @@
- log.error("Error occured during interactive mode. Exiting.")
- sys.exit(1)
-
--
--user_cfg.last_used.device_uri = d.device_uri
-+
-
- try:
- d = device.Device(device_uri, printer_name)
Index: extra/office/hplip/hplip.install
diff -u extra/office/hplip/hplip.install:1.5 extra/office/hplip/hplip.install:1.6
--- extra/office/hplip/hplip.install:1.5 Thu Mar 30 10:07:40 2006
+++ extra/office/hplip/hplip.install Sat Oct 6 08:52:14 2007
@@ -3,7 +3,6 @@
NOTE
----
-# Don't forget to add hplip to /etc/rc.conf daemon list and place it before cups is started!.
# You can open the HP Device Manager by entering this command in the console window:
# $ hp-toolbox
# You will need to install 'pyqt' for running hp-toolbox.
@@ -12,13 +11,22 @@
# If you want to use this driver with sane:
# echo "hpaio" >> /etc/sane.d/dll.conf
-# Usb printers need to change to new layout, pleae reconfigure these devices.
EOF
/bin/true
}
post_upgrade() {
post_install $1
+
+ cat << EOF
+
+UPGRADING
+----
+# This version no longer uses an init script. You should remove hplip
+# from the /etc/rc.conf daemon list.
+
+EOF
+ /bin/true
}
op=$1
More information about the arch-commits
mailing list