Updated to version 0.2.6

3 files changed, 16 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e11019fac694..8b2d761981e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,26 @@
 # Generated by mksrcinfo v8
-# Sat Apr 30 08:28:21 UTC 2016
+# Wed Feb 22 16:31:10 UTC 2017
 pkgbase = qtgrace
 	pkgdesc = A program to display or plot data, analyze data and prepare it for printing, Qt version of the Grace
-	pkgver = 0.2.5
+	pkgver = 0.2.6
 	pkgrel = 1
 	url = http://plasma-gate.weizmann.ac.il/Grace/
-	install = qtgrace.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = qtwebkit
 	optdepends = fftw: for better fourier-transformation
 	optdepends = libharu: for pdf-output
-	source = http://downloads.sourceforge.net/sourceforge/qtgrace/qtgrace_v025a_src.zip
+	source = http://downloads.sourceforge.net/sourceforge/qtgrace/qtgrace_v026_src.zip
 	source = qtgrace.png
 	source = qtgrace.desktop
 	source = qtgrace-mimetypes
 	source = qtgrace
-	md5sums = c6b2729f510176f20ad2c51b789ea6ba
+	md5sums = 62691b5e135e6d13177ee070bcd33f24
 	md5sums = 935df82970eaf9b38b1f5ab26ed45a8d
 	md5sums = d1bbdd58b4479f4dc27b0bee3d8d0fca
 	md5sums = 3beba5237f56a2ff28b6cd878865b25c
 	md5sums = 21b708638a6d63224e05582873be0e4f
-	sha256sums = db8fde7b32e9a3ab87de1ff0be6b532037d7b32afe2d436314f3db67a97cc894
+	sha256sums = e52fdb04f45c992610be37b1cc4ea1366cce255d9a24f19b9521b8e68808c4b1
 	sha256sums = 53285847eb5214a8ef86593bb1f2791d6e01cfed4bb97323ad86d070ed3f6b98
 	sha256sums = b8351ba9f8a7cd5033eb453ab56e01771aba02b47d3ab4b70f29b4a138a55a36
 	sha256sums = 00c16404b9c9386c32a298a3ec8842d2bef8ad6b278a817157ee4af65fcf1479
diff --git a/PKGBUILD b/PKGBUILD
index 3f0b14171cfe..c7bf4f4df0d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,32 @@
 
 
 pkgname=qtgrace
-pkgver=0.2.5
-_pkgver=025a
+pkgver=0.2.6
+_pkgver=026
+_pkgdirname=qtgrace_v026_src
 pkgrel=1
 pkgdesc="A program to display or plot data, analyze data and prepare it for printing, Qt version of the Grace"
 arch=('i686' 'x86_64')
 url="http://plasma-gate.weizmann.ac.il/Grace/"
 #url="http://sourceforge.net/projects/qtgrace/"
 license=('GPL')
-depends=('qtwebkit')
+#depends=('qtwebkit')
 optdepends=('fftw: for better fourier-transformation'
             'libharu: for pdf-output')
-install=qtgrace.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_v${_pkgver}_src.zip $pkgname.png $pkgname.desktop $pkgname-mimetypes qtgrace)
-md5sums=('c6b2729f510176f20ad2c51b789ea6ba'
+md5sums=('62691b5e135e6d13177ee070bcd33f24'
          '935df82970eaf9b38b1f5ab26ed45a8d'
          'd1bbdd58b4479f4dc27b0bee3d8d0fca'
          '3beba5237f56a2ff28b6cd878865b25c'
          '21b708638a6d63224e05582873be0e4f')
-sha256sums=('db8fde7b32e9a3ab87de1ff0be6b532037d7b32afe2d436314f3db67a97cc894'
+sha256sums=('e52fdb04f45c992610be37b1cc4ea1366cce255d9a24f19b9521b8e68808c4b1'
             '53285847eb5214a8ef86593bb1f2791d6e01cfed4bb97323ad86d070ed3f6b98'
             'b8351ba9f8a7cd5033eb453ab56e01771aba02b47d3ab4b70f29b4a138a55a36'
             '00c16404b9c9386c32a298a3ec8842d2bef8ad6b278a817157ee4af65fcf1479'
             '7ee2c36f058bbac902fd52b88b2129e43b39c34828281d45342d1b09ac262d79')
 
 build() {
-  cd "$srcdir/${pkgname}_src/src"
+  cd "$srcdir/${_pkgdirname}/src"
 
   DESTDIR="${pkgdir}" PREFIX="/usr" qmake-qt4 src.pro
   make
@@ -36,10 +36,10 @@ package() {
   cd "${srcdir}"
 
   install -d -m755 "${pkgdir}/usr/share/${pkgname}"
-  cp -r "${pkgname}_src/bin" "${pkgdir}/usr/share/${pkgname}"
-  cp -r "${pkgname}_src/fonts" "${pkgdir}/usr/share/${pkgname}"
-  cp -r "${pkgname}_src/examples" "${pkgdir}/usr/share/${pkgname}"
-  cp -r "${pkgname}_src/doc" "${pkgdir}/usr/share/${pkgname}"
+  cp -r "${_pkgdirname}/bin" "${pkgdir}/usr/share/${pkgname}"
+  cp -r "${_pkgdirname}/fonts" "${pkgdir}/usr/share/${pkgname}"
+  cp -r "${_pkgdirname}/examples" "${pkgdir}/usr/share/${pkgname}"
+  cp -r "${_pkgdirname}/doc" "${pkgdir}/usr/share/${pkgname}"
   find "${pkgdir}/usr/share/${pkgname}/" \( -type d -exec chmod 755 {} \; \) -o \( -type f -exec chmod 644 {} \; \)
   chmod 755 "${pkgdir}/usr/share/${pkgname}/bin/${pkgname}"
 
diff --git a/qtgrace.install b/qtgrace.install
deleted file mode 100644
index d441bb310a60..000000000000
--- a/qtgrace.install
+++ /dev/null
@@ -1,32 +0,0 @@
-update_icons() {
-
-	# Setup Menus
-	if which update-desktop-database
-	then
-		update-desktop-database -q /usr/share/applications > /dev/null 2>&1
-	fi
-
-	# Setup MIME types
-	if which update-mime-database
-	then
-		update-mime-database /usr/share/mime > /dev/null 2>&1
-	fi
-
-}
-
-
-post_install() {
-    update_icons
-    echo ">> Activate FFTW3- and libHaru(PDF)-support:"
-    echo ">> See Preferences-->Micellaneous and see whether the libraries are usable and activated."
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    update_icons
-}
-
-