summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD16
-rw-r--r--fujitsu.conf.patch91
-rw-r--r--pfufs-post-sane-upgrade.hook9
-rw-r--r--pfufs-pre-sane-upgrade.hook9
-rw-r--r--pfufs.install9
6 files changed, 2 insertions, 143 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef6cd429692e..133253d2a536 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,25 @@
pkgbase = pfufs
pkgdesc = Fujitsu fi series Image Scanner Driver for SANE
pkgver = 2.3.2
- pkgrel = 2
+ pkgrel = 3
url = http://imagescanner.fujitsu.com/global/dl/
- install = pfufs.install
arch = x86_64
license = custom
depends = sane
source = http://origin.pfultd.com/downloads/IMAGE/fi/ubuntu/232/pfufs-ubuntu18.04_2.3.2_amd64.deb
source = http://origin.pfultd.com/downloads/IMAGE/fi/ubuntu/232/P2U3-0200-02ENZ0.pdf
source = 60-pfufs.rules
- source = fujitsu.conf.patch
source = pfufs
source = pfufs.conf
source = pfufs.ini
- source = pfufs.install
- source = pfufs-post-sane-upgrade.hook
- source = pfufs-pre-sane-upgrade.hook
source = pfufsscanbutton.service
source = simple-scan.conf
sha256sums = a738e350db54e2a80350d472667b6155f90632b37f3f7bc7136bc09a55287793
sha256sums = 6c9e4829cfc3159f269a03b72e64ae6d5f03c8d5139c9ab230182224118334ac
sha256sums = 116bbb87a658e7a5004c762e5f860897522d8077c5d4d2f2faeb79e7f45d7687
- sha256sums = c4552be508a4bf5f831c2143bc430f9dbe0dc50cca45326f0cd8089af3e1c240
sha256sums = 36890d01da19034cfd7f0e8aa40672693cc2b8db2902c6e3755628ee36dd0e61
sha256sums = c5fa4c0a211c69cb4a764cb6dfcc76443d86c1e27469295386db8194eee11f5b
sha256sums = af03606af00cd90726b9d4fd5d7ccad1e1209399b7b668e523eedbf5e7c58521
- sha256sums = 37f40b8d6d59a6cef9b95c5d739b873878117de311ffadb3933185b2500dbc06
- sha256sums = eb8842571ce6cd505ff1175b6b9086a6b18bdc099594ee66586dd3dd22a398ca
- sha256sums = 66b98f15a828404e73d0b03f165b0811b54cb8a0fdd7a96c2c32e01fae1fb9d7
sha256sums = bd0a75c50f92f66471bb2f3eb969394f0156eae60537a206244bb16f597d2c3d
sha256sums = 6aec8ca879208e25ce8678a9bb0ecf11ccecca3c5e82f6e07b25425a261cc732
diff --git a/PKGBUILD b/PKGBUILD
index 636859ebaa49..bc38c7d98646 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,35 +2,26 @@
pkgname=pfufs
pkgver=2.3.2
-pkgrel=2
+pkgrel=3
pkgdesc='Fujitsu fi series Image Scanner Driver for SANE'
url='http://imagescanner.fujitsu.com/global/dl/'
arch=('x86_64')
license=('custom')
depends=('sane')
-install=pfufs.install
source=('http://origin.pfultd.com/downloads/IMAGE/fi/ubuntu/232/pfufs-ubuntu18.04_2.3.2_amd64.deb'
'http://origin.pfultd.com/downloads/IMAGE/fi/ubuntu/232/P2U3-0200-02ENZ0.pdf'
60-pfufs.rules
- fujitsu.conf.patch
pfufs
pfufs.conf
pfufs.ini
- pfufs.install
- pfufs-post-sane-upgrade.hook
- pfufs-pre-sane-upgrade.hook
pfufsscanbutton.service
simple-scan.conf)
sha256sums=('a738e350db54e2a80350d472667b6155f90632b37f3f7bc7136bc09a55287793'
'6c9e4829cfc3159f269a03b72e64ae6d5f03c8d5139c9ab230182224118334ac'
'116bbb87a658e7a5004c762e5f860897522d8077c5d4d2f2faeb79e7f45d7687'
- 'c4552be508a4bf5f831c2143bc430f9dbe0dc50cca45326f0cd8089af3e1c240'
'36890d01da19034cfd7f0e8aa40672693cc2b8db2902c6e3755628ee36dd0e61'
'c5fa4c0a211c69cb4a764cb6dfcc76443d86c1e27469295386db8194eee11f5b'
'af03606af00cd90726b9d4fd5d7ccad1e1209399b7b668e523eedbf5e7c58521'
- '37f40b8d6d59a6cef9b95c5d739b873878117de311ffadb3933185b2500dbc06'
- 'eb8842571ce6cd505ff1175b6b9086a6b18bdc099594ee66586dd3dd22a398ca'
- '66b98f15a828404e73d0b03f165b0811b54cb8a0fdd7a96c2c32e01fae1fb9d7'
'bd0a75c50f92f66471bb2f3eb969394f0156eae60537a206244bb16f597d2c3d'
'6aec8ca879208e25ce8678a9bb0ecf11ccecca3c5e82f6e07b25425a261cc732')
@@ -48,9 +39,6 @@ prepare () {
package () {
cd "$srcdir"
- install -vDm 644 -t "$pkgdir/usr/share/libalpm/hooks" pfufs-{pre,post}-sane-upgrade.hook
- install -vDm 644 -t "$pkgdir/opt/pfufs/etc/sane.d" fujitsu.conf.patch
-
install -d "$pkgdir/opt/pfufs/image"
cp -pR usr/ "$pkgdir/"
@@ -76,6 +64,4 @@ package () {
mv "$pkgdir/opt/pfufs/etc" "$pkgdir/etc/pfufs"
ln -s /etc/pfufs "$pkgdir/opt/pfufs/etc"
-
- install -d "$pkgdir/opt/pfufs/image"
}
diff --git a/fujitsu.conf.patch b/fujitsu.conf.patch
deleted file mode 100644
index 8551f90fd51a..000000000000
--- a/fujitsu.conf.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- fujitsu.conf 2019-03-07 16:02:15.758266640 +0100
-+++ fujitsu.conf 2019-03-07 16:06:47.183671868 +0100
-@@ -151,18 +151,6 @@
- #ScanSnap iX500
- usb 0x04c5 0x132b
-
--#fi-7180
--usb 0x04c5 0x132c
--
--#fi-7280
--usb 0x04c5 0x132d
--
--#fi-7160
--usb 0x04c5 0x132e
--
--#fi-7260
--usb 0x04c5 0x132f
--
- #ScanSnap iX500EE
- usb 0x04c5 0x13f3
-
-@@ -214,21 +202,9 @@
- #fi-6400
- usb 0x04c5 0x14ac
-
--#fi-7480
--usb 0x04c5 0x14b8
--
- #fi-6420
- usb 0x04c5 0x14bd
-
--#fi-7460
--usb 0x04c5 0x14be
--
--#fi-7140
--usb 0x04c5 0x14df
--
--#fi-7240
--usb 0x04c5 0x14e0
--
- #fi-7135
- usb 0x04c5 0x14e1
-
-@@ -256,15 +232,42 @@
- #fi-400F
- usb 0x04c5 0x151e
-
--#fi-7030
--usb 0x04c5 0x151f
--
- #fi-7700
- usb 0x04c5 0x1520
-
- #fi-7600
- usb 0x04c5 0x1521
-
--#fi-7700S
--usb 0x04c5 0x1522
-
-+# The following scanners are commented as they are supported
-+# by the pfufs driver
-+
-+# #fi-7030
-+# usb 0x04c5 0x151f
-+
-+# #fi-7140
-+# usb 0x04c5 0x14df
-+
-+# #fi-7240
-+# usb 0x04c5 0x14e0
-+
-+# #fi-7160
-+# usb 0x04c5 0x132e
-+
-+# #fi-7260
-+# usb 0x04c5 0x132f
-+
-+# #fi-7180
-+# usb 0x04c5 0x132c
-+
-+# #fi-7280
-+# usb 0x04c5 0x132d
-+
-+# #fi-7460
-+# usb 0x04c5 0x14be
-+
-+# #fi-7480
-+# usb 0x04c5 0x14b8
-+
-+# #fi-7700S
-+# usb 0x04c5 0x1522
diff --git a/pfufs-post-sane-upgrade.hook b/pfufs-post-sane-upgrade.hook
deleted file mode 100644
index 99183b307658..000000000000
--- a/pfufs-post-sane-upgrade.hook
+++ /dev/null
@@ -1,9 +0,0 @@
-[Trigger]
-Operation = Upgrade
-Type = Package
-Target = sane
-
-[Action]
-Description = Patching sane's fujitsu.conf to ignore devices supported by the pfufs driver
-When = PostTransaction
-Exec = /usr/bin/patch /etc/sane.d/fujitsu.conf /opt/pfufs/etc/sane.d/fujitsu.conf.patch
diff --git a/pfufs-pre-sane-upgrade.hook b/pfufs-pre-sane-upgrade.hook
deleted file mode 100644
index d2a747ae6def..000000000000
--- a/pfufs-pre-sane-upgrade.hook
+++ /dev/null
@@ -1,9 +0,0 @@
-[Trigger]
-Operation = Upgrade
-Type = Package
-Target = sane
-
-[Action]
-Description = Reverting pfufs' patches to sane's fujitsu.conf
-When = PreTransaction
-Exec = /usr/bin/patch -R /etc/sane.d/fujitsu.conf /opt/pfufs/etc/sane.d/fujitsu.conf.patch
diff --git a/pfufs.install b/pfufs.install
deleted file mode 100644
index 89adf0388e81..000000000000
--- a/pfufs.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
- echo "Patching sane's fujitsu.conf to ignore devices supported by the pfufs driver"
- /usr/bin/patch /etc/sane.d/fujitsu.conf /opt/pfufs/etc/sane.d/fujitsu.conf.patch
-}
-
-pre_remove() {
- echo "Reverting pfufs' patches to sane's fujitsu.conf"
- /usr/bin/patch -R /etc/sane.d/fujitsu.conf /opt/pfufs/etc/sane.d/fujitsu.conf.patch
-}