Updated package iscan-plugin-gt-s650 1.3.22-2

3 files changed, 20 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 134be529c1e4..b018b60c55a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 # Generated by mksrcinfo v8
-# Sun Oct 15 23:51:33 UTC 2017
+# Wed Nov  1 18:31:53 UTC 2017
 pkgbase = iscan-plugin-gt-s650
 	pkgdesc = EPSON Image Scan! plugin for Epson scanners (DS, EP, ES, ET, EW, L, LX, PX, WF, XP Series, FF-640, GT-S650, Perfection V19, Perfection V39)
 	pkgver = 1.3.22
-	pkgrel = 1
+	pkgrel = 2
 	url = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 	install = iscan-plugin-gt-s650.install
 	arch = i686
 	arch = x86_64
 	license = custom:AVASYSPL
 	depends = iscan
+	depends = iscan-data
 	source_i686 = https://download2.ebz.epson.net/iscan/plugin/gt-s650/deb/x86/iscan-gt-s650-bundle-1.0.0.x86.deb.tar.gz
 	sha256sums_i686 = 6f12a5d7b3c1a08a6c5f8762e1cff7ee89063eb73ec723f1822d3fa10c5b50f9
 	source_x86_64 = https://download2.ebz.epson.net/iscan/plugin/gt-s650/deb/x64/iscan-gt-s650-bundle-1.0.0.x64.deb.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 16ea66e3d340..0bb56300573a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 
 pkgname=iscan-plugin-gt-s650
 pkgver=1.3.22
-pkgrel=1
+pkgrel=2
 pkgdesc="EPSON Image Scan! plugin for Epson scanners (DS, EP, ES, ET, EW, L, LX, PX, WF, XP Series, FF-640, GT-S650, Perfection V19, Perfection V39)"
 arch=('i686' 'x86_64')
 url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 license=('custom:AVASYSPL')
-depends=('iscan')
+depends=('iscan' 'iscan-data')
 _plugin=${pkgname/iscan-plugin-/}
 _iscan_ver=1.0.0
 _plugin_rel=2
@@ -29,24 +29,29 @@ fi
 
 build() {
   cd "iscan-${_plugin}-bundle-${_iscan_ver}.${_filearch}.deb/plugins"
-  bsdtar -xf ${pkgname}_${_file_ver}-${_plugin_rel}_${_debarch}.deb
+  bsdtar -xf "${pkgname}_${_file_ver}-${_plugin_rel}_${_debarch}.deb"
   bsdtar -xf data.tar.gz
   gzip -fkd "usr/share/doc/${pkgname}/NEWS.gz"
 }
 
 package() {
   cd "iscan-${_plugin}-bundle-${_iscan_ver}.${_filearch}.deb/plugins/usr"
+  # Install plugins
   install -m 755 -d "${pkgdir}/usr/lib/iscan"
-  install -m 644 -t "${pkgdir}/usr/lib/iscan" "lib/iscan/libiscan-plugin-gt-s650.so.0.0.0"
-  ln -s libiscan-plugin-gt-s650.so.0.0.0 "${pkgdir}/usr/lib/iscan/libiscan-plugin-gt-s650.so"
-  ln -s libiscan-plugin-gt-s650.so.0.0.0 "${pkgdir}/usr/lib/iscan/libiscan-plugin-gt-s650.so.0"
-
+  install -m 644 -t "${pkgdir}/usr/lib/iscan" "lib/iscan/lib${pkgname}.so.0.0.0"
+  ln -s "lib${pkgname}.so.0.0.0" "${pkgdir}/usr/lib/iscan/lib${pkgname}.so"
+  ln -s "lib${pkgname}.so.0.0.0" "${pkgdir}/usr/lib/iscan/lib${pkgname}.so.0"
+  # Install firmwares
   install -m 755 -d "${pkgdir}/usr/share/iscan"
   install -m 644 -t "${pkgdir}/usr/share/iscan" "share/iscan/esfw010c.bin"
-
+  # Install shared data
+  install -m 755 -d "${pkgdir}/usr/share/iscan-data/device"
+  install -m 644 -t "${pkgdir}/usr/share/iscan-data/device" "share/iscan-data/device/50657266656374696f6e20563139.xml"
+  install -m 644 -t "${pkgdir}/usr/share/iscan-data/device" "share/iscan-data/device/50657266656374696f6e20563339.xml"
+  # Install documentation
   install -m 755 -d "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m 644 -t "${pkgdir}/usr/share/doc/${pkgname}" "share/doc/${pkgname}"/{NEWS,README}
-
+  install -m 644 -t "${pkgdir}/usr/share/doc/${pkgname}" "share/doc/${pkgname}/NEWS"
+  # Install licenses
   install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m 644 "share/doc/${pkgname}/AVASYSPL.en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL"
 }
diff --git a/iscan-plugin-gt-s650.install b/iscan-plugin-gt-s650.install
index 65d9bba2d7a5..00b63af4841d 100644
--- a/iscan-plugin-gt-s650.install
+++ b/iscan-plugin-gt-s650.install
@@ -1,5 +1,5 @@
 post_install() {
-  echo "Running iscan-registry to register plugins and firmware with iscan"
+  echo "Registering iscan plugins and firmwares"
   for id in 0x013c 0x013d; do
     iscan-registry --add interpreter usb 0x04b8 $id \
       /usr/lib/iscan/libiscan-plugin-gt-s650 \
@@ -8,7 +8,7 @@ post_install() {
 }
 
 pre_remove() {
-  echo "Unregistering gt-x700 plugins/firmware"
+  echo "Unregistering iscan plugins and firmwares"
   for id in 0x013c 0x013d; do
     iscan-registry --remove interpreter usb 0x04b8 $id \
       /usr/lib/iscan/libiscan-plugin-gt-s650