[Python-apps-commits] r8589 - in packages/veusz/trunk/debian (3 files)

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

    Date: Wednesday, May 2, 2012 @ 21:20:41
  Author: jeremysanders-guest
Revision: 8589

Set LC_ALL in build. Delete self test outputs on clean.

Modified:
  packages/veusz/trunk/debian/changelog
  packages/veusz/trunk/debian/patches/arm-self-tests.diff
  packages/veusz/trunk/debian/rules

Modified: packages/veusz/trunk/debian/changelog
===================================================================
--- packages/veusz/trunk/debian/changelog	2012-05-02 21:13:08 UTC (rev 8588)
+++ packages/veusz/trunk/debian/changelog	2012-05-02 21:20:41 UTC (rev 8589)
@@ -6,10 +6,11 @@
   * Replace patches with use of upstream setup.py options and symlinks
   * Bumped Standards-Version to 3.9.3
   * Do not run incorrectly failing self tests (Closes: #654604)
-  * Patch self test to run with LC_ALL=C
+  * Run self test to run as LANG=C
+  * Delete any self test failures on dh_clean
   * Update copyright header for released DEP5
 
- -- Jeremy Sanders <jeremy at jeremysanders.net>  Mon, 30 Apr 2012 19:21:00 +0100
+ -- Jeremy Sanders <jeremy at jeremysanders.net>  Wed, 02 May 2012 22:10:00 +0100
 
 veusz (1.14-1) unstable; urgency=low
 

Modified: packages/veusz/trunk/debian/patches/arm-self-tests.diff
===================================================================
--- packages/veusz/trunk/debian/patches/arm-self-tests.diff	2012-05-02 21:13:08 UTC (rev 8588)
+++ packages/veusz/trunk/debian/patches/arm-self-tests.diff	2012-05-02 21:20:41 UTC (rev 8589)
@@ -2,9 +2,7 @@
  These self tests fail on ARM, due to differences in floating point
  precision. They do not indicate real problems. The tests are fixed in
  the upstream development version, but a direct fix would be a very
- large patch. We also patch the language variable to be C for the self
- tests to work in various locales. These changes will no longer be
- required in >1.15.
+ large patch. This change will no longer be required in >1.15.
 Origin: vendor
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654604
 Forwarded: not-needed
@@ -13,14 +11,6 @@
 
 --- veusz-1.15.orig/tests/runselftest.py
 +++ veusz-1.15/tests/runselftest.py
-@@ -40,6 +40,7 @@
- import glob
- import os.path
- import sys
-+import os
- 
- import veusz.qtall as qt4
- import veusz.utils.textrender
 @@ -52,6 +53,15 @@
  # it appears the failures aren't important however
  excluded_tests = set([
@@ -37,12 +27,3 @@
          # fails on Windows
          'histo.vsz',      # duplicate in long list of values
          'spectrum.vsz',   # angstrom is split into two on linux
-@@ -174,6 +184,8 @@
-         sys.exit(fails)
- 
- if __name__ == '__main__':
-+    os.environ['LC_ALL'] = 'C'
-+
-     app = qt4.QApplication([])
- 
-     veusz.setting.transient_settings['unsafe_mode'] = True

Modified: packages/veusz/trunk/debian/rules
===================================================================
--- packages/veusz/trunk/debian/rules	2012-05-02 21:13:08 UTC (rev 8588)
+++ packages/veusz/trunk/debian/rules	2012-05-02 21:20:41 UTC (rev 8589)
@@ -40,11 +40,13 @@
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e -x;\
 	for py in $(PYVERS); do \
+		LC_ALL=C \
 		PYTHONPATH=$(call pythonpath,$$py) \
 		VEUSZ_RESOURCE_DIR=. \
 			xvfb-run -a \
 			--server-args "-screen 0 640x480x24" \
 			python$$py tests/runselftest.py ;\
+		LC_ALL=C \
 		PYTHONPATH=$(call pythonpath_dbg,$$py) \
 		VEUSZ_RESOURCE_DIR=. \
 			xvfb-run -a \
@@ -69,3 +71,5 @@
 	rm -f Documents/manual.html Documents/manual.pdf \
 		Documents/manual.txt \
 		Documents/veusz.1 Documents/veusz_listen.1
+# delete any self test failures
+	rm -f tests/*.temp.selftest