[arch-commits] Commit in hplip/repos (8 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu May 31 19:55:57 UTC 2012
Date: Thursday, May 31, 2012 @ 15:55:56
Author: andyrtr
Revision: 160265
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
hplip/repos/testing-i686/PKGBUILD
(from rev 160264, hplip/trunk/PKGBUILD)
hplip/repos/testing-i686/hplip.install
(from rev 160264, hplip/trunk/hplip.install)
hplip/repos/testing-x86_64/PKGBUILD
(from rev 160264, hplip/trunk/PKGBUILD)
hplip/repos/testing-x86_64/hplip.install
(from rev 160264, hplip/trunk/hplip.install)
Deleted:
hplip/repos/testing-i686/PKGBUILD
hplip/repos/testing-i686/hplip.install
hplip/repos/testing-x86_64/PKGBUILD
hplip/repos/testing-x86_64/hplip.install
------------------------------+
testing-i686/PKGBUILD | 153 +++++++++++++++++++++--------------------
testing-i686/hplip.install | 20 ++---
testing-x86_64/PKGBUILD | 153 +++++++++++++++++++++--------------------
testing-x86_64/hplip.install | 20 ++---
4 files changed, 184 insertions(+), 162 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2012-05-31 19:55:14 UTC (rev 160264)
+++ testing-i686/PKGBUILD 2012-05-31 19:55:56 UTC (rev 160265)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor : Rémy Oudompheng <remy at archlinux.org>
-# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.12.4
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com"
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
- 'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
- 'dbus-python: for dbus support'
- 'sane: for scanner support'
- 'python-imaging: for commandline scanning support'
- 'python-notify: for Desktop notification support'
- 'rpcbind: for network support'
- 'python2-pyqt: for running hp-toolbox'
- 'python2-gobject2: for running hp-toolbox'
- 'hplip-plugin: binary blobs for specific devices')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
- '2fe18f4091afb3dec200271dc7836128')
-
-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 '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
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --disable-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 \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- 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}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
-}
Copied: hplip/repos/testing-i686/PKGBUILD (from rev 160264, hplip/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-05-31 19:55:56 UTC (rev 160265)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor : Rémy Oudompheng <remy at archlinux.org>
+# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.12.4
+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=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+ 'net-snmp>=5.7.1')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+ 'dbus-python: for dbus support'
+ 'sane: for scanner support'
+ 'python-imaging: for commandline scanning support'
+ 'python-notify: for Desktop notification support'
+ 'rpcbind: for network support'
+ 'python2-pyqt: for running hp-toolbox'
+ 'python2-gobject2: for running hp-toolbox'
+ 'hplip-plugin: binary blobs for specific devices')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('a063f76aa47edab55a3f31ff2558df07'
+ '2fe18f4091afb3dec200271dc7836128')
+
+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 '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
+
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ local i
+ for i in ppd/hpijs/*.ppd.gz ; do
+ rm -f ${i}.temp
+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ gzip > ${i}.temp || return 1
+ mv ${i}.temp ${i}
+ done
+
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-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 \
+ --enable-pp-build \
+ --enable-udev-acl-rules
+
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ 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}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
+ # move to /usr
+ mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
+ rm "$pkgdir"/lib -r
+}
Deleted: testing-i686/hplip.install
===================================================================
--- testing-i686/hplip.install 2012-05-31 19:55:14 UTC (rev 160264)
+++ testing-i686/hplip.install 2012-05-31 19:55:56 UTC (rev 160265)
@@ -1,10 +0,0 @@
-post_install() {
- cat << EOF
-
-NOTE
-----
-# If you want to use this driver with sane:
-# echo "hpaio" >> /etc/sane.d/dll.conf
-
-EOF
-}
Copied: hplip/repos/testing-i686/hplip.install (from rev 160264, hplip/trunk/hplip.install)
===================================================================
--- testing-i686/hplip.install (rev 0)
+++ testing-i686/hplip.install 2012-05-31 19:55:56 UTC (rev 160265)
@@ -0,0 +1,10 @@
+post_install() {
+ cat << EOF
+
+NOTE
+----
+# If you want to use this driver with sane:
+# echo "hpaio" >> /etc/sane.d/dll.conf
+
+EOF
+}
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2012-05-31 19:55:14 UTC (rev 160264)
+++ testing-x86_64/PKGBUILD 2012-05-31 19:55:56 UTC (rev 160265)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor : Rémy Oudompheng <remy at archlinux.org>
-# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.12.4
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com"
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
- 'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
- 'dbus-python: for dbus support'
- 'sane: for scanner support'
- 'python-imaging: for commandline scanning support'
- 'python-notify: for Desktop notification support'
- 'rpcbind: for network support'
- 'python2-pyqt: for running hp-toolbox'
- 'python2-gobject2: for running hp-toolbox'
- 'hplip-plugin: binary blobs for specific devices')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
- '2fe18f4091afb3dec200271dc7836128')
-
-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 '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
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --disable-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 \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- 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}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
-}
Copied: hplip/repos/testing-x86_64/PKGBUILD (from rev 160264, hplip/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-05-31 19:55:56 UTC (rev 160265)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor : Rémy Oudompheng <remy at archlinux.org>
+# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.12.4
+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=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+ 'net-snmp>=5.7.1')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+ 'dbus-python: for dbus support'
+ 'sane: for scanner support'
+ 'python-imaging: for commandline scanning support'
+ 'python-notify: for Desktop notification support'
+ 'rpcbind: for network support'
+ 'python2-pyqt: for running hp-toolbox'
+ 'python2-gobject2: for running hp-toolbox'
+ 'hplip-plugin: binary blobs for specific devices')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('a063f76aa47edab55a3f31ff2558df07'
+ '2fe18f4091afb3dec200271dc7836128')
+
+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 '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
+
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ local i
+ for i in ppd/hpijs/*.ppd.gz ; do
+ rm -f ${i}.temp
+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ gzip > ${i}.temp || return 1
+ mv ${i}.temp ${i}
+ done
+
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-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 \
+ --enable-pp-build \
+ --enable-udev-acl-rules
+
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ 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}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
+ # move to /usr
+ mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
+ rm "$pkgdir"/lib -r
+}
Deleted: testing-x86_64/hplip.install
===================================================================
--- testing-x86_64/hplip.install 2012-05-31 19:55:14 UTC (rev 160264)
+++ testing-x86_64/hplip.install 2012-05-31 19:55:56 UTC (rev 160265)
@@ -1,10 +0,0 @@
-post_install() {
- cat << EOF
-
-NOTE
-----
-# If you want to use this driver with sane:
-# echo "hpaio" >> /etc/sane.d/dll.conf
-
-EOF
-}
Copied: hplip/repos/testing-x86_64/hplip.install (from rev 160264, hplip/trunk/hplip.install)
===================================================================
--- testing-x86_64/hplip.install (rev 0)
+++ testing-x86_64/hplip.install 2012-05-31 19:55:56 UTC (rev 160265)
@@ -0,0 +1,10 @@
+post_install() {
+ cat << EOF
+
+NOTE
+----
+# If you want to use this driver with sane:
+# echo "hpaio" >> /etc/sane.d/dll.conf
+
+EOF
+}
More information about the arch-commits
mailing list