[arch-commits] Commit in hplip/repos (5 files)
Tobias Powalowski
tpowa at archlinux.org
Wed Feb 11 14:51:19 UTC 2009
Date: Wednesday, February 11, 2009 @ 09:51:18
Author: tpowa
Revision: 26706
Merged revisions 26704 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/hplip/trunk
........
r26704 | tpowa | 2009-02-11 14:34:29 +0000 (Mi, 11 Feb 2009) | 1 line
upgpkg: hplip 2.8.12-1
........
Modified:
hplip/repos/extra-i686/ (properties)
hplip/repos/extra-i686/PKGBUILD
hplip/repos/extra-i686/hplip.install
Deleted:
hplip/repos/extra-i686/hplip
hplip/repos/extra-i686/hplip-1.7.1-1.patch
---------------------+
PKGBUILD | 14 ++---
hplip | 135 --------------------------------------------------
hplip-1.7.1-1.patch | 24 --------
hplip.install | 5 -
4 files changed, 8 insertions(+), 170 deletions(-)
Property changes on: hplip/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /hplip/trunk:1-20624
+ /hplip/trunk:1-26705
Deleted: svn:mergeinfo
-
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-02-11 14:35:02 UTC (rev 26705)
+++ extra-i686/PKGBUILD 2009-02-11 14:51:18 UTC (rev 26706)
@@ -3,20 +3,21 @@
# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
pkgname=hplip
-pkgver=2.8.10
-pkgrel=2
+pkgver=2.8.12
+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=('pyqt3' 'pkgconfig')
-depends=('cups' 'python' 'net-snmp>=5.4' 'ghostscript' 'foomatic-db' 'foomatic-db-hpijs' 'foomatic-db-engine' 'portmap' 'libcups' 'sane')
+makedepends=('pyqt3' 'pkgconfig' 'sane' 'net-snmp>=5.4' 'portmap')
+depends=('cups' 'python' 'ghostscript' 'foomatic-db' 'foomatic-db-hpijs' 'foomatic-db-engine' 'libcups')
replaces=('hpijs')
options=('!libtool')
install=hplip.install
source=(http://downloads.sourceforge.net/sourceforge/hplip/$pkgname-$pkgver.tar.gz)
-md5sums=('a9ad78c4f0d884caac6b176b3cb9bf21')
-
+optdepends=('sane: for scanner support'
+ 'net-snmp and portmap: for network support'
+ 'pyqt3: for running hp-toolbox')
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr --enable-foomatic-rip-hplip-install --enable-foomatic-ppd-install
@@ -28,3 +29,4 @@
rm -r $pkgdir/etc/xdg
}
+md5sums=('f6d04d4ed5c41e3e1c84e6a7af6b8db7')
Deleted: extra-i686/hplip
===================================================================
--- extra-i686/hplip 2009-02-11 14:35:02 UTC (rev 26705)
+++ extra-i686/hplip 2009-02-11 14:51:18 UTC (rev 26706)
@@ -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 $?
-
Deleted: extra-i686/hplip-1.7.1-1.patch
===================================================================
--- extra-i686/hplip-1.7.1-1.patch 2009-02-11 14:35:02 UTC (rev 26705)
+++ extra-i686/hplip-1.7.1-1.patch 2009-02-11 14:51:18 UTC (rev 26706)
@@ -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)
Modified: extra-i686/hplip.install
===================================================================
--- extra-i686/hplip.install 2009-02-11 14:35:02 UTC (rev 26705)
+++ extra-i686/hplip.install 2009-02-11 14:51:18 UTC (rev 26706)
@@ -3,11 +3,6 @@
NOTE
----
-# You can open the HP Device Manager by entering this command in the console window:
-# $ hp-toolbox
-# You will need to install 'pyqt3' for running hp-toolbox.
-# 'pacman -S pyqt3' should do this for you.
-
# If you want to use this driver with sane:
# echo "hpaio" >> /etc/sane.d/dll.conf
More information about the arch-commits
mailing list