Date: Sunday, September 15, 2013 @ 16:55:33 Author: bgyorgy Revision: 97236
archrelease: copy trunk to community-staging-any Added: gourmet/repos/community-staging-any/.contrib (from rev 97235, gourmet/trunk/.contrib) gourmet/repos/community-staging-any/PKGBUILD (from rev 97235, gourmet/trunk/PKGBUILD) gourmet/repos/community-staging-any/gourmet.install (from rev 97235, gourmet/trunk/gourmet.install) Deleted: gourmet/repos/community-staging-any/.contrib gourmet/repos/community-staging-any/PKGBUILD gourmet/repos/community-staging-any/gourmet.changelog gourmet/repos/community-staging-any/gourmet.install gourmet/repos/community-staging-any/pil.patch -------------------+ .contrib | 6 +-- PKGBUILD | 86 ++++++++++++++++++++++------------------------- gourmet.changelog | 48 -------------------------- gourmet.install | 22 ++++++------ pil.patch | 94 ---------------------------------------------------- 5 files changed, 54 insertions(+), 202 deletions(-) Deleted: .contrib =================================================================== --- .contrib 2013-09-15 14:55:28 UTC (rev 97235) +++ .contrib 2013-09-15 14:55:33 UTC (rev 97236) @@ -1,3 +0,0 @@ -# Contributor: Corrado Primier <ba...@aur.archlinux.org> -# Contributor: Eric Belanger <belan...@astro.umontreal.ca> -# Contributor: Andrew Conkling <andrew...@fr.st> Copied: gourmet/repos/community-staging-any/.contrib (from rev 97235, gourmet/trunk/.contrib) =================================================================== --- .contrib (rev 0) +++ .contrib 2013-09-15 14:55:33 UTC (rev 97236) @@ -0,0 +1,3 @@ +# Contributor: Corrado Primier <ba...@aur.archlinux.org> +# Contributor: Eric Belanger <belan...@astro.umontreal.ca> +# Contributor: Andrew Conkling <andrew...@fr.st> Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-09-15 14:55:28 UTC (rev 97235) +++ PKGBUILD 2013-09-15 14:55:33 UTC (rev 97236) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Ray Rashif <sc...@archlinux.org> -# Contributor: see .contrib - -pkgname=gourmet -pkgver=0.16.0 -pkgrel=2 -pkgdesc="A simple but powerful recipe-managing application" -arch=('any') -url="http://thinkle.github.io/gourmet/" -license=('GPL') -depends=('pygtk' 'python2-pillow' 'python2-sqlalchemy' 'hicolor-icon-theme') -makedepends=('python2-distutils-extra') -optdepends=('gstreamer0.10-python: play timer sounds' - 'ipython2: Python Shell plugin' - 'pyrtf: RTF support' - 'python2-beautifulsoup3: Webpage import plugin' - 'python2-gtkspell: Spell Checking plugin' - 'python2-poppler: Printing and PDF Export plugin' - 'python2-reportlab: Printing and PDF Export plugin') -changelog=$pkgname.changelog -install=$pkgname.install -source=("https://launchpad.net/gourmet/main/$pkgver/+download/$pkgname-$pkgver.tar.bz2" - "pil.patch") -md5sums=('6a4ddb80b40e1bee7797697f03c9ef82' - '6e90c8021d5949525e565c2607d2e6e6') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - # python-imaging -> python-pillow (relative PIL import) - patch -Np1 -i "$srcdir/pil.patch" -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - python2 setup.py install --root="$pkgdir" --optimize=1 -} Copied: gourmet/repos/community-staging-any/PKGBUILD (from rev 97235, gourmet/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-09-15 14:55:33 UTC (rev 97236) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: +# Contributor: Ray Rashif <sc...@archlinux.org> +# Contributor: see .contrib + +pkgname=gourmet +pkgver=0.16.1 +pkgrel=1 +pkgdesc="A simple but powerful recipe-managing application" +arch=('any') +url="http://thinkle.github.io/gourmet/" +license=('GPL') +depends=('pygtk' 'python2-pillow' 'python2-sqlalchemy' 'hicolor-icon-theme') +makedepends=('python2-distutils-extra') +optdepends=('gstreamer0.10-python: play timer sounds' + 'ipython2: Python Shell plugin' + 'pyrtf: RTF support' + 'python2-beautifulsoup3: Webpage import plugin' + 'python2-gtkspell: Spell Checking plugin' + 'python2-poppler: Printing and PDF Export plugin' + 'python2-reportlab: Printing and PDF Export plugin') +install=$pkgname.install +source=("$pkgname-$pkgver.tar.gz::https://github.com/thinkle/$pkgname/archive/$pkgver.tar.gz") +md5sums=('322814a7394d6bace7e0ef887efbe0f8') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 setup.py install --root="$pkgdir" --optimize=1 +} Deleted: gourmet.changelog =================================================================== --- gourmet.changelog 2013-09-15 14:55:28 UTC (rev 97235) +++ gourmet.changelog 2013-09-15 14:55:33 UTC (rev 97236) @@ -1,48 +0,0 @@ -2013-04-15 Balló György <ballogyor at gmail dot com> - - * Version bump: 0.16.0 - Upstream release - - * Update upstream URL - - * Update dependencies - - * Call gtk-update-icon-cache from install script - -2011-05-07 Ray Rashif <sc...@archlinux.org> - - * Version bump: 0.15.9 - Upstream release - -2011-01-28 Ray Rashif <sc...@archlinux.org> - - * Fixed some deps; see https://bugs.archlinux.org/task/22572 - -2010-12-08 Ray Rashif <sc...@archlinux.org> - - * Version bump: 0.15.6 - - * semantics.patch: removed, no longer needed - -2010-06-29 Ray Rashif <sc...@archlinux.org> - - * Version bump: 0.15.4 - - * PKGBUILD: added new changelog array - - * ChangeLog: changed to gourmet.changelog - - * semantics.patch: fixes upstream bug - -2009-08-27 Corrado Primier <ba...@aur.archlinux.org> - - * Version bump: 0.15.0 - -2009-04-18 Corrado Primier <ba...@aur.archlinux.org> - - * Version bump: 0.14.7 - - * PKGBUILD: moved to $srcdir/$pkgdir syntax, added optdepends, added - 'python-sqlalchemy' dependency, added 'intltool' make dependency - - * gourmet.install: removed Deleted: gourmet.install =================================================================== --- gourmet.install 2013-09-15 14:55:28 UTC (rev 97235) +++ gourmet.install 2013-09-15 14:55:33 UTC (rev 97236) @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} Copied: gourmet/repos/community-staging-any/gourmet.install (from rev 97235, gourmet/trunk/gourmet.install) =================================================================== --- gourmet.install (rev 0) +++ gourmet.install 2013-09-15 14:55:33 UTC (rev 97236) @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} Deleted: pil.patch =================================================================== --- pil.patch 2013-09-15 14:55:28 UTC (rev 97235) +++ pil.patch 2013-09-15 14:55:33 UTC (rev 97236) @@ -1,94 +0,0 @@ -diff -bur gourmet-0.16.0.orig/gourmet/exporters/exporter.py gourmet-0.16.0/gourmet/exporters/exporter.py ---- gourmet-0.16.0.orig/gourmet/exporters/exporter.py 2013-09-15 08:40:09.090420987 +0000 -+++ gourmet-0.16.0/gourmet/exporters/exporter.py 2013-09-15 09:00:15.000000000 +0000 -@@ -1,10 +1,15 @@ --import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types -+import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types - from gourmet import gglobals, convert - from gourmet.gdebug import * - from gettext import gettext as _ - from gourmet.plugin_loader import Pluggable, pluggable_method - from gourmet.plugin import BaseExporterPlugin, BaseExporterMultiRecPlugin - from gourmet.threadManager import SuspendableThread -+# Require PIL module. -+try: -+ from PIL import Image -+except ImportError: -+ import Image - - REC_ATTR_DIC = gglobals.REC_ATTR_DIC - DEFAULT_ATTR_ORDER = gglobals.DEFAULT_ATTR_ORDER -diff -bur gourmet-0.16.0.orig/gourmet/ImageExtras.py gourmet-0.16.0/gourmet/ImageExtras.py ---- gourmet-0.16.0.orig/gourmet/ImageExtras.py 2013-09-15 08:40:09.097087657 +0000 -+++ gourmet-0.16.0/gourmet/ImageExtras.py 2013-09-15 07:12:30.000000000 +0000 -@@ -1,5 +1,10 @@ --import os, os.path, tempfile, gtk, Image, StringIO -+import os, os.path, tempfile, gtk, StringIO - from gdebug import * -+# Require PIL module. -+try: -+ from PIL import Image -+except ImportError: -+ import Image - - TMPFILE = tempfile.mktemp(prefix='gourmet_tempfile_') - -diff -bur gourmet-0.16.0.orig/gourmet/plugins/import_export/html_plugin/html_exporter.py gourmet-0.16.0/gourmet/plugins/import_export/html_plugin/html_exporter.py ---- gourmet-0.16.0.orig/gourmet/plugins/import_export/html_plugin/html_exporter.py 2013-09-15 08:40:09.137087303 +0000 -+++ gourmet-0.16.0/gourmet/plugins/import_export/html_plugin/html_exporter.py 2013-09-15 07:13:00.000000000 +0000 -@@ -1,8 +1,13 @@ --import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap -+import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap - from gettext import gettext as _ - from gourmet import convert,gglobals - from gourmet.gdebug import * - from gourmet.exporters.exporter import * -+# Require PIL module. -+try: -+ from PIL import Image -+except ImportError: -+ import Image - - - HTML_HEADER_START = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -diff -bur gourmet-0.16.0.orig/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py gourmet-0.16.0/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py ---- gourmet-0.16.0.orig/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py 2013-09-15 08:40:09.137087303 +0000 -+++ gourmet-0.16.0/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py 2013-09-15 07:13:21.000000000 +0000 -@@ -1,8 +1,13 @@ --import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap -+import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap - from gourmet import gglobals, convert - from gourmet.exporters.exporter import * - from gourmet.gdebug import * - from gettext import gettext as _ -+# Require PIL module. -+try: -+ from PIL import Image -+except ImportError: -+ import Image - - class mealmaster_exporter (exporter_mult): - def __init__ (self, rd, r, out, conv=None, change_units=True, mult=1): -diff -bur gourmet-0.16.0.orig/gourmet/reccard.py gourmet-0.16.0/gourmet/reccard.py ---- gourmet-0.16.0.orig/gourmet/reccard.py 2013-09-15 08:40:09.137087303 +0000 -+++ gourmet-0.16.0/gourmet/reccard.py 2013-09-15 07:13:54.000000000 +0000 -@@ -1,6 +1,6 @@ - #!/usr/bin/env python - import gc --import gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, Image, StringIO, pango, string -+import gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, StringIO, pango, string - import types - import xml.sax.saxutils, pango - import exporters.exportManager -@@ -30,6 +30,11 @@ - import plugin_loader - import timeScanner - import defaults -+# Require PIL module. -+try: -+ from PIL import Image -+except ImportError: -+ import Image - - # TODO - #