diff options
| author | Alex Wiggins | 2015-11-09 07:10:13 +0000 |
|---|---|---|
| committer | Alex Wiggins | 2015-11-09 07:10:13 +0000 |
| commit | 85aa06e2d01faa7bcb4427074980113bfe031d70 (patch) | |
| tree | 5090eb3b045e0e46af53093212d349ed2782f0d5 | |
| parent | b924f318e377b077f72c690f279e52efe9869bfe (diff) | |
| download | aur-85aa06e2d01faa7bcb4427074980113bfe031d70.tar.gz | |
Fixed package including conflict with iscan-data
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 25 |
2 files changed, 16 insertions, 16 deletions
@@ -1,15 +1,14 @@ pkgbase = iscan-plugin-network pkgdesc = Plugin for using Epson scanners with ISCAN over network - pkgver = 1.36.0 - pkgrel = 12 + pkgver = 1.1.1 + pkgrel = 13 url = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX install = iscan-plugin-network.install arch = i686 arch = x86_64 license = custom:AVASYSPL depends = iscan - conflicts = iscan-data - source = iscan-bundle.deb.tar.gz::https://download2.ebz.epson.net/iscan/general/deb/x86/iscan-bundle-1.0.0.x86.deb.tar.gz + source = iscan-bundle.deb.tar.gz::https://download2.ebz.epson.net/iscan/general/deb/x86/iscan-bundle-1.0.0.i386.deb.tar.gz sha512sums = d91a064342640582a71c664441e944812bc2fd18bd8f00010838adac7ad0581efcf8c9224c48a136ae0aec7f26b6df8071da7c2e10110eafe91c1dbd7f9865ad pkgname = iscan-plugin-network @@ -5,33 +5,34 @@ # Contributor: Tom Kuther <gimpel@sonnenkinder.org> pkgname=iscan-plugin-network -_pkgintname=iscan-data +_pkgintname=iscan-network-nt _pkgdlname=iscan-bundle -pkgver=1.36.0 -_pkgver=1.36.0-1 # workaround for hyphen in version +pkgver=1.1.1 +_pkgver=1.1.1-1 # workaround for hyphen in version _pkgdlver=1.0.0 # download bundle version -pkgrel=12 +pkgrel=13 pkgdesc="Plugin for using Epson scanners with ISCAN over network" arch=('i686' 'x86_64') url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" license=('custom:AVASYSPL') depends=(iscan) -conflicts=(iscan-data) install=iscan-plugin-network.install if [[ ${CARCH} = 'x86_64' ]]; then - _pkgarch='x64' + _pkgdlarch='x64' + _pkgarch='amd64' sha512sums=('081ea48a83f955abd8f8d081f322e87ca02c91d371d6a7ed2d7cc4075c590c162a4ee9cd196cf5a53e6ce26fe29e34ef5a42400c06d336d2b8ccd33a6853575a') - source=("iscan-bundle.deb.tar.gz::https://download2.ebz.epson.net/iscan/general/deb/${_pkgarch}/${_pkgdlname}-${_pkgdlver}.${_pkgarch}.deb.tar.gz") + source=("iscan-bundle.deb.tar.gz::https://download2.ebz.epson.net/iscan/general/deb/${_pkgdlarch}/${_pkgdlname}-${_pkgdlver}.${_pkgarch}.deb.tar.gz") else - _pkgarch='x86' + _pkgdlarch='x86' + _pkgarch='i386' sha512sums=('d91a064342640582a71c664441e944812bc2fd18bd8f00010838adac7ad0581efcf8c9224c48a136ae0aec7f26b6df8071da7c2e10110eafe91c1dbd7f9865ad') - source=("iscan-bundle.deb.tar.gz::https://download2.ebz.epson.net/iscan/general/deb/${_pkgarch}/${_pkgdlname}-${_pkgdlver}.${_pkgarch}.deb.tar.gz") + source=("iscan-bundle.deb.tar.gz::https://download2.ebz.epson.net/iscan/general/deb/${_pkgdlarch}/${_pkgdlname}-${_pkgdlver}.${_pkgarch}.deb.tar.gz") fi build() { cd $srcdir -cd ${_pkgdlname}-${_pkgdlver}.${_pkgarch}.deb/data -bsdtar -xf ${_pkgintname}_${_pkgver}_all.deb +cd ${_pkgdlname}-${_pkgdlver}.${_pkgdlarch}.deb/plugins +bsdtar -xf ${_pkgintname}_${_pkgver}_${_pkgarch}.deb bsdtar -xf data.tar.gz cp -R usr $srcdir } @@ -39,5 +40,5 @@ cp -R usr $srcdir package() { cd $srcdir cp -R usr $pkgdir -install -Dm644 usr/share/doc/${_pkgintname}/copyright $pkgdir/usr/share/licenses/${pkgname}/AVASYSPL +install -Dm644 usr/share/doc/${_pkgintname}/AVASYSPL.en.txt $pkgdir/usr/share/licenses/${pkgname}/AVASYSPL }
\ No newline at end of file |