python/thonny: Updated for version 2.2.0b2.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 15 insertions, 23 deletions

diff --git a/python/thonny/slack-desc b/python/thonny/slack-desc
index 1d72f573ce..98cfe6500a 100644
--- a/python/thonny/slack-desc
+++ b/python/thonny/slack-desc
@@ -10,7 +10,7 @@ thonny: thonny (simple Python IDE)
 thonny:
 thonny: Thonny is a Python IDE meant for learning programming.
 thonny:
-thonny: Homepage: http://thonny.org
+thonny: Homepage: http://thonny.org/
 thonny:
 thonny:
 thonny:
diff --git a/python/thonny/thonny.SlackBuild b/python/thonny/thonny.SlackBuild
index 09277e3adf..c859c7094f 100644
--- a/python/thonny/thonny.SlackBuild
+++ b/python/thonny/thonny.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=thonny
-VERSION=${VERSION:-2.1.17}
+VERSION=${VERSION:-2.2.0b2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -37,11 +37,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-#thonny comes packaged with a python executable. we don't care which
-#flavour x86/x86_64 as we just extract the (no-arch) python files
-tar -xzf $CWD/$PRGNAM-$VERSION-x86_64.tar.gz
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar -xzf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -50,23 +48,17 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 install -D -m0755 $CWD/$PRGNAM.sh $PKG/usr/bin/$PRGNAM
-
 mkdir -p $PKG/opt/$PRGNAM
-cp -r lib/python3.6/site-packages/$PRGNAM/* $PKG/opt/$PRGNAM
-
+cp -r $PRGNAM/* $PKG/opt/$PRGNAM
 mkdir -p $PKG/usr/share/applications
-#patch desktop file to point to correct places.
-sed -i "/^Exec/c\Exec=\/usr\/bin\/thonny %F" templates/Thonny.desktop
-sed -i "/^Icon/c\Icon=thonny.png" templates/Thonny.desktop
-cp -a templates/Thonny.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-
+cp -a packaging/linux/org.thonny.Thonny.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 mkdir -p $PKG/usr/share/pixmaps
-cp -a lib/python3.6/site-packages/thonny/res/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
-
+cp -a packaging/icons/$PRGNAM-*.png $PKG/usr/share/pixmaps/
+cp -a packaging/icons/$PRGNAM-128x128.png $PKG/usr/share/pixmaps/$PRGNAM.png
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a lib/python3.6/site-packages/thonny-2.1.17.dist-info/DESCRIPTION.rst \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt  $PKG/usr/doc/$PRGNAM-$VERSION
+for i in CREDITS.rst README.rst CHANGELOG.rst LICENSE.txt; do
+  cp $i $PKG/usr/doc/$PRGNAM-$VERSION
+done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/thonny/thonny.info b/python/thonny/thonny.info
index d1e5282a9d..40b325e212 100644
--- a/python/thonny/thonny.info
+++ b/python/thonny/thonny.info
@@ -1,8 +1,8 @@
 PRGNAM="thonny"
-VERSION="2.1.17"
+VERSION="2.2.0b2"
 HOMEPAGE="http://thonny.org/"
-DOWNLOAD="https://bitbucket.org/plas/thonny/downloads/thonny-2.1.17-x86_64.tar.gz"
-MD5SUM="f79d07f0115387176be9f034f2e9e6f7"
+DOWNLOAD="https://pypi.debian.net/thonny/thonny-2.2.0b2.tar.gz"
+MD5SUM="f86a0e31a3e61bfdcb5beb991d307a46"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-jedi"