[arch-commits] Commit in sane/repos/extra-x86_64 (8 files)

David Runge dvzrv at archlinux.org
Sat Oct 17 10:51:44 UTC 2020


    Date: Saturday, October 17, 2020 @ 10:51:44
  Author: dvzrv
Revision: 398484

archrelease: copy trunk to extra-x86_64

Added:
  sane/repos/extra-x86_64/PKGBUILD
    (from rev 398483, sane/trunk/PKGBUILD)
  sane/repos/extra-x86_64/sane.xinetd
    (from rev 398483, sane/trunk/sane.xinetd)
  sane/repos/extra-x86_64/saned.service
    (from rev 398483, sane/trunk/saned.service)
  sane/repos/extra-x86_64/saned.socket
    (from rev 398483, sane/trunk/saned.socket)
Deleted:
  sane/repos/extra-x86_64/PKGBUILD
  sane/repos/extra-x86_64/sane.xinetd
  sane/repos/extra-x86_64/saned.service
  sane/repos/extra-x86_64/saned.socket

---------------+
 PKGBUILD      |  138 ++++++++++++++++++++++++++++++--------------------------
 sane.xinetd   |   22 ++++----
 saned.service |   16 +++---
 saned.socket  |   18 +++----
 4 files changed, 103 insertions(+), 91 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-17 10:51:34 UTC (rev 398483)
+++ PKGBUILD	2020-10-17 10:51:44 UTC (rev 398484)
@@ -1,63 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: Simo L. <neotuli at yahoo.com>
-# Contributor: eric <eric at archlinux.org>
-
-pkgname=sane
-pkgver=1.0.31
-pkgrel=1
-_commit=8bf1cae2e1803aefab9e5331550e5d5d
-pkgdesc="Scanner Access Now Easy"
-url="http://www.sane-project.org/"
-arch=('x86_64')
-license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp' 'poppler-glib')
-makedepends=('texlive-latexextra')
-backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,epsonds.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pieusb.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/
 sane)
-source=(https://gitlab.com/sane-project/backends/uploads/$_commit/sane-backends-$pkgver.tar.gz
-        'sane.xinetd'
-        'saned.socket'
-        'saned.service')
-sha512sums=('5d49ca698af38a30a3d23349f2fe82a4a21262b014ca38407d5ea0b3fe7cec72860a39c8651c8a5e2f561a9a740008658a36ed6bd96324be84646dbcf1461bfb'
-            '8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
-            '62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
-            'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536')
-
-build() {
-  cd sane-backends-${pkgver}
-
-  ./configure --prefix=/usr --sbindir=/usr/bin \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --with-docdir=/usr/share/doc/sane \
-    --enable-avahi \
-    --enable-pthread \
-    --disable-rpath \
-    --enable-libusb_1_0 \
-    --disable-locking
-  make
-}
-
-package() {
-  cd sane-backends-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # fix hp officejets
-  echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
-  # install udev files
-  install -D -m0644 tools/udev/libsane.rules \
-    "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
-  # fix udev rules
-  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
-  
-  # install xinetd file
-  install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
-  
-  # Install the pkg-config file
-  install -D -m644 tools/sane-backends.pc \
-     "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
-  # install systemd files
-  install -D -m644 ${srcdir}/saned.socket \
-      "${pkgdir}/usr/lib/systemd/system/saned.socket"
-  install -D -m644 ${srcdir}/saned.service \
-      "${pkgdir}/usr/lib/systemd/system/saned at .service"
-}

Copied: sane/repos/extra-x86_64/PKGBUILD (from rev 398483, sane/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-17 10:51:44 UTC (rev 398484)
@@ -0,0 +1,75 @@
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: David Runge <dvzrv at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Simo L. <neotuli at yahoo.com>
+# Contributor: eric <eric at archlinux.org>
+
+pkgname=sane
+pkgver=1.0.31
+pkgrel=2
+_commit=8bf1cae2e1803aefab9e5331550e5d5d
+pkgdesc="Scanner Access Now Easy"
+url="http://www.sane-project.org/"
+arch=('x86_64')
+license=('GPL2')
+# NOTE: libgphoto2 can be moved to makedepends once the package also provides
+# libgphoto2_port.so
+depends=('bash' 'cairo' 'gcc-libs' 'glibc' 'libgphoto2' 'libjpeg-turbo' 'libnl'
+'libpng' 'libtiff' 'libxml2' 'libieee1284' 'net-snmp' 'openssl' 'v4l-utils')
+makedepends=('avahi' 'curl' 'glib2' 'libusb' 'poppler-glib' 'texlive-latexextra')
+provides=('libsane.so')
+backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,epsonds.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pieusb.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/
 sane)
+source=(https://gitlab.com/sane-project/backends/uploads/$_commit/sane-backends-$pkgver.tar.gz
+        'sane.xinetd'
+        'saned.socket'
+        'saned.service')
+sha512sums=('5d49ca698af38a30a3d23349f2fe82a4a21262b014ca38407d5ea0b3fe7cec72860a39c8651c8a5e2f561a9a740008658a36ed6bd96324be84646dbcf1461bfb'
+            '8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
+            '62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
+            'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536')
+b2sums=('fc36311e4f293c29f0f64ec4090356f54a2823b1886707410bdaf03113a04c3ae1cfcc350796fc707a894be66dd97305b2f539d7066840d860bb29ccc514995d'
+        '158952a09d5b29ae848a4c1377de6ff824b61c7d1932d29f3a0d313bafdaa0c5973614c5b744f53c7d2d4acff3dd4dc8b821068b95ae07a081539fd5cabd7477'
+        '779406b17a77d209ba797b20c39f18fccc6a75c45a97db46e717a68f1998e37d90ac1b3b79d61030e880c09cf4dcc9003c7ed81ab3e96f5fd61756ca251f3ccf'
+        'bedaa660608161734f82c317befde341f36502cf0cfd4ea7987cf5793f3630f80f160fc7adaf474d35679c7e2cebe86fe928c71297dce929e3ea94a9b6a85ba9')
+
+build() {
+  cd sane-backends-${pkgver}
+
+  ./configure --prefix=/usr --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-docdir=/usr/share/doc/sane \
+    --enable-avahi \
+    --enable-pthread \
+    --disable-rpath \
+    --enable-libusb_1_0 \
+    --disable-locking
+  make
+}
+
+package() {
+  depends+=('libavahi-client.so' 'libavahi-common.so' 'libcurl.so'
+  'libgphoto2.so' 'libglib-2.0.so' 'libgobject-2.0.so' 'libpoppler-glib.so'
+  'libusb-1.0.so')
+  cd sane-backends-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # fix hp officejets
+  echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
+  # install udev files
+  install -D -m0644 tools/udev/libsane.rules \
+    "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
+  # fix udev rules
+  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
+
+  # install xinetd file
+  install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
+
+  # Install the pkg-config file
+  install -D -m644 tools/sane-backends.pc \
+     "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
+  # install systemd files
+  install -D -m644 ${srcdir}/saned.socket \
+      "${pkgdir}/usr/lib/systemd/system/saned.socket"
+  install -D -m644 ${srcdir}/saned.service \
+      "${pkgdir}/usr/lib/systemd/system/saned at .service"
+}

Deleted: sane.xinetd
===================================================================
--- sane.xinetd	2020-10-17 10:51:34 UTC (rev 398483)
+++ sane.xinetd	2020-10-17 10:51:44 UTC (rev 398484)
@@ -1,11 +0,0 @@
-service sane-port
-{
-	port        = 6566
-	socket_type = stream
-	wait        = no
-	user        = nobody 
-	group       = scanner
-	server      = /usr/bin/saned
-	# disabled by default!
-	disable     = yes
-		  }

Copied: sane/repos/extra-x86_64/sane.xinetd (from rev 398483, sane/trunk/sane.xinetd)
===================================================================
--- sane.xinetd	                        (rev 0)
+++ sane.xinetd	2020-10-17 10:51:44 UTC (rev 398484)
@@ -0,0 +1,11 @@
+service sane-port
+{
+	port        = 6566
+	socket_type = stream
+	wait        = no
+	user        = nobody 
+	group       = scanner
+	server      = /usr/bin/saned
+	# disabled by default!
+	disable     = yes
+		  }

Deleted: saned.service
===================================================================
--- saned.service	2020-10-17 10:51:34 UTC (rev 398483)
+++ saned.service	2020-10-17 10:51:44 UTC (rev 398484)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Scanner Service
-
-[Service]
-Group=scanner
-ExecStart=/usr/bin/saned
-StandardInput=socket
-StandardError=syslog

Copied: sane/repos/extra-x86_64/saned.service (from rev 398483, sane/trunk/saned.service)
===================================================================
--- saned.service	                        (rev 0)
+++ saned.service	2020-10-17 10:51:44 UTC (rev 398484)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Scanner Service
+
+[Service]
+Group=scanner
+ExecStart=/usr/bin/saned
+StandardInput=socket
+StandardError=syslog

Deleted: saned.socket
===================================================================
--- saned.socket	2020-10-17 10:51:34 UTC (rev 398483)
+++ saned.socket	2020-10-17 10:51:44 UTC (rev 398484)
@@ -1,9 +0,0 @@
-[Unit]
-Description=saned incoming socket
-
-[Socket]
-ListenStream=6566
-Accept=yes
-
-[Install]
-WantedBy=sockets.target

Copied: sane/repos/extra-x86_64/saned.socket (from rev 398483, sane/trunk/saned.socket)
===================================================================
--- saned.socket	                        (rev 0)
+++ saned.socket	2020-10-17 10:51:44 UTC (rev 398484)
@@ -0,0 +1,9 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+
+[Install]
+WantedBy=sockets.target



More information about the arch-commits mailing list