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

[andyrtr at archlinux.org]

    Date: Saturday, June 2, 2012 @ 17:06:41
  Author: andyrtr
Revision: 160608

upgpkg: hplip 3.12.4-4

fix python interpreter; FS#30024

Modified:
  hplip/trunk/PKGBUILD
  hplip/trunk/hplip.install

---------------+
 PKGBUILD      |    6 ++++--
 hplip.install |    8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-02 21:00:23 UTC (rev 160607)
+++ PKGBUILD	2012-06-02 21:06:41 UTC (rev 160608)
@@ -5,7 +5,7 @@
 
 pkgname=hplip
 pkgver=3.12.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -31,8 +31,10 @@
 build() {
  cd "$srcdir/$pkgname-$pkgver"
  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 '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.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 
@@ -49,7 +51,7 @@
 			gzip > ${i}.temp || return 1
 		mv ${i}.temp ${i}
 	done
-
+   
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 

Modified: hplip.install
===================================================================
--- hplip.install	2012-06-02 21:00:23 UTC (rev 160607)
+++ hplip.install	2012-06-02 21:06:41 UTC (rev 160608)
@@ -8,3 +8,11 @@
 
 EOF
 }
+
+post_upgrade() {
+  if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
+    # important upgrade notice
+    echo "> Please remove your printer in cups, then add it"
+    echo "> back and reconfigure it to make it work again!"
+  fi
+}