summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD31
-rw-r--r--dell-unified-driver-scanner.install2
-rw-r--r--xerox_mfp-smfp.conf2
4 files changed, 21 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 05a8fc24fef8..61c728441369 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dell-unified-driver
pkgdesc = Drivers for Dell Printers and scanners Model #'s: s1130n 1130 1133 1135n 1815 2145cn 2335dn 2355dn 5330 B1160 B1160w B1165nfw B1260dn B1265dfw B1265dnf B2365dnf
pkgver = 1.03
- pkgrel = 2
+ pkgrel = 4
url = http://www.dell.com/support/home/us/en/19/drivers/driversdetails?driverId=C10W1
arch = i686
arch = x86_64
@@ -11,7 +11,7 @@ pkgbase = dell-unified-driver
source = 60_smfp_samsung.rules
source = 61_smfp_samsung.rules
sha256sums = a1aa742cd266f60ae756c5678cdc27ee5be788d3ec088694f2bd03efffc17e36
- sha256sums = e57b2f313a482d74d66329edcca70a383d83e8c9d1f93c489e7bf36f8b2b3785
+ sha256sums = b9472081403c05590c2b187db3f3e9825fd0e9dfa5ff12b6c574d802f2673d03
sha256sums = 490cd00d5f06243268940de90d9f1e402a67465bdc3a86dfc3466408e8d2007f
sha256sums = 53c603095748f9f554927ba8ea753a3c7913bcc45a6f701f41d307613f402d30
diff --git a/PKGBUILD b/PKGBUILD
index 4c731933b7d2..84e47ea0ceb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Drivers for Dell Printers and scanners Model #'s: s1130n 1130 1133 1135
url="http://www.dell.com/support/home/us/en/19/drivers/driversdetails?driverId=C10W1"
license=('custom:dell')
pkgver=1.03
-pkgrel=2
+pkgrel=4
arch=('i686' 'x86_64')
# this is the newest version found after a quick search
source=("$pkgname-$pkgver.tar.gz::https://downloads.dell.com/FOLDER01511597M/1/B1265dnf_Linux_v${pkgver}_Driver.tar.gz"
@@ -19,7 +19,7 @@ source=("$pkgname-$pkgver.tar.gz::https://downloads.dell.com/FOLDER01511597M/1/B
"60_smfp_samsung.rules"
"61_smfp_samsung.rules")
sha256sums=('a1aa742cd266f60ae756c5678cdc27ee5be788d3ec088694f2bd03efffc17e36'
- 'e57b2f313a482d74d66329edcca70a383d83e8c9d1f93c489e7bf36f8b2b3785'
+ 'b9472081403c05590c2b187db3f3e9825fd0e9dfa5ff12b6c574d802f2673d03'
'490cd00d5f06243268940de90d9f1e402a67465bdc3a86dfc3466408e8d2007f'
'53c603095748f9f554927ba8ea753a3c7913bcc45a6f701f41d307613f402d30')
@@ -67,7 +67,7 @@ package_dell-unified-driver-printer()
for i in ${_ppdmodels[@]}; do
# save some space
gzip < "$srcdir"/cdroot/Linux/noarch/at_opt/share/ppd/"$i".ppd > $srcdir/cdroot/Linux/noarch/at_opt/share/ppd/"$i".ppd.gz
- install -Dm644 "$srcdir"/cdroot/Linux/noarch/at_opt/share/ppd/"$i".ppd.gz "$pkgdir"/usr/share/cups/model/dell/"$i".ppd
+ install -Dm644 "$srcdir"/cdroot/Linux/noarch/at_opt/share/ppd/"$i".ppd.gz "$pkgdir"/usr/share/cups/model/dell/"$i".ppd.gz
done
_ctsmodels=(B1160sc B1160wsc B1165nfwsc B1260dnsc B1265dfwsc B1265dnfsc)
@@ -84,25 +84,28 @@ package_dell-unified-driver-scanner()
_locales=(ru fr)
for i in ${_locales[@]}; do
- install -Dm755 "$srcdir"/cdroot/Linux/noarch/at_root/usr/share/locale/"$i"/LC_MESSAGES/sane-smfp.mo "$pkgdir"/usr/share/locale/"$i"/LC_MESSAGES/sane-smfp.mo
+ install -Dm644 "$srcdir"/cdroot/Linux/noarch/at_root/usr/share/locale/"$i"/LC_MESSAGES/sane-smfp.mo "$pkgdir"/usr/share/locale/"$i"/LC_MESSAGES/sane-smfp.mo
done
- install -Dm755 "$srcdir"/cdroot/Linux/noarch/at_root/etc/sane.d/smfp.conf "$pkgdir"/etc/sane.d/smfp.conf
- install -Dm755 "$srcdir"/xerox_mfp-smfp.conf "$pkgdir"/etc/sand.d
+ install -Dm644 "$srcdir"/cdroot/Linux/noarch/at_root/etc/sane.d/smfp.conf "$pkgdir"/etc/sane.d/smfp.conf
+ install -Dm644 "$srcdir"/xerox_mfp-smfp.conf "$pkgdir"/etc/sane.d/xerox_mfp-smfp.conf
mkdir "$pkgdir"/etc/sane.d/dll.d
- echo "smpf" > "$pkgdir"/etc/sane.d/dll.d/smfp-scanner
- echo "xerox_mfp_smfp" > "$pkgdir"/etc/sane.d/dll.d/smfp-scanner-fix
+ echo "smfp" > "$pkgdir"/etc/sane.d/dll.d/smfp-scanner
+ echo "xerox_mfp-smfp" > "$pkgdir"/etc/sane.d/dll.d/smfp-scanner-fix
install -Dm755 "$srcdir"/cdroot/Linux/"$_arch"/at_root/usr/"$_libdir"/sane/libsane-smfp.so.1.0.1 "$pkgdir"/usr/lib/sane/libsane-smfp.so.1.0.1
- ln -s libsane-smfp.so.1.0.1 "$pkgdir"/usr/lib/sane/libsane-smfp.so.1
- ln -s libsane-smfp.so.1 "$pkgdir"/usr/lib/sane/libsane-smfp.so
+ ln -s libsane-smfp.so.1.0.1 "$pkgdir"/usr/lib/sane/libsane-smfp.so.1
+ ln -s libsane-smfp.so.1 "$pkgdir"/usr/lib/sane/libsane-smfp.so
- # we don't install smfpd, so this never gets uses afaik
- #install -Dm755 "$srcdir"/cdroot/Linux/"$_arch"/at_root/usr/lib/libmfp.so.1.0.1 "$pkgdir"/usr/lib/libmfp.so.1.0.1
- #ln -s libmfp.so.1.0.1 "$pkgdir"/usr/lib/libmfp.so.1
- #ln -s libmfp.so.1 "$pkgdir"/usr/lib/libmfp.so
+ install -Dm755 "$srcdir"/cdroot/Linux/"$_arch"/at_root/usr/"$_libdir"/libmfp.so.1.0.1 "$pkgdir"/usr/lib/libmfp.so.1.0.1
+ ln -s libmfp.so.1.0.1 "$pkgdir"/usr/lib/libmfp.so.1
+ ln -s libmfp.so.1 "$pkgdir"/usr/lib/libmfp.so
+
+ # install the old bundled version of libnetsnmp
+ install -Dm755 "$srcdir"/cdroot/Linux/"$_arch"/at_root/opt/smfp-common/lib/libnetsnmp.so.10.0.2 "$pkgdir"/usr/lib/libnetsnmp.so.10.0.2
+ ln -s libnetsnmp.so.10.0.2 "$pkgdir"/usr/lib/libnetsnmp.so.10
_udevrules=(60_smfp_samsung 61_smfp_samsung)
for i in ${_udevrules[@]}; do
diff --git a/dell-unified-driver-scanner.install b/dell-unified-driver-scanner.install
index 628e443c4b42..96f534426376 100644
--- a/dell-unified-driver-scanner.install
+++ b/dell-unified-driver-scanner.install
@@ -1,7 +1,7 @@
post_install() {
echo "> If \"scanimage -L\" returns \"No scanners were identified\" and your model number is in the description, try running \"sane-find-scanner\"."
echo "> If that finds your scanner, send the vendor= and product= to the maintainer of this package"
- echo "> In the meantime, add it manually to \"/etc/sane.d/xerox_mfp.conf\""
+ echo "> In the meantime, add it manually to \"/etc/sane.d/xerox_mfp-smfp.conf\""
}
post_upgrade() {
diff --git a/xerox_mfp-smfp.conf b/xerox_mfp-smfp.conf
index 4fb1ac13d704..73d52049feff 100644
--- a/xerox_mfp-smfp.conf
+++ b/xerox_mfp-smfp.conf
@@ -1,4 +1,4 @@
#xerox_mfp-smfp.conf
-# Dell Dell_B1165nfw_Mono_MFP
+# Dell B1165nfw Mono MFP
usb 0x413c 0x523c