[Python-apps-commits] r6765 - in packages/ocrodjvu/trunk/debian (6 files)

[danstender-guest at users.alioth.debian.org]

    Date: Monday, March 14, 2011 @ 18:03:11
  Author: danstender-guest
Revision: 6765

added ocrodjvu-4ea0ced2ad06.diff, added build-dep on python-imaging, changed tests in debian/rules

Added:
  packages/ocrodjvu/trunk/debian/patches/ocrodjvu-4ea0ced2ad06.diff
Modified:
  packages/ocrodjvu/trunk/debian/changelog
  packages/ocrodjvu/trunk/debian/control
  packages/ocrodjvu/trunk/debian/copyright
  packages/ocrodjvu/trunk/debian/patches/series
  packages/ocrodjvu/trunk/debian/rules

Modified: packages/ocrodjvu/trunk/debian/changelog
===================================================================
--- packages/ocrodjvu/trunk/debian/changelog	2011-03-13 20:30:04 UTC (rev 6764)
+++ packages/ocrodjvu/trunk/debian/changelog	2011-03-14 18:03:11 UTC (rev 6765)
@@ -3,16 +3,24 @@
   * New upstream release (closes: #604874).
     + Fix typo in hocr output (closes: #600539).
     + Fix of upside-down generation of hocr data (closes: #611460).
+  * Fix of test suite failure with glibc 2.11 [ocrodjvu-4ea0ced2ad06.diff]. 
+  * Change of debian/control
+    + Bumped djvulibre-bin dependencies to 3.5.21.
+    + Added build-dep on python-imaging.
   * Changes of debian/copyright
     + Changed maintainer.
-    + Removed copyright for tests/alice* files.
-    + Checked DEP-5 with libconfig-model-perl.
-    + Added myself to copyright of debian/*
     + Extended copyrights to 2011.
+    + tests/alice* moved to tests/hocr2djvused/alice*,
+      added public domain explanation.
+    + Added myself as copyright holder of debian/*.
+    + DEP-5 check with libconfig-model-perl added blank lines.
+  * Changes of debian/rules
+    + Remove of subdirectory loop for nosetests.
+    + Remove option --with-doctests for nosetests. 
   * New maintainer (closes: #598156).
   * Upload to unstable.
 
- -- Daniel Stender <daniel at danielstender.com>  Sat, 05 Mar 2011 08:58:24 +0100
+ -- Daniel Stender <daniel at danielstender.com>  Mon, 14 Mar 2011 19:01:36 +0100
 
 ocrodjvu (0.6.1-1) experimental; urgency=low
 

Modified: packages/ocrodjvu/trunk/debian/control
===================================================================
--- packages/ocrodjvu/trunk/debian/control	2011-03-13 20:30:04 UTC (rev 6764)
+++ packages/ocrodjvu/trunk/debian/control	2011-03-14 18:03:11 UTC (rev 6765)
@@ -5,7 +5,7 @@
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~), python-all, python-support (>= 0.90), python-nose,
  python-argparse, python-lxml, python-djvu, python-pyicu,
- djvulibre-bin (>= 3.5.20-5~), libxml2-utils
+ djvulibre-bin (>= 3.5.21~), libxml2-utils, python-imaging
 XS-Python-Version: >= 2.5
 Standards-Version: 3.9.1
 Homepage: http://jwilk.net/software/ocrodjvu
@@ -16,7 +16,7 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
  python (>= 2.7) | python-argparse,
- python-djvu (>= 0.1.14), djvulibre-bin (>= 3.5.20-5~)
+ python-djvu (>= 0.1.14), djvulibre-bin (>= 3.5.21~)
 Recommends: python-lxml, ocropus (>= 0.3.1), tesseract-ocr, python-pyicu
 Suggests: cuneiform, ocrad, gocr
 Description: tool to perform OCR on DjVu documents

Modified: packages/ocrodjvu/trunk/debian/copyright
===================================================================
--- packages/ocrodjvu/trunk/debian/copyright	2011-03-13 20:30:04 UTC (rev 6764)
+++ packages/ocrodjvu/trunk/debian/copyright	2011-03-14 18:03:11 UTC (rev 6765)
@@ -8,6 +8,11 @@
 License: GPL-2
 
 
+Files: tests/hocr2djvused/alice*
+License: public-domain
+ Intellectual property rights have expired.
+
+
 Files: debian/*
 Copyright: 2009-2010 Jakub Wilk <jwilk at debian.org>
            2011 Daniel Stender <daniel at danielstender.com)

Added: packages/ocrodjvu/trunk/debian/patches/ocrodjvu-4ea0ced2ad06.diff
===================================================================
--- packages/ocrodjvu/trunk/debian/patches/ocrodjvu-4ea0ced2ad06.diff	                        (rev 0)
+++ packages/ocrodjvu/trunk/debian/patches/ocrodjvu-4ea0ced2ad06.diff	2011-03-14 18:03:11 UTC (rev 6765)
@@ -0,0 +1,15 @@
+Description: Fix test suite failure with glibc 2.11.
+Origin: https://bitbucket.org/jwilk/ocrodjvu/changeset/4ea0ced2ad06
+Last-Update: 2011-03-14
+
+--- a/tests/ipc.py
++++ b/tests/ipc.py
+@@ -138,7 +138,7 @@ class test_environment():
+             elif key == 'LC_CTYPE':
+                 has_lc_ctype = 1
+                 assert_equal(value, 'en_US.UTF-8')
+-            elif key == 'LANG':
++            elif key in ('LANG', 'LANGUAGE'):
+                 has_lang = 1
+                 assert_equal(value, '')
+             else:

Modified: packages/ocrodjvu/trunk/debian/patches/series
===================================================================
--- packages/ocrodjvu/trunk/debian/patches/series	2011-03-13 20:30:04 UTC (rev 6764)
+++ packages/ocrodjvu/trunk/debian/patches/series	2011-03-14 18:03:11 UTC (rev 6765)
@@ -0,0 +1 @@
+ocrodjvu-4ea0ced2ad06.diff

Modified: packages/ocrodjvu/trunk/debian/rules
===================================================================
--- packages/ocrodjvu/trunk/debian/rules	2011-03-13 20:30:04 UTC (rev 6764)
+++ packages/ocrodjvu/trunk/debian/rules	2011-03-14 18:03:11 UTC (rev 6765)
@@ -22,11 +22,7 @@
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	set -e -x; \
 	for python in $(shell pyversions -r); do \
-		$$python /usr/bin/nosetests --with-doctest --verbose; \
-		for app in hocr2djvused djvu2hocr; do \
-			$(MAKE) -C tests/$$app/ clean; \
-			$(MAKE) -C tests/$$app/ $$app="$$python ../../$$app"; \
-		done; \
+		$$python /usr/bin/nosetests --verbose; \
 	done
 endif