[arch-commits] Commit in hplip/trunk (PKGBUILD)

Eric Bélanger eric at archlinux.org
Mon Dec 5 03:44:51 UTC 2011


    Date: Sunday, December 4, 2011 @ 22:44:51
  Author: eric
Revision: 144357

upgpkg: hplip 3.11.10-2

Add missing ppd (close FS#27443), Add python2 fix

Modified:
  hplip/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-05 01:48:51 UTC (rev 144356)
+++ PKGBUILD	2011-12-05 03:44:51 UTC (rev 144357)
@@ -4,7 +4,7 @@
 
 pkgname=hplip
 pkgver=3.11.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -33,6 +33,12 @@
  export PYTHON=python2
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
  sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py 
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+
  # fix sysfs rules
  sed -i -e "s|SYSFS|ATTR|g" \
         -e "s|sysfs|attr|g" \
@@ -43,6 +49,8 @@
              --enable-foomatic-rip-hplip-install \
              --enable-foomatic-ppd-install \
              --enable-hpcups-install \
+             --enable-new-hpcups \
+             --enable-cups-ppd-install \
              --enable-cups-drv-install \
              --enable-hpijs-install \
              --enable-foomatic-drv-install \
@@ -54,7 +62,7 @@
 
 package() {
  cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d  DESTDIR="$pkgdir/" install
+ make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
  # remove config provided by sane and autostart of hp-daemon
  rm -rf "$pkgdir"/etc/{sane.d,xdg}
 }




More information about the arch-commits mailing list