Hi, OCRFeeder 0.7 has been out for a while, I'm attaching the patch for the Debian scripts, since I don't have write access here (nor I can upload packages):
svn://svn.debian.org/svn/python-apps/packages/ocrfeeder/trunk I'd be glad if someone could review and/or commit the changes. Thanks! Berto
>From 4ed5838fca8d85c5cd17cd66857bd43d7d6708ad Mon Sep 17 00:00:00 2001 From: Alberto Garcia <agar...@igalia.com> Date: Tue, 28 Sep 2010 19:43:53 +0200 Subject: [PATCH] 0.7-1: New upstream release --- debian/changelog | 11 +++ debian/patches/02_ocrfeeder-package.patch | 130 +++++++++++++++------------ debian/patches/05_ocrfeeder-cli-help.patch | 78 +++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 163 insertions(+), 58 deletions(-) create mode 100644 debian/patches/05_ocrfeeder-cli-help.patch diff --git a/debian/changelog b/debian/changelog index a9fafbe..fdd0b07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +ocrfeeder (0.7-1) unstable; urgency=low + + * New upstream release + * 02_ocrfeeder-package.patch: Updated + * 05_ocrfeeder-cli-help.patch: Add `--help' option to ocrfeeder-cli and + update man page (Closes: #581426) + * debian/rules: Remove feeder/documentRecognition.py, it was included in + the upstream tarball by mistake. + + -- Alberto Garcia <agar...@igalia.com> Tue, 28 Sep 2010 19:07:33 +0200 + ocrfeeder (0.6.6-3) unstable; urgency=low * Team upload diff --git a/debian/patches/02_ocrfeeder-package.patch b/debian/patches/02_ocrfeeder-package.patch index b56668f..0876f39 100644 --- a/debian/patches/02_ocrfeeder-package.patch +++ b/debian/patches/02_ocrfeeder-package.patch @@ -1,7 +1,7 @@ Index: ocrfeeder/feeder/documentGeneration.py =================================================================== ---- ocrfeeder.orig/feeder/documentGeneration.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/feeder/documentGeneration.py 2010-04-20 20:20:00.000000000 +0100 +--- ocrfeeder.orig/feeder/documentGeneration.py ++++ ocrfeeder/feeder/documentGeneration.py @@ -18,17 +18,17 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ########################################################################### @@ -29,8 +29,8 @@ Index: ocrfeeder/feeder/documentGeneration.py import shutil Index: ocrfeeder/feeder/imageManipulation.py =================================================================== ---- ocrfeeder.orig/feeder/imageManipulation.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/feeder/imageManipulation.py 2010-04-20 20:20:00.000000000 +0100 +--- ocrfeeder.orig/feeder/imageManipulation.py ++++ ocrfeeder/feeder/imageManipulation.py @@ -19,12 +19,12 @@ ########################################################################### @@ -48,24 +48,28 @@ Index: ocrfeeder/feeder/imageManipulation.py _ = gettext.gettext Index: ocrfeeder/feeder/layoutAnalysis.py =================================================================== ---- ocrfeeder.orig/feeder/layoutAnalysis.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/feeder/layoutAnalysis.py 2010-04-20 20:21:58.000000000 +0100 -@@ -18,8 +18,8 @@ +--- ocrfeeder.orig/feeder/layoutAnalysis.py ++++ ocrfeeder/feeder/layoutAnalysis.py +@@ -18,10 +18,10 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ########################################################################### -from util.lib import debug --from util.constants import OCRFEEDER_DEBUG +-from util import graphics +-from util.constants import OCRFEEDER_DEBUG, DTP +-from studio.dataHolder import DataBox +from ocrfeeder.util.lib import debug -+from ocrfeeder.util.constants import OCRFEEDER_DEBUG - - NONE = 0 - TOP = -1 ++from ocrfeeder.util import graphics ++from ocrfeeder.util.constants import OCRFEEDER_DEBUG, DTP ++from ocrfeeder.studio.dataHolder import DataBox + from imageManipulation import ImageProcessor + import Image + import re Index: ocrfeeder/feeder/ocrEngines.py =================================================================== ---- ocrfeeder.orig/feeder/ocrEngines.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/feeder/ocrEngines.py 2010-04-20 20:20:00.000000000 +0100 -@@ -24,8 +24,8 @@ +--- ocrfeeder.orig/feeder/ocrEngines.py ++++ ocrfeeder/feeder/ocrEngines.py +@@ -24,8 +24,8 @@ import tempfile import os import xml.etree.ElementTree as ET from xml.parsers.expat import ExpatError @@ -78,8 +82,8 @@ Index: ocrfeeder/feeder/ocrEngines.py Index: ocrfeeder/ocrfeeder =================================================================== ---- ocrfeeder.orig/ocrfeeder 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/ocrfeeder 2010-04-20 20:20:00.000000000 +0100 +--- ocrfeeder.orig/ocrfeeder ++++ ocrfeeder/ocrfeeder @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ########################################################################### @@ -91,9 +95,9 @@ Index: ocrfeeder/ocrfeeder Index: ocrfeeder/ocrfeeder-cli =================================================================== ---- ocrfeeder.orig/ocrfeeder-cli 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/ocrfeeder-cli 2010-04-20 20:20:00.000000000 +0100 -@@ -23,14 +23,14 @@ +--- ocrfeeder.orig/ocrfeeder-cli ++++ ocrfeeder/ocrfeeder-cli +@@ -23,14 +23,14 @@ import sys import os import gtk import math @@ -118,9 +122,9 @@ Index: ocrfeeder/ocrfeeder-cli print message Index: ocrfeeder/odf/load.py =================================================================== ---- ocrfeeder.orig/odf/load.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/odf/load.py 2010-04-20 20:20:00.000000000 +0100 -@@ -29,9 +29,9 @@ +--- ocrfeeder.orig/odf/load.py ++++ ocrfeeder/odf/load.py +@@ -29,9 +29,9 @@ from xml.sax import make_parser,handler from xml.sax.xmlreader import InputSource import xml.sax.saxutils import sys @@ -135,9 +139,9 @@ Index: ocrfeeder/odf/load.py try: Index: ocrfeeder/odf/userfield.py =================================================================== ---- ocrfeeder.orig/odf/userfield.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/odf/userfield.py 2010-04-20 20:20:00.000000000 +0100 -@@ -28,7 +28,7 @@ +--- ocrfeeder.orig/odf/userfield.py ++++ ocrfeeder/odf/userfield.py +@@ -28,7 +28,7 @@ import xml.sax import xml.sax.handler import xml.sax.saxutils @@ -148,9 +152,9 @@ Index: ocrfeeder/odf/userfield.py from cStringIO import StringIO Index: ocrfeeder/setup.py =================================================================== ---- ocrfeeder.orig/setup.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/setup.py 2010-04-20 20:20:00.000000000 +0100 -@@ -21,9 +21,13 @@ +--- ocrfeeder.orig/setup.py ++++ ocrfeeder/setup.py +@@ -21,9 +21,13 @@ setup(name = 'ocrfeeder', author_email = 'joaquimroc...@gmail.com', url = constants.OCRFEEDER_WEBSITE, license = 'GPL v3', @@ -164,12 +168,12 @@ Index: ocrfeeder/setup.py + 'ocrfeeder/util' : 'util', + 'ocrfeeder/odf' : 'odf' }, scripts = ['ocrfeeder', 'ocrfeeder-cli'], - data_files = [(constants.DEFAULT_SYSTEM_APP_DIR + + data_files = [(constants.DEFAULT_SYSTEM_APP_DIR + '/icons', ['resources/icons/detect_icon.svg', Index: ocrfeeder/studio/configuration.py =================================================================== ---- ocrfeeder.orig/studio/configuration.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/studio/configuration.py 2010-04-20 20:20:00.000000000 +0100 +--- ocrfeeder.orig/studio/configuration.py ++++ ocrfeeder/studio/configuration.py @@ -18,9 +18,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ########################################################################### @@ -185,8 +189,8 @@ Index: ocrfeeder/studio/configuration.py import re Index: ocrfeeder/studio/dataHolder.py =================================================================== ---- ocrfeeder.orig/studio/dataHolder.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/studio/dataHolder.py 2010-04-20 20:20:00.000000000 +0100 +--- ocrfeeder.orig/studio/dataHolder.py ++++ ocrfeeder/studio/dataHolder.py @@ -19,11 +19,11 @@ ########################################################################### @@ -200,13 +204,13 @@ Index: ocrfeeder/studio/dataHolder.py +from ocrfeeder.util.graphics import getImagePrintSize, getImageResolution +from ocrfeeder.util import TEXT_TYPE, IMAGE_TYPE, ALIGN_LEFT, lib from pango import WEIGHT_NORMAL, STYLE_NORMAL - + class TextData: Index: ocrfeeder/studio/studioBuilder.py =================================================================== ---- ocrfeeder.orig/studio/studioBuilder.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/studio/studioBuilder.py 2010-04-20 20:20:00.000000000 +0100 -@@ -18,16 +18,16 @@ +--- ocrfeeder.orig/studio/studioBuilder.py ++++ ocrfeeder/studio/studioBuilder.py +@@ -18,19 +18,19 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ########################################################################### @@ -218,24 +222,28 @@ Index: ocrfeeder/studio/studioBuilder.py +from ocrfeeder.util.cliutils import ArgsRetriever import sys import os.path + import urllib -from studio import widgetPresenter -from studio.widgetModeler import SourceImagesSelector, SourceImagesSelectorIconView, ImageReviewer_Controler --from studio.dataHolder import create_images_dict_from_liststore, DataBox, TextData +-from studio.dataHolder import DataBox, TextData -from studio.customWidgets import SelectableBoxesArea -from feeder.ocrEngines import Engine, OcrEnginesManager +from ocrfeeder.studio import widgetPresenter +from ocrfeeder.studio.widgetModeler import SourceImagesSelector, SourceImagesSelectorIconView, ImageReviewer_Controler -+from ocrfeeder.studio.dataHolder import create_images_dict_from_liststore, DataBox, TextData ++from ocrfeeder.studio.dataHolder import DataBox, TextData +from ocrfeeder.studio.customWidgets import SelectableBoxesArea +from ocrfeeder.feeder.ocrEngines import Engine, OcrEnginesManager from configuration import ConfigurationManager +-from util.asyncworker import AsyncItem ++from ocrfeeder.util.asyncworker import AsyncItem import gettext import locale + _ = gettext.gettext Index: ocrfeeder/studio/widgetModeler.py =================================================================== ---- ocrfeeder.orig/studio/widgetModeler.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/studio/widgetModeler.py 2010-04-20 20:20:00.000000000 +0100 -@@ -20,14 +20,14 @@ +--- ocrfeeder.orig/studio/widgetModeler.py ++++ ocrfeeder/studio/widgetModeler.py +@@ -20,16 +20,16 @@ from customWidgets import SelectableBoxesArea from dataHolder import DataBox, PageData, TEXT_TYPE, IMAGE_TYPE @@ -246,28 +254,34 @@ Index: ocrfeeder/studio/widgetModeler.py +from ocrfeeder.feeder.imageManipulation import * +from ocrfeeder.feeder.layoutAnalysis import * from pango import FontDescription, SCALE --from studio.configuration import ProjectSaver, ProjectLoader +-from studio.configuration import ProjectSaver, ProjectLoader, ConfigurationManager -from util import graphics, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_FILL, \ -+from ocrfeeder.studio.configuration import ProjectSaver, ProjectLoader ++from ocrfeeder.studio.configuration import ProjectSaver, ProjectLoader, ConfigurationManager +from ocrfeeder.util import graphics, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_FILL, \ PAPER_SIZES --from util.lib import debug -+from ocrfeeder.util.lib import debug +-from util.lib import debug, getNonExistingFileName, unpaperImage +-from util import constants +-from util.asyncworker import AsyncItem ++from ocrfeeder.util.lib import debug, getNonExistingFileName, unpaperImage ++from ocrfeeder.util import constants ++from ocrfeeder.util.asyncworker import AsyncItem from widgetPresenter import BoxEditor, PagesToExportDialog, FileDialog, \ - PageSizeDialog, getPopupMenu, WarningDialog, UnpaperDialog - import gettext + PageSizeDialog, getPopupMenu, WarningDialog, UnpaperDialog, \ + QueuedEventsProgressDialog Index: ocrfeeder/studio/widgetPresenter.py =================================================================== ---- ocrfeeder.orig/studio/widgetPresenter.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/studio/widgetPresenter.py 2010-04-20 20:20:00.000000000 +0100 -@@ -20,9 +20,9 @@ - +--- ocrfeeder.orig/studio/widgetPresenter.py ++++ ocrfeeder/studio/widgetPresenter.py +@@ -21,10 +21,10 @@ from customWidgets import PlainFrame, TrippleStatusBar from dataHolder import DataBox, TEXT_TYPE, IMAGE_TYPE + from configuration import ConfigurationManager -from util import lib, PAPER_SIZES +-from util.asyncworker import AsyncWorker -from util.constants import * -from util.graphics import convertPixbufToImage +from ocrfeeder.util import lib, PAPER_SIZES ++from ocrfeeder.util.asyncworker import AsyncWorker +from ocrfeeder.util.constants import * +from ocrfeeder.util.graphics import convertPixbufToImage import Image @@ -275,8 +289,8 @@ Index: ocrfeeder/studio/widgetPresenter.py import gobject Index: ocrfeeder/util/graphics.py =================================================================== ---- ocrfeeder.orig/util/graphics.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/util/graphics.py 2010-04-20 20:20:00.000000000 +0100 +--- ocrfeeder.orig/util/graphics.py ++++ ocrfeeder/util/graphics.py @@ -19,7 +19,7 @@ ########################################################################### @@ -288,9 +302,9 @@ Index: ocrfeeder/util/graphics.py import math Index: ocrfeeder/util/lib.py =================================================================== ---- ocrfeeder.orig/util/lib.py 2010-04-20 20:02:23.000000000 +0100 -+++ ocrfeeder/util/lib.py 2010-04-20 20:20:00.000000000 +0100 -@@ -23,7 +23,7 @@ +--- ocrfeeder.orig/util/lib.py ++++ ocrfeeder/util/lib.py +@@ -24,7 +24,7 @@ import Image import tempfile import gtk import math diff --git a/debian/patches/05_ocrfeeder-cli-help.patch b/debian/patches/05_ocrfeeder-cli-help.patch new file mode 100644 index 0000000..2adfa75 --- /dev/null +++ b/debian/patches/05_ocrfeeder-cli-help.patch @@ -0,0 +1,78 @@ +Index: ocrfeeder/ocrfeeder-cli +=================================================================== +--- ocrfeeder.orig/ocrfeeder-cli ++++ ocrfeeder/ocrfeeder-cli +@@ -37,12 +37,30 @@ def printError(message): + sys.exit(1) + + cli_command_retriever = ArgsRetriever(sys.argv) ++ ++if cli_command_retriever.hasCommand('--help'): ++ printError('Usage:\n' ++ '\tocrfeeder-cli --o OUTPUT_FILE [OPTIONS]\n\n' ++ 'Required options:\n\n' ++ '\t--o OUTPUT_FILE\n' ++ '\t\tName for the generated file\n\n' ++ 'Other options:\n\n' ++ '\t--images IMAGE1 IMAGE2 ...\n' ++ '\t\tImages to be recognized\n\n' ++ '\t--format FORMAT\n' ++ '\t\tFormat for the generated document (ODT or HTML)\n\n' ++ '\t--window-size WINDOW_SIZE\n' ++ '\t\tDesired window size of OCRFeeder\'s segmentation\n' ++ '\t\talgorithm. If this option is not used, the window\n' ++ '\t\tsize will be calculated automatically') ++ + images = cli_command_retriever.getParams('--images') + window_size = cli_command_retriever.getParams('--window-size') or None + export_format = cli_command_retriever.getParams('--format') + file_name = cli_command_retriever.getParams('--o') + if not file_name: +- printError('Error: Output name. Please choose the output name.') ++ printError('Usage: ocrfeeder-cli --o OUTPUT_FILE [OPTIONS]\n' ++ 'Try `ocrfeeder --help\' for more information') + + file_name = file_name.pop() + +@@ -101,4 +119,4 @@ if 'HTML' in export_format: + document_generator = HtmlGenerator(file_name) + for page in pages: + document_generator.addPage(page) +-document_generator.save() +\ No newline at end of file ++document_generator.save() +Index: ocrfeeder/resources/ocrfeeder-cli.1 +=================================================================== +--- ocrfeeder.orig/resources/ocrfeeder-cli.1 ++++ ocrfeeder/resources/ocrfeeder-cli.1 +@@ -3,7 +3,7 @@ + ocrfeeder-cli \- command line interface for OCRFeeder, a document layout analysis and optical character recognition system. + .SH SYNOPSIS + .B ocrfeeder-cli +-.I [OPTIONS] ++.I \-\-o OUTPUT_FILE [OPTIONS] + .SH DESCRIPTION + This manual page documents briefly the + .B ocrfeeder-cli +@@ -15,6 +15,11 @@ between what's graphics and text and per + multiple formats being its main one ODT. + + .SH OPTIONS ++.SS "Required options" ++.TP ++.BI "\-\-o OUTPUT_FILE" ++Name for the generated file ++.SS "Other options" + .TP + .BI "\-\-images IMAGE1 IMAGE2 ..." + Images to be recognized +@@ -22,9 +27,6 @@ Images to be recognized + .BI "\-\-format FORMAT" + Format for the generated document (ODT or HTML) + .TP +-.BI "\-\-o FILE_NAME" +-Name for the generated file +-.TP + .BI "\-\-window-size WINDOW_SIZE" + Desired window size of OCRFeeder's segmentation algorithm. If + this option is not used, the window size will be calculated automatically diff --git a/debian/patches/series b/debian/patches/series index a1b92b4..7aa281e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 02_ocrfeeder-package.patch 03_openoffice-icon.patch 04_ocrfeeder-cli-engines-fix.patch +05_ocrfeeder-cli-help.patch diff --git a/debian/rules b/debian/rules index 8748748..fb1577b 100755 --- a/debian/rules +++ b/debian/rules @@ -10,3 +10,4 @@ resources/ocrfeeder.desktop: resources/ocrfeeder.desktop.in make i18n configure/ocrfeeder:: resources/ocrfeeder.desktop + rm -f feeder/documentRecognition.py -- 1.7.1
