ver. 4.0 package creation restored

4 files changed, 11 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1f35e7865a6..ec9dcac10f48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = booktab
 	pkgdesc = MyZanichelli - La piattaforma che ti permette di consultare tutti i tuoi libri scolastici in versione multimediale e interattiva.
 	pkgver = 4.0
-	pkgrel = 6
+	pkgrel = 8
 	url = https://booktab.it/
 	arch = x86_64
 	license = unknown
@@ -18,13 +18,11 @@ pkgbase = booktab
 	depends = libpulse
 	depends = qt5-svg
 	depends = qt5-webkit
-	noextract = BooktabZSetup.deb
-	source = https://booktab.it/setup-z/BooktabZSetup.deb
-	source = booktab.desktop
-	source = booktab_launcher
+	depends = qt5-multimedia
+	depends = qt5-webengine
+	noextract = BooktabZSetup-4.0.deb
+	source = https://booktab.it/setup-z/BooktabZSetup-4.0.deb
 	md5sums = 1672cd7af08028fea1dfc1e57ee1854f
-	md5sums = 9d8fcee082b5011aeb0234fca6d02fda
-	md5sums = aacc6b709717c15a8437fced7a351c8d
 
 pkgname = booktab
 
diff --git a/PKGBUILD b/PKGBUILD
index dcee035e5bd4..fafd8076c1f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,17 @@
 
 pkgname=booktab
 pkgver=4.0
-pkgrel=6
+pkgrel=8
 pkgdesc="MyZanichelli - La piattaforma che ti permette di consultare tutti i tuoi libri scolastici in versione multimediale e interattiva."
 arch=('x86_64')
 url="https://booktab.it/"
 license=('unknown')
-depends=("fontconfig" "libxrandr" "libxdamage" "libcups" "nss" "libpng12" "icu55" "libxcursor" "libxinerama" "gstreamer0.10-base" "libpulse" "qt5-svg" "qt5-webkit")
+depends=("fontconfig" "libxrandr" "libxdamage" "libcups" "nss" "libpng12" "icu55" "libxcursor" "libxinerama" "gstreamer0.10-base" "libpulse" "qt5-svg" "qt5-webkit" "qt5-multimedia" "qt5-webengine")
 
-_debname=BooktabZSetup.deb
+_debname=BooktabZSetup-4.0.deb
 
-source=(https://booktab.it/setup-z/${_debname} booktab.desktop booktab_launcher)
-md5sums=('1672cd7af08028fea1dfc1e57ee1854f'
-         '9d8fcee082b5011aeb0234fca6d02fda'
-         'aacc6b709717c15a8437fced7a351c8d')
+source=(https://booktab.it/setup-z/${_debname})
+md5sums=('1672cd7af08028fea1dfc1e57ee1854f')
 
 noextract=(${_debname})
 
@@ -29,13 +27,10 @@ package() {
   cd "$srcdir"
   install -dm755 "$pkgdir"/usr/share/applications
   install -dm755 "$pkgdir"/usr/bin
-  # install -m644 usr/share/applications/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+  install -m644 usr/share/applications/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
   # install -m644 usr/share/applications/"$pkgname"z.desktop "$pkgdir"/usr/share/applications/"$pkgname"z.desktop
   install -m755 usr/bin/booktab "$pkgdir"/usr/bin/booktab
 
-  install -m644 booktab.desktop "$pkgdir"/usr/share/applications/booktab.desktop
-  install -m755 booktab_launcher "$pkgdir"/usr/bin/booktab_launcher
-
   install -dm755 "$pkgdir"/usr/lib
   install -m644 usr/lib/libPDFNetC.so.6.5.3 "$pkgdir"/usr/lib/libPDFNetC.so.6.5.3
   ln -s ./libPDFNetC.so.6.5.3 "$pkgdir"/usr/lib/libPDFNetC.so
diff --git a/booktab.desktop b/booktab.desktop
deleted file mode 100644
index 43409f745315..000000000000
--- a/booktab.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=BooktabZ
-Comment=BooktabZ book reader
-Keywords=educational;
-TryExec=/usr/bin/booktab_launcher
-Exec=/usr/bin/booktab_launcher
-Icon=/usr/share/duDat/BooktabZ/booktab_icon_144x144.png
-Type=Application
-StartupNotify=true
diff --git a/booktab_launcher b/booktab_launcher
deleted file mode 100644
index 885380fe382a..000000000000
--- a/booktab_launcher
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-LD_LIBRARY_PATH=/usr/share/duDat/BooktabZ:$LD_LIBRARY_PATH booktab