Updates for OCRFeeder 0.7-1

[Alberto Garcia]

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 
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   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.0 +0100
-+++ ocrfeeder/feeder/documentGeneration.py	2010-04-20 20:20:00.0 +0100
+--- ocrfeeder.orig/feeder/documentGeneration.py
 ocrfeeder/feeder/documentGeneration.py
 @@ -18,17 +18,17 @@
  #along with this program.  If not, see .
  ###
@@ -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.0 +0100
-+++ ocrfeeder/feeder/imageManipulation.py	2010-04-20 20:20:00.0 +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.0 +0100
-+++ ocrfeeder/feeder/layoutAnalysis.py	2010-04-20 20:21:58.0 +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 .
  ###
  
 -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.0 +0100
-+++ ocrfeeder/feeder/ocrEngines.py	2010-04-20 20:20:00.0 +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.0 +0100
-+++ ocrfeeder/ocrfeeder	2010-04-20 20:20:00.0 +0100
+--- ocrfeeder.orig/ocrfeeder
 ocrfeeder/ocrfeeder
 @@ -18,7 +18,7 @@
  #along with this program.  If not, see .
  

How to ship .a files in a python-support package?

[Sandro Tosi]

Hello,
background for this is: #596987

I installed the libnpymath.a in
./debian/tmp/usr/lib/python*/*-packages/numpy/core/lib/libnpymath.a
(the same place there are several other .so files); they are copied in
debian/python-numpy/same_location but then .so files are moved in
/u/l/pyshared, but the .a is ignored and this not shipped in the
resulting .deb package.

Is there a way to ship that libnpymath.a file? or just by hand (and in
this case, how)?

Thanks in advance,
-- 
Sandro Tosi (aka morph, morpheus, matrixhasu)
My website: http://matrixhasu.altervista.org/
Me at Debian: http://wiki.debian.org/SandroTosi


-- 
To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/aanlktinzm8ibz1qtocatu3dvrpgnoce_orjgoyq-n...@mail.gmail.com

Re: How to ship .a files in a python-support package?

[Bernd Zeimetz]

On 09/30/2010 09:00 PM, Sandro Tosi wrote:
> Hello,
> background for this is: #596987
> 
> I installed the libnpymath.a in
> ./debian/tmp/usr/lib/python*/*-packages/numpy/core/lib/libnpymath.a
> (the same place there are several other .so files); they are copied in
> debian/python-numpy/same_location but then .so files are moved in
> /u/l/pyshared, but the .a is ignored and this not shipped in the
> resulting .deb package.
> 
> Is there a way to ship that libnpymath.a file? or just by hand (and in
> this case, how)?

What would the file be used for?
Linking new modules statically with the library?

-- 
 Bernd ZeimetzDebian GNU/Linux Developer
 http://bzed.dehttp://www.debian.org
 GPG Fingerprint: ECA1 E3F2 8E11 2432 D485  DD95 EB36 171A 6FF9 435F


-- 
To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/4ca4e199.3090...@bzed.de

Re: How to ship .a files in a python-support package?

[Sandro Tosi]

Hi Bernd,

On Thu, Sep 30, 2010 at 21:14, Bernd Zeimetz  wrote:
> On 09/30/2010 09:00 PM, Sandro Tosi wrote:
>> Hello,
>> background for this is: #596987
>>
>> I installed the libnpymath.a in
>> ./debian/tmp/usr/lib/python*/*-packages/numpy/core/lib/libnpymath.a
>> (the same place there are several other .so files); they are copied in
>> debian/python-numpy/same_location but then .so files are moved in
>> /u/l/pyshared, but the .a is ignored and this not shipped in the
>> resulting .deb package.
>>
>> Is there a way to ship that libnpymath.a file? or just by hand (and in
>> this case, how)?
>
> What would the file be used for?
> Linking new modules statically with the library?

If only I know (I barely understand what a .a is for)... From the bug
report, I can only infer that scipy new version (0.8.0) doesn't build
without libnpymath.a .

Cheers,
-- 
Sandro Tosi (aka morph, morpheus, matrixhasu)
My website: http://matrixhasu.altervista.org/
Me at Debian: http://wiki.debian.org/SandroTosi


-- 
To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/aanlkti=__i-yvasilvka-o99nzovkbyagp71w5twm...@mail.gmail.com

Re: Updates for OCRFeeder 0.7-1

[Jakub Wilk]

* Alberto Garcia , 2010-09-30, 13:46:

I don't have write access here (nor I can upload packages


Well, maybe you should just ask for access[0]. :)


+ocrfeeder (0.7-1) unstable; urgency=low
+
+  * New upstream release


Uploading a new upstream release to unstable is normally not appropriate 
during freeze.



+  * 05_ocrfeeder-cli-help.patch: Add `--help' option to ocrfeeder-cli and
+update man page (Closes: #581426)


Any reason why both these changes are in a single patch? They don't seem 
to be related.



+-  printError('Error: Output name. Please choose the output name.')
++  printError('Usage: ocrfeeder-cli --o OUTPUT_FILE [OPTIONS]\n'
++   'Try `ocrfeeder --help\' for more information')


U+0060 GRAVE ACCENT should not be used as a quotation mark[1].

[0] 
http://wiki.debian.org/Teams/PythonModulesTeam/HowToJoin#RequestAccessToAliothTeams
[1] http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html

--
Jakub Wilk


signature.asc
Description: Digital signature

Re: How to ship .a files in a python-support package?

[Jakub Wilk]

* Sandro Tosi , 2010-09-30, 23:59:

background for this is: #596987

I installed the libnpymath.a in 
./debian/tmp/usr/lib/python*/*-packages/numpy/core/lib/libnpymath.a 
(the same place there are several other .so files); they are copied 
in debian/python-numpy/same_location but then .so files are moved in
/u/l/pyshared, but the .a is ignored and this not shipped in the 
resulting .deb package.


Is there a way to ship that libnpymath.a file? or just by hand (and 
in this case, how)?


What would the file be used for?
Linking new modules statically with the library?


If only I know (I barely understand what a .a is for)...


Quoting doc/release/1.4.0-notes.rst:

In 1.3.0, we started putting portable C math routines in npymath 
library, so that people can use those to write portable extensions. 
Unfortunately, it was not possible to easily link against this library: 
in 1.4.0, support has been added to numpy.distutils so that 3rd party 
can reuse this library.


From the bug report, I can only infer that scipy new version (0.8.0) 
doesn't build without libnpymath.a .


As far as I understand it, the library is independent of python, so I'd 
just ship it directly in /usr/lib/.


--
Jakub Wilk


signature.asc
Description: Digital signature

Re: How to ship .a files in a python-support package?

[Bernd Zeimetz]

On 09/30/2010 11:59 PM, Sandro Tosi wrote:
>> What would the file be used for?
>> Linking new modules statically with the library?
> 
> If only I know (I barely understand what a .a is for)... From the bug
> report, I can only infer that scipy new version (0.8.0) doesn't build
> without libnpymath.a .

That is usually a static library.
http://www.linux.org/docs/ldp/howto/Program-Library-HOWTO/static-libraries.html

The question would be: why do they need a static library and is it possible to
build and use a shared lib instead.

-- 
 Bernd ZeimetzDebian GNU/Linux Developer
 http://bzed.dehttp://www.debian.org
 GPG Fingerprint: ECA1 E3F2 8E11 2432 D485  DD95 EB36 171A 6FF9 435F


-- 
To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/4ca512bd.7080...@bzed.de