diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-20 10:35:46 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-20 10:35:46 +0200 |
commit | 964dfed2669c05373815ba135efc563e313cf792 (patch) | |
tree | f4ccee9d34e51f3a53d7334f4fcec5bf2055a9f2 /extra/sane | |
parent | 4f22a5c482279b73ed0140e8962f75169f9b3e57 (diff) | |
parent | 383955a81810f344e11b1472bd4c5069fa77020c (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/kvpnc/PKGBUILD
extra/bmp/PKGBUILD
extra/parted/PKGBUILD
extra/python-m2crypto/PKGBUILD
extra/vamp-plugin-sdk/PKGBUILD
extra/xsane/PKGBUILD
libre/syslinux/PKGBUILD
Diffstat (limited to 'extra/sane')
-rw-r--r-- | extra/sane/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/sane/sane.xinetd | 2 | ||||
-rw-r--r-- | extra/sane/saned.service | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index a8fc7e654..47a86b2d2 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182410 2013-04-10 07:43:35Z tpowa $ +# $Id: PKGBUILD 185795 2013-05-19 09:05:59Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.23 -pkgrel=4 +pkgrel=5 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') @@ -34,7 +34,7 @@ prepare() { build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - ./configure --prefix=/usr \ + ./configure --prefix=/usr --sbindir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --with-docdir=/usr/share/doc/sane \ @@ -69,8 +69,8 @@ package () { "${pkgdir}/usr/lib/systemd/system/saned@.service" } md5sums=('e226a89c54173efea80e91e9a5eb6573' - '5f519030392d599e2ad348159ec4c96f' + 'bc2c8b4f7b3012c8936c7da21f60e2ac' 'e57e9e15528f47f5f1b3f1411135ed5d' - 'e44bd4c994a52d6f472463d1eb0a03be' + '3f9fe36b0c4ff0b01b53b1cffa5d9700' 'e65dbefb7c3d69955fb6eb3ace14aa12' '44e77692c52db15b0f530a1d9a8e1296') diff --git a/extra/sane/sane.xinetd b/extra/sane/sane.xinetd index 67f08a656..311ca6202 100644 --- a/extra/sane/sane.xinetd +++ b/extra/sane/sane.xinetd @@ -5,7 +5,7 @@ service sane-port wait = no user = nobody group = scanner - server = /usr/sbin/saned + server = /usr/bin/saned # disabled by default! disable = yes } diff --git a/extra/sane/saned.service b/extra/sane/saned.service index 69e833e7e..6b2a3f7a7 100644 --- a/extra/sane/saned.service +++ b/extra/sane/saned.service @@ -3,6 +3,6 @@ Description=Scanner Service [Service] Group=scanner -ExecStart=/usr/sbin/saned +ExecStart=/usr/bin/saned StandardInput=socket StandardError=syslog |