[arch-commits] Commit in impressive/trunk (2 files)

[Jaroslav Lichtblau]

    Date: Tuesday, January 14, 2014 @ 22:19:34
  Author: jlichtblau
Revision: 104045

upgpkg: impressive 0.10.4-1

Modified:
  impressive/trunk/PKGBUILD
Deleted:
  impressive/trunk/impressive-0.10.3-pillow-compat.patch

---------------------------------------+
 PKGBUILD                              |   17 ++++-------------
 impressive-0.10.3-pillow-compat.patch |   13 -------------
 2 files changed, 4 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-14 19:45:06 UTC (rev 104044)
+++ PKGBUILD	2014-01-14 21:19:34 UTC (rev 104045)
@@ -5,8 +5,8 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=impressive
-pkgver=0.10.3
-pkgrel=8
+pkgver=0.10.4
+pkgrel=1
 pkgdesc='A fancy PDF presentation program (previously known as KeyJNote).'
 arch=('any')
 url='http://impressive.sourceforge.net'
@@ -14,20 +14,12 @@
 depends=('python2-pygame' 'python2-opengl' 'python2-pillow' 'ghostscript')
 optdepends=('xdg-utils: for starting web or e-mail hyperlinks from PDF documents'
             'mplayer: for sound and video playback')
-provides=('keyjnote=0.10.3')
-conflicts=('keyjnote')
-replaces=('keyjnote')
-source=(http://downloads.sourceforge.net/${pkgname}/Impressive-${pkgver}.tar.gz
-        impressive-0.10.3-pillow-compat.patch)
-md5sums=('1fefb25db71ee322a59353de85ae00b4'
-         '7f112309f3faebca123ff576c9d28c1c')
+source=(http://downloads.sourceforge.net/${pkgname}/Impressive-${pkgver}.tar.gz)
+md5sums=('17a54e914069b2fea9fe35dd28ada38d')
 
 prepare() {
   cd "${srcdir}/Impressive-${pkgver}"
 
-  # replace Import Image with from PIL import Image
-  patch -Np1 -i ${srcdir}/impressive-0.10.3-pillow-compat.patch
-
 # python2 fix
   for file in $(find . -name '*.py' -print); do
       sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
@@ -40,7 +32,6 @@
 
   install -d -m755 "${pkgdir}"/usr/{bin,share/{doc/${pkgname},man/man1}}
   install -m755 ${pkgname}.py "${pkgdir}/usr/bin/${pkgname}"
-  ln -s ${pkgname} "${pkgdir}/usr/bin/keyjnote"
   install -m644 ${pkgname}.html demo.pdf changelog.txt "${pkgdir}/usr/share/doc/${pkgname}/"
   install -m644 ${pkgname}.1 "${pkgdir}/usr/share/man/man1/"
 }

Deleted: impressive-0.10.3-pillow-compat.patch
===================================================================
--- impressive-0.10.3-pillow-compat.patch	2014-01-14 19:45:06 UTC (rev 104044)
+++ impressive-0.10.3-pillow-compat.patch	2014-01-14 21:19:34 UTC (rev 104045)
@@ -1,13 +0,0 @@
---- Impressive-0.10.3.orig/impressive.py
-+++ Impressive-0.10.3/impressive.py
-@@ -182,8 +182,8 @@ try:
-     from OpenGL.GL import *
-     import pygame
-     from pygame.locals import *
--    import Image, ImageDraw, ImageFont, ImageFilter
--    import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin
-+    from PIL import Image, ImageDraw, ImageFont, ImageFilter
-+    from PIL import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin
- except (ValueError, ImportError), err:
-     print >>sys.stderr, "Oops! Cannot load necessary modules:", err
-     print >>sys.stderr, """To use Impressive, you need to install the following Python modules: