Updated to 9.3.0

4 files changed, 34 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed88ea79ebe5..d7a31f096e95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,30 @@
 pkgbase = dbmain
 	pkgdesc = A free data-modeling and data-architecture tool
-	pkgver = 9.2.0
-	pkgrel = 3
+	pkgver = 9.3.0
+	pkgrel = 1
 	url = http://www.db-main.eu/
 	arch = i686
 	arch = x86_64
 	license = custom
-	depends = java-environment
+	depends = java-runtime
 	depends = coreutils
-	provides = dbmain
-	source = http://intranet.rever.eu/DISTRIBUTION/DB-MAIN/dbm-920-linux-setup.tar.gz
+	depends = sdl
+	depends = libjpeg6-turbo
+	depends = gtk2
+	depends = libpng12
+	depends = libsm
+	depends = alsa-lib
+	depends = libxtst
 	source = dbmain.sh
 	source = dbmain.desktop
 	source = dbmain.png
-	md5sums = 4cabf077d9989378de9024f3b320a9e9
-	md5sums = 41cb50cf6a2a72cfc0b632d690726223
-	md5sums = d19295f8f8430c66157722d450149b93
+	md5sums = b39e20bbd5360fd70b7b23f0f69689d4
+	md5sums = 048f1f5f6fe6e5b29d8e7cbeb825103d
 	md5sums = 6bb248b5807368118996f3f5ad2edb68
+	source_i686 = http://intranet.rever.eu/DISTRIBUTION/DB-MAIN/dbm-930-linux-i386-setup.tar.gz
+	md5sums_i686 = 135f604257f68d221ca82a4f55054a40
+	source_x86_64 = http://intranet.rever.eu/DISTRIBUTION/DB-MAIN/dbm-930-linux-amd64-setup.tar.gz
+	md5sums_x86_64 = 9dc45b2090fafd4b61526960cf521a84
 
 pkgname = dbmain
 
diff --git a/PKGBUILD b/PKGBUILD
index 12936d83c53b..b0f040874675 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,25 @@
-# Maintainer: Ludovico de Nittis <aasonykk [at] gmail [dot] com>
+# Contributor: WorMzy Tykashi <wormzy.tykashi@gmail.com>
+# Contributor: Ludovico de Nittis <aasonykk [at] gmail [dot] com>
 # Contributor: Eric Engestrom <aur [at] engestrom [dot] ch>
 
 pkgname=dbmain
-pkgver=9.2.0
-pkgrel=3
+pkgver=9.3.0
+pkgrel=1
 pkgdesc="A free data-modeling and data-architecture tool"
 arch=(i686 x86_64)
 url=http://www.db-main.eu/
 license=(custom)
-depends=(java-environment coreutils)
-if test "$CARCH" == 'i686'; then
-  depends+=(sdl)
-  depends+=(libjpeg6-turbo)
-  depends+=(gtk2)
-  depends+=(libpng12)
-  depends+=(libsm)
-  depends+=(alsa-lib)
-  depends+=(libxtst)
-fi
-if test "$CARCH" == 'x86_64'; then
-  depends+=(lib32-sdl)
-  depends+=(lib32-libjpeg6-turbo)
-  depends+=(lib32-gtk2)
-  depends+=(lib32-libpng12)
-  depends+=(lib32-libsm)
-  depends+=(lib32-alsa-lib)
-  depends+=(lib32-libxtst)
-fi
-provides=(dbmain)
-source=("http://intranet.rever.eu/DISTRIBUTION/DB-MAIN/dbm-${pkgver//.}-linux-setup.tar.gz"
-        $pkgname.sh
-        $pkgname.desktop
-        $pkgname.png)
-md5sums=('4cabf077d9989378de9024f3b320a9e9'
-         '41cb50cf6a2a72cfc0b632d690726223'
-         'd19295f8f8430c66157722d450149b93'
+depends=(java-runtime coreutils sdl libjpeg6-turbo gtk2 libpng12 libsm alsa-lib libxtst)
+source_i686=("http://intranet.rever.eu/DISTRIBUTION/DB-MAIN/dbm-${pkgver//.}-linux-i386-setup.tar.gz")
+source_x86_64=("http://intranet.rever.eu/DISTRIBUTION/DB-MAIN/dbm-${pkgver//.}-linux-amd64-setup.tar.gz")
+source=(${pkgname}.sh
+        ${pkgname}.desktop
+        ${pkgname}.png)
+md5sums=('b39e20bbd5360fd70b7b23f0f69689d4'
+         '048f1f5f6fe6e5b29d8e7cbeb825103d'
          '6bb248b5807368118996f3f5ad2edb68')
+md5sums_i686=('135f604257f68d221ca82a4f55054a40')
+md5sums_x86_64=('9dc45b2090fafd4b61526960cf521a84')
 
 package(){
   cd "${srcdir}"
@@ -46,14 +30,8 @@ package(){
 
   # Launch script
   install -d "${pkgdir}/usr/bin/"
-  install -Dm644 "bin/libdbmfunc.so" "${pkgdir}/opt/dbmain/bin"
-  install -Dm644 "bin/libjidbm.so" "${pkgdir}/opt/dbmain/bin"
-  install -Dm644 "bin/libextr_ids.so" "${pkgdir}/opt/dbmain/bin"
-  install -Dm644 "bin/libextr_cob.so" "${pkgdir}/opt/dbmain/bin"
-  install -Dm644 "bin/libextr_ims.so" "${pkgdir}/opt/dbmain/bin"
-  install -Dm644 "bin/libextr_pl1.so" "${pkgdir}/opt/dbmain/bin"
-  install -Dm644 "$pkgname.desktop" "${pkgdir}/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
   install -m755 dbmain.sh "${pkgdir}/usr/bin/dbmain"
 
   # LICENSE file
diff --git a/dbmain.desktop b/dbmain.desktop
index 59416b442670..96b27a7166db 100644
--- a/dbmain.desktop
+++ b/dbmain.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=DB-Main
 Comment=A free data-modeling and data-architecture tool
-Exec=dbmain
+Exec=/usr/bin/dbmain
 Icon=dbmain
 Terminal=false
 Type=Application
diff --git a/dbmain.sh b/dbmain.sh
index 8958f7f44f2b..4b09f7f7761e 100755
--- a/dbmain.sh
+++ b/dbmain.sh
@@ -6,7 +6,7 @@ fi
 
 export DB_MAIN_BIN=/opt/dbmain/bin
 export PATH=$DB_MAIN_BIN:$PATH
-export LD_LIBRARY_PATH=$DB_MAIN_BIN:$DB_MAIN_BIN/../java/jre/lib/i386/client:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$DB_MAIN_BIN:$DB_MAIN_BIN/../java/jre/lib/i386/client:$DB_MAIN_BIN/../java/jre/lib/amd64/server:$LD_LIBRARY_PATH
 #CLASSPATH modification only for dbm-deasy-9xx-linux-setup.tar.gz
 export CLASSPATH=.:$DB_MAIN_BIN/../plugins/deasy/lib/jidbmjava.jar:$DB_MAIN_BIN/../plugins/deasy/lib/sqlite-jdbc-3.6.20.1.jar:$CLASSPATH
 cd $DB_MAIN_BIN