[Python-apps-commits] r11128 - in packages/ocrfeeder/trunk/debian (5 files)

Thu Aug 7 05:44:41 UTC 2014

Date: Thursday, August 7, 2014 @ 05:44:39
  Author: berto
Revision: 11128

0.8-1: new upstream release (experimental)

Modified:
  packages/ocrfeeder/trunk/debian/changelog
  packages/ocrfeeder/trunk/debian/control
  packages/ocrfeeder/trunk/debian/patches/series
  packages/ocrfeeder/trunk/debian/rules
Deleted:
  packages/ocrfeeder/trunk/debian/patches/gtkspell.patch

Modified: packages/ocrfeeder/trunk/debian/changelog
===================================================================

--- packages/ocrfeeder/trunk/debian/changelog	2014-08-07 01:57:07 UTC (rev 11127)
+++ packages/ocrfeeder/trunk/debian/changelog	2014-08-07 05:44:39 UTC (rev 11128)
@@ -1,3 +1,21 @@
+ocrfeeder (0.8-1) experimental; urgency=low
+
+  * New upstream release. This version is ported to GObject Introspection
+    and no longer uses the old python bindings of some libraries.
+  * debian/control:
+    - Replace python-pygoocanvas with gir1.2-goocanvas-2.0.
+    - Replace python-gtk2 with gir1.2-gtk-3.0.
+    - Replace python-imaging-sane with python-pil and python-sane.
+    - Add dependencies on python-gi, gir1.2-gtkspell3-3.0 and iso-codes.
+    - Add build dependencies on python-gi and python-gobject.
+    - Bump Standards-Version to 3.9.5 (no changes needed).
+  * debian/patches/gtkspell.patch:
+    - Remove, this patch is no longer needed.
+  * debian/rules:
+    - Set XDG_RUNTIME_DIR to /tmp, otherwise configure will fail.
+
+ -- Alberto Garcia <berto at igalia.com>  Thu, 07 Aug 2014 00:52:46 +0300
+
 ocrfeeder (0.7.11-3) unstable; urgency=low
 
   * Update my e-mail address in debian/control and debian/copyright.

Modified: packages/ocrfeeder/trunk/debian/control
===================================================================
--- packages/ocrfeeder/trunk/debian/control	2014-08-07 01:57:07 UTC (rev 11127)
+++ packages/ocrfeeder/trunk/debian/control	2014-08-07 05:44:39 UTC (rev 11128)
@@ -3,8 +3,21 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: W. Martin Borgert <debacle at debian.org>, Alberto Garcia <berto at igalia.com>, Bernhard Reiter <ockham at raz.or.at>
-Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~), intltool, libglib2.0-dev, gnome-doc-utils, python-imaging-sane, python-enchant, python-pygoocanvas, python-reportlab, dh-autoreconf
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 7),
+               python-all (>= 2.6.6-3~),
+               intltool,
+               libglib2.0-dev,
+               gnome-doc-utils,
+               python-enchant,
+               python-gi,
+               python-gobject,
+               python-pil,
+               python-reportlab,
+               python-sane,
+               gir1.2-gtk-3.0,
+               gir1.2-goocanvas-2.0,
+               dh-autoreconf
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.5
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/ocrfeeder/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewsvn/python-apps/packages/ocrfeeder/trunk/
@@ -12,7 +25,20 @@
 
 Package: ocrfeeder
 Architecture: all
-Depends: python-gtk2, python-imaging-sane, python-enchant, python-pygoocanvas, python-lxml, python-reportlab, ghostscript, ${misc:Depends}, ${python:Depends}, tesseract-ocr | ocrad | gocr | cuneiform
+Depends: ${python:Depends},
+         python-enchant,
+         python-gi,
+         python-lxml,
+         python-pil,
+         python-reportlab,
+         python-sane,
+         gir1.2-gtk-3.0,
+         gir1.2-gtkspell3-3.0,
+         gir1.2-goocanvas-2.0,
+         iso-codes,
+         ghostscript,
+         tesseract-ocr | ocrad | gocr | cuneiform,
+         ${misc:Depends}
 Recommends: unpaper, yelp
 Description: Document layout analysis and optical character recognition system
  OCRFeeder is a document layout analysis and optical character

Deleted: packages/ocrfeeder/trunk/debian/patches/gtkspell.patch
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/gtkspell.patch	2014-08-07 01:57:07 UTC (rev 11127)
+++ packages/ocrfeeder/trunk/debian/patches/gtkspell.patch	2014-08-07 05:44:39 UTC (rev 11128)
@@ -1,56 +0,0 @@
-From: Alberto Garcia <berto at igalia.com>
-Subject: Remove deprecated gtkspell code
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/707849
-Index: ocrfeeder/src/ocrfeeder/studio/widgetPresenter.py
-===================================================================
---- ocrfeeder.orig/src/ocrfeeder/studio/widgetPresenter.py
-+++ ocrfeeder/src/ocrfeeder/studio/widgetPresenter.py
-@@ -39,7 +39,6 @@ import sys
- import threading
- import Queue
- import time
--import gtkspell
- pygtk.require('2.0')
- _ = gettext.gettext
- 
-@@ -159,7 +158,7 @@ class MainWindow:
-                                    menu_items['copy_to_clipboard']),
-                                   ('SpellChecker', None,
-                                    _('Spell_checker'),
--                                   '<shift>F7',
-+                                   None,
-                                    _("Spell Check Recognized Text"),
-                                    menu_items['spell_checker']),
-                                   ])
-@@ -189,6 +188,7 @@ class MainWindow:
-         self.action_group = action_group
-         self.spellchecker_menu = ui_manager.get_widget('/MenuBar/Tools/SpellChecker')
-         self.spellchecker_menu.set_sensitive(False)
-+        self.spellchecker_menu.set_visible(False)
- 
-     def setDestroyEvent(self, function):
-         self.window.connect('delete-event', function)
-@@ -557,10 +557,6 @@ class BoxEditor(gtk.ScrolledWindow, gobj
-         text_properties_notebook.set_tab_pos(gtk.POS_TOP)
-         # Textview widget
-         self.text_widget = gtk.TextView()
--        try:
--            gtkspell.Spell(self.text_widget, OCRFEEDER_DEFAULT_LOCALE)
--        except:
--            pass # The locale was not found by GTKSpell, ignoring...
-         self.text_widget.set_wrap_mode(gtk.WRAP_WORD)
-         self.text_content = self.text_widget.get_buffer()
-         self.text_content.connect('changed', self.editedByUser)
-Index: ocrfeeder/configure.ac
-===================================================================
---- ocrfeeder.orig/configure.ac
-+++ ocrfeeder/configure.ac
-@@ -18,7 +18,6 @@ AM_PATH_PYTHON(2.5)
- dnl == Python dependencies ==
- AX_PYTHON_MODULE([gtk],[needed])
- AX_PYTHON_MODULE([pygtk],[needed])
--AX_PYTHON_MODULE([gtkspell],[needed])
- AX_PYTHON_MODULE([goocanvas],[needed])
- AX_PYTHON_MODULE([enchant],[needed])
- AX_PYTHON_MODULE([sane],[needed])

Modified: packages/ocrfeeder/trunk/debian/patches/series
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/series	2014-08-07 01:57:07 UTC (rev 11127)
+++ packages/ocrfeeder/trunk/debian/patches/series	2014-08-07 05:44:39 UTC (rev 11128)
@@ -1,4 +1,3 @@
 icon-path.patch
 potfiles-quilt.patch
-gtkspell.patch
 automake-warnings.patch

Modified: packages/ocrfeeder/trunk/debian/rules
===================================================================
--- packages/ocrfeeder/trunk/debian/rules	2014-08-07 01:57:07 UTC (rev 11127)
+++ packages/ocrfeeder/trunk/debian/rules	2014-08-07 05:44:39 UTC (rev 11128)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export XDG_RUNTIME_DIR=/tmp
+
 %:
 	dh $@ --with python2,autoreconf


