[Python-apps-commits] r9728 - in packages/ocrfeeder/trunk/debian (11 files)

agarcia-guest at users.alioth.debian.org agarcia-guest at users.alioth.debian.org
Sat Jun 8 01:11:19 UTC 2013


    Date: Saturday, June 8, 2013 @ 01:11:17
  Author: agarcia-guest
Revision: 9728

0.7.11-3: remove dependency on python-gtkspell

Added:
  packages/ocrfeeder/trunk/debian/patches/automake-warnings.patch
  packages/ocrfeeder/trunk/debian/patches/gtkspell.patch
  packages/ocrfeeder/trunk/debian/patches/icon-path.patch
    (from rev 9600, packages/ocrfeeder/trunk/debian/patches/01_icon-path.patch)
  packages/ocrfeeder/trunk/debian/patches/potfiles-quilt.patch
    (from rev 9600, packages/ocrfeeder/trunk/debian/patches/02_potfiles-quilt.patch)
Modified:
  packages/ocrfeeder/trunk/debian/changelog
  packages/ocrfeeder/trunk/debian/control
  packages/ocrfeeder/trunk/debian/copyright
  packages/ocrfeeder/trunk/debian/patches/series
  packages/ocrfeeder/trunk/debian/rules
Deleted:
  packages/ocrfeeder/trunk/debian/patches/01_icon-path.patch
  packages/ocrfeeder/trunk/debian/patches/02_potfiles-quilt.patch

Modified: packages/ocrfeeder/trunk/debian/changelog
===================================================================
--- packages/ocrfeeder/trunk/debian/changelog	2013-06-06 11:39:01 UTC (rev 9727)
+++ packages/ocrfeeder/trunk/debian/changelog	2013-06-08 01:11:17 UTC (rev 9728)
@@ -1,3 +1,18 @@
+ocrfeeder (0.7.11-3) unstable; urgency=low
+
+  * Update my e-mail address in debian/control and debian/copyright.
+  * Add headers to all patches and remove their numbering.
+  * gtkspell.patch: remove deprecated GtkSpell support (Closes: #707849).
+    - debian/rules: run dh --with autoreconf.
+    - debian/control: add build dependency on dh-autoreconf and
+      libglib2.0-dev (for the AM_GLIB_GNU_GETTEXT macro) and remove
+      dependencies on python-gtkspell.
+  * automake-warnings.patch: set automake strictness to foreign.
+  * debian/control: remove build dependency on python-gtk2-dev. This is
+    not necessary since OCRFeeder 0.7.4.
+
+ -- Alberto Garcia <berto at igalia.com>  Sat, 08 Jun 2013 01:54:11 +0200
+
 ocrfeeder (0.7.11-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: packages/ocrfeeder/trunk/debian/control
===================================================================
--- packages/ocrfeeder/trunk/debian/control	2013-06-06 11:39:01 UTC (rev 9727)
+++ packages/ocrfeeder/trunk/debian/control	2013-06-08 01:11:17 UTC (rev 9728)
@@ -2,8 +2,8 @@
 Section: graphics
 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 <agarcia at igalia.com>, Bernhard Reiter <ockham at raz.or.at>
-Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~), intltool, python-gtk2-dev, gnome-doc-utils, python-imaging-sane, python-enchant, python-gtkspell, python-pygoocanvas, python-reportlab
+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
 X-Python-Version: >= 2.5
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/ocrfeeder/trunk/
@@ -12,7 +12,7 @@
 
 Package: ocrfeeder
 Architecture: all
-Depends: python-gtk2, python-imaging-sane, python-enchant, python-gtkspell, python-pygoocanvas, python-lxml, python-reportlab, ghostscript, ${misc:Depends}, ${python:Depends}, tesseract-ocr | ocrad | gocr | cuneiform
+Depends: python-gtk2, python-imaging-sane, python-enchant, python-pygoocanvas, python-lxml, python-reportlab, ghostscript, ${misc:Depends}, ${python:Depends}, tesseract-ocr | ocrad | gocr | cuneiform
 Recommends: unpaper, yelp
 Description: Document layout analysis and optical character recognition system
  OCRFeeder is a document layout analysis and optical character

Modified: packages/ocrfeeder/trunk/debian/copyright
===================================================================
--- packages/ocrfeeder/trunk/debian/copyright	2013-06-06 11:39:01 UTC (rev 9727)
+++ packages/ocrfeeder/trunk/debian/copyright	2013-06-08 01:11:17 UTC (rev 9728)
@@ -8,7 +8,7 @@
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2010-2013 Alberto Garcia <agarcia at igalia.com>
+Copyright: 2010-2013 Alberto Garcia <berto at igalia.com>
 License: GPL-3+
 
 Files: src/ocrfeeder/odf/*

Deleted: packages/ocrfeeder/trunk/debian/patches/01_icon-path.patch
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/01_icon-path.patch	2013-06-06 11:39:01 UTC (rev 9727)
+++ packages/ocrfeeder/trunk/debian/patches/01_icon-path.patch	2013-06-08 01:11:17 UTC (rev 9728)
@@ -1,13 +0,0 @@
-Set full path of the ocrfeeder icon
-Index: ocrfeeder/resources/ocrfeeder.desktop.in
-===================================================================
---- ocrfeeder.orig/resources/ocrfeeder.desktop.in
-+++ ocrfeeder/resources/ocrfeeder.desktop.in
-@@ -5,6 +5,6 @@ _Name=OCRFeeder
- _Comment=The complete OCR suite.
- TryExec=ocrfeeder
- Exec=ocrfeeder
--Icon=ocrfeeder
-+Icon=/usr/share/ocrfeeder/icons/ocrfeeder.svg
- MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;
- Categories=Application;Office;

Deleted: packages/ocrfeeder/trunk/debian/patches/02_potfiles-quilt.patch
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/02_potfiles-quilt.patch	2013-06-06 11:39:01 UTC (rev 9727)
+++ packages/ocrfeeder/trunk/debian/patches/02_potfiles-quilt.patch	2013-06-08 01:11:17 UTC (rev 9728)
@@ -1,7 +0,0 @@
-Make intltool-update skip quilt's .pc directory
-Index: ocrfeeder/po/POTFILES.skip
-===================================================================
---- /dev/null
-+++ ocrfeeder/po/POTFILES.skip
-@@ -0,0 +1 @@
-+.pc

Added: packages/ocrfeeder/trunk/debian/patches/automake-warnings.patch
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/automake-warnings.patch	                        (rev 0)
+++ packages/ocrfeeder/trunk/debian/patches/automake-warnings.patch	2013-06-08 01:11:17 UTC (rev 9728)
@@ -0,0 +1,17 @@
+From: Alberto Garcia <berto at igalia.com>
+Description: Set automake strictness to foreign
+ This removes lots of warnings from dh-autoreconf.
+Forwarded: not-needed
+Index: ocrfeeder/configure.ac
+===================================================================
+--- ocrfeeder.orig/configure.ac
++++ ocrfeeder/configure.ac
+@@ -6,7 +6,7 @@ AC_INIT([ocrfeeder],
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE([1.11])
++AM_INIT_AUTOMAKE([1.11 foreign])
+ AM_MAINTAINER_MODE([enable])
+ # Support silent build rules. Disable by either passing --disable-silent-rules
+ # to configure or passing V=1 to make

Added: packages/ocrfeeder/trunk/debian/patches/gtkspell.patch
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/gtkspell.patch	                        (rev 0)
+++ packages/ocrfeeder/trunk/debian/patches/gtkspell.patch	2013-06-08 01:11:17 UTC (rev 9728)
@@ -0,0 +1,56 @@
+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])

Copied: packages/ocrfeeder/trunk/debian/patches/icon-path.patch (from rev 9600, packages/ocrfeeder/trunk/debian/patches/01_icon-path.patch)
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/icon-path.patch	                        (rev 0)
+++ packages/ocrfeeder/trunk/debian/patches/icon-path.patch	2013-06-08 01:11:17 UTC (rev 9728)
@@ -0,0 +1,15 @@
+From: Alberto Garcia <berto at igalia.com>
+Subject: Set full path of the ocrfeeder icon
+Forwarded: not-needed
+Index: ocrfeeder/resources/ocrfeeder.desktop.in
+===================================================================
+--- ocrfeeder.orig/resources/ocrfeeder.desktop.in
++++ ocrfeeder/resources/ocrfeeder.desktop.in
+@@ -5,6 +5,6 @@ _Name=OCRFeeder
+ _Comment=The complete OCR suite.
+ TryExec=ocrfeeder
+ Exec=ocrfeeder
+-Icon=ocrfeeder
++Icon=/usr/share/ocrfeeder/icons/ocrfeeder.svg
+ MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;
+ Categories=Application;Office;

Copied: packages/ocrfeeder/trunk/debian/patches/potfiles-quilt.patch (from rev 9600, packages/ocrfeeder/trunk/debian/patches/02_potfiles-quilt.patch)
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/potfiles-quilt.patch	                        (rev 0)
+++ packages/ocrfeeder/trunk/debian/patches/potfiles-quilt.patch	2013-06-08 01:11:17 UTC (rev 9728)
@@ -0,0 +1,9 @@
+From: Alberto Garcia <berto at igalia.com>
+Subject: Make intltool-update skip quilt's .pc directory
+Forwarded: not-needed
+Index: ocrfeeder/po/POTFILES.skip
+===================================================================
+--- /dev/null
++++ ocrfeeder/po/POTFILES.skip
+@@ -0,0 +1 @@
++.pc

Modified: packages/ocrfeeder/trunk/debian/patches/series
===================================================================
--- packages/ocrfeeder/trunk/debian/patches/series	2013-06-06 11:39:01 UTC (rev 9727)
+++ packages/ocrfeeder/trunk/debian/patches/series	2013-06-08 01:11:17 UTC (rev 9728)
@@ -1,2 +1,4 @@
-01_icon-path.patch
-02_potfiles-quilt.patch
+icon-path.patch
+potfiles-quilt.patch
+gtkspell.patch
+automake-warnings.patch

Modified: packages/ocrfeeder/trunk/debian/rules
===================================================================
--- packages/ocrfeeder/trunk/debian/rules	2013-06-06 11:39:01 UTC (rev 9727)
+++ packages/ocrfeeder/trunk/debian/rules	2013-06-08 01:11:17 UTC (rev 9728)
@@ -2,4 +2,4 @@
 # -*- makefile -*-
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,autoreconf




More information about the Python-apps-commits mailing list