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

2016-05-15 Thread Andreas Radke
Date: Sunday, May 15, 2016 @ 17:50:56
  Author: andyrtr
Revision: 268066

upgpkg: hplip 3.16.5-3

* remove obsolete install scriptlet
* use pyqt5 gui - FS#49344

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

---+
 PKGBUILD  |8 
 hplip.install |   18 --
 2 files changed, 4 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-15 15:47:57 UTC (rev 268065)
+++ PKGBUILD2016-05-15 15:50:56 UTC (rev 268066)
@@ -6,13 +6,13 @@
 
 pkgname=hplip
 pkgver=3.16.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com";
 license=('GPL')
 depends=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine')
-makedepends=('python-pyqt4' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
 optdepends=('cups: for printing support'
 'sane: for scanner support'
 'xsane: sane scanner frontend'
@@ -23,7 +23,6 @@
 'python-gobject: for running hp-toolbox'
 'hplip-plugin: binary blobs for specific devices (AUR) or run 
hp-setup to download the plugin'
 'libusb: for advanced usb support')
-install=hplip.install
 backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
 
source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
 disable_upgrade.patch)
@@ -56,7 +55,8 @@
 build() {
  cd $pkgname-$pkgver
  ./configure --prefix=/usr \
- --enable-qt4 \
+ --enable-qt5 \
+ --disable-qt4 \
  --disable-foomatic-rip-hplip-install \
  --enable-foomatic-ppd-install \
  --enable-hpcups-install \

Deleted: hplip.install
===
--- hplip.install   2016-05-15 15:47:57 UTC (rev 268065)
+++ hplip.install   2016-05-15 15:50:56 UTC (rev 268066)
@@ -1,18 +0,0 @@
-post_install() {
-  cat << EOF
-
-NOTE
-
-# If you want to use this driver with sane:
-#  echo "hpaio" >> /etc/sane.d/dll.conf
-
-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
-}


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

2012-06-02 Thread andyrtr
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
===
--- PKGBUILD2012-06-02 21:00:23 UTC (rev 160607)
+++ PKGBUILD2012-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
+}



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

2011-03-04 Thread Eric BĂ©langer
Date: Saturday, March 5, 2011 @ 00:51:53
  Author: eric
Revision: 112525

upgpkg: hplip 3.11.1-2
Rebuilt for net-snmp 5.6.1, Removed obsolete post-upgrade function in .install 
file

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

---+
 PKGBUILD  |   35 ++-
 hplip.install |   15 ---
 2 files changed, 18 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-05 05:24:13 UTC (rev 112524)
+++ PKGBUILD2011-03-05 05:51:53 UTC (rev 112525)
@@ -4,27 +4,29 @@
 
 pkgname=hplip
 pkgver=3.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com";
 license=('GPL')
 makedepends=('python2-qt' 'pygobject' 'pkgconfig' 'sane' 'rpcbind' 'cups')
 depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-   'libcups>=1.3.10-3' 'net-snmp>=5.5')
-replaces=('hpijs')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz)
+   'libcups>=1.3.10-3' 'net-snmp>=5.6.1' 'libusb-compat')
 optdepends=('cups: for printing support'
 'dbus-python: for dbus support'
 'sane: for scanner support'
 'rpcbind: for network support'
 'python2-qt: for running hp-toolbox'
 'pygobject: for running hp-toolbox')
+replaces=('hpijs')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz)
+md5sums=('86f63a00c911313206fef6a147f7faad')
+sha1sums=('6b06567373cadc7dff48134c6b58f90a4d72582a')
 
 build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
  ./configure --prefix=/usr \
  --enable-qt4 \
@@ -41,19 +43,18 @@
 }
 
 package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir/ install
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
 
- rm -rf $pkgdir/etc/sane.d
+ rm -rf "$pkgdir/etc/sane.d"
  # remove autostart of hp-daemon
- rm -r $pkgdir/etc/xdg
+ rm -r "$pkgdir/etc/xdg"
  # move udev rules to /lib/udev/rules.d
- mkdir -p $pkgdir/lib/udev/rules.d
- mv $pkgdir/etc/udev/rules.d/* $pkgdir/lib/udev/rules.d/
- rm -r $pkgdir/etc/udev
+ mkdir -p "$pkgdir/lib/udev/rules.d"
+ mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/"
+ rm -r "$pkgdir/etc/udev"
  # remove lp user, it's not used on archlinux
- sed -i 's|OWNER="lp", ||g' $pkgdir/lib/udev/rules.d/40-hplip.rules
+ sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules"
  # fix sysfs rules
- sed -i -e "s|SYSFS|ATTRS|g" -e "s|sysfs|attrs|g" 
$pkgdir/lib/udev/rules.d/56-hpmud_support.rules
+ sed -i -e "s|SYSFS|ATTRS|g" -e "s|sysfs|attrs|g" 
"$pkgdir/lib/udev/rules.d/56-hpmud_support.rules"
 }
-md5sums=('86f63a00c911313206fef6a147f7faad')

Modified: hplip.install
===
--- hplip.install   2011-03-05 05:24:13 UTC (rev 112524)
+++ hplip.install   2011-03-05 05:51:53 UTC (rev 112525)
@@ -7,19 +7,4 @@
 #  echo "hpaio" >> /etc/sane.d/dll.conf
 
 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
-}