7.0.0a3

2 files changed, 23 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0115a48d810e..a54754880623 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jun 19 19:35:09 UTC 2016
+# Mon Jan 30 18:39:41 UTC 2017
 pkgbase = tribler
 	pkgdesc = Privacy with BitTorrent and resilient to shut down
-	pkgver = 6.5.2
+	pkgver = 7.0.0a3
 	pkgrel = 1
 	url = http://www.tribler.org/
 	arch = any
@@ -14,17 +14,22 @@ pkgbase = tribler
 	depends = python2-cherrypy
 	depends = python2-plyvel
 	depends = python2-pillow
+	depends = python2-pyqt5
+	depends = qt5-svg
+	depends = phonon-qt5-vlc
+	depends = python2-feedparser
+	depends = python2-chardet
 	depends = python2-decorator
 	depends = python2-netifaces
 	depends = python2-requests
 	depends = python2-twisted
-	depends = wxpython2.8
 	depends = libsodium
 	depends = libtorrent-rasterbar
 	depends = python2-m2crypto
+	depends = python2-configobj
 	optdepends = vlc: for internal video player
-	source = https://github.com/Tribler/tribler/releases/download/v6.5.2/Tribler-v6.5.2.tar.xz
-	sha1sums = 7cab5f39486aef1cb170bde37213972ed6485093
+	source = https://github.com/Tribler/tribler/releases/download/v7.0.0-alpha3/Tribler-v7.0.0-alpha3.tar.xz
+	sha1sums = 31e27807883b8361a13667396dd4b011d0f35b38
 
 pkgname = tribler
 
diff --git a/PKGBUILD b/PKGBUILD
index 8235ef109360..921c6140d060 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,17 @@
-
 pkgname=tribler
-pkgver=6.5.2
+pkgver=7.0.0a3
+_pkgver=7.0.0-alpha3
 pkgrel=1
 pkgdesc="Privacy with BitTorrent and resilient to shut down"
 url="http://www.tribler.org/"
 arch=(any)
 license=('LGPL')
-depends=('python2-cryptography' 'python2-feedparser' 'python2-apsw' 'python2-cherrypy' 'python2-plyvel' 'python2-pillow'
-'python2-decorator' 'python2-netifaces' 'python2-requests' 'python2-twisted' 'wxpython2.8' 'libsodium' 'libtorrent-rasterbar' 'python2-m2crypto')
+depends=('python2-cryptography' 'python2-feedparser' 'python2-apsw' 'python2-cherrypy' 'python2-plyvel' 'python2-pillow' 'python2-pyqt5' 'qt5-svg' 'phonon-qt5-vlc' 'python2-feedparser' 'python2-chardet'
+'python2-decorator' 'python2-netifaces' 'python2-requests' 'python2-twisted' 'libsodium' 'libtorrent-rasterbar' 'python2-m2crypto' 'python2-configobj')
 optdepends=('vlc: for internal video player')
 makedepends=('python2-setuptools')
-source=("https://github.com/Tribler/tribler/releases/download/v${pkgver}/Tribler-v${pkgver}.tar.xz")
-sha1sums=('7cab5f39486aef1cb170bde37213972ed6485093')
-
-prepare()
-{
-  cd "${srcdir}/tribler"
-  cat > tribler <<EOF
-#!/bin/sh
-python2 -m Tribler.Main.tribler
-EOF
-}
+source=("https://github.com/Tribler/tribler/releases/download/v${_pkgver}/Tribler-v${_pkgver}.tar.xz")
+sha1sums=('31e27807883b8361a13667396dd4b011d0f35b38')
 
 build () {
   cd "${srcdir}/tribler"
@@ -29,15 +20,18 @@ build () {
 
 package() {
   cd "${srcdir}/tribler"
-  python2 setup.py install --root=${pkgdir}
+  python2 setup.py install --root=${pkgdir} --optimize=1
   install -d "${pkgdir}"/usr/{bin,share/tribler}
   cp -r Tribler "${pkgdir}"/usr/share/tribler
-  find "${pkgdir}"/usr/share/tribler -name "*.py" -delete
-  install -m644 logger.conf "${pkgdir}"/usr/share/tribler/
+  cp -r TriblerGUI "${pkgdir}"/usr/share/tribler
+  cp Tribler/schema_sdb_v*.sql "${pkgdir}"/usr/share/tribler/Tribler
   install -d "${pkgdir}"/usr/share/{applications,pixmaps}
   install -m644 Tribler/Main/Build/Ubuntu/tribler.desktop "${pkgdir}"/usr/share/applications
   install -m644 Tribler/Main/Build/Ubuntu/tribler.xpm "${pkgdir}"/usr/share/pixmaps
   install -m644 Tribler/Main/Build/Ubuntu/tribler_big.xpm "${pkgdir}"/usr/share/pixmaps
-  install -m755 tribler "${pkgdir}"/usr/bin
+  install -m755 debian/bin/tribler "${pkgdir}"/usr/bin
+  install -m644 logger.conf "${pkgdir}"/usr/share/tribler/
+  install -m644 run_tribler.py "${pkgdir}"/usr/share/tribler/
+  cp -r twisted "${pkgdir}"/usr/share/tribler
 }