[Python-apps-commits] r10520 - in packages/veusz/trunk/debian (7 files)
jeremysanders-guest at users.alioth.debian.org
jeremysanders-guest at users.alioth.debian.org
Sat Feb 15 16:25:25 UTC 2014
Date: Saturday, February 15, 2014 @ 16:25:24
Author: jeremysanders-guest
Revision: 10520
* Update to Veusz 1.20.1
* Use patch to fix arm self test failure (applied upstream)
* New build dependency for documentation generation and self tests
* Install upstream .desktop and xml mime file
Added:
packages/veusz/trunk/debian/patches/arm-self-test.diff
Modified:
packages/veusz/trunk/debian/changelog
packages/veusz/trunk/debian/control
packages/veusz/trunk/debian/patches/series
packages/veusz/trunk/debian/rules
packages/veusz/trunk/debian/veusz.install
Deleted:
packages/veusz/trunk/debian/veusz.desktop
Modified: packages/veusz/trunk/debian/changelog
===================================================================
--- packages/veusz/trunk/debian/changelog 2014-02-14 00:15:56 UTC (rev 10519)
+++ packages/veusz/trunk/debian/changelog 2014-02-15 16:25:24 UTC (rev 10520)
@@ -1,10 +1,13 @@
-veusz (1.19.1-1) unstable; urgency=low
+veusz (1.20.1-1) unstable; urgency=low
- * Update to Veusz 1.19.1
+ * Update to Veusz 1.20.1
* Update Standards-Version to 3.9.4
* Remove workaround for #589789
+ * Add patch for ARM self build failure (fixed upstream)
+ * Install package-provided .desktop and mime database files
+ * Modify documentation generation dependency to fop and xmlto
- -- Jeremy Sanders <jeremy at jeremysanders.net> Thu, 26 Dec 2013 14:00:00 +0100
+ -- Jeremy Sanders <jeremy at jeremysanders.net> Sat, 15 Feb 2014 17:15:00 +0100
veusz (1.17.1-2) UNRELEASED; urgency=low
Modified: packages/veusz/trunk/debian/control
===================================================================
--- packages/veusz/trunk/debian/control 2014-02-14 00:15:56 UTC (rev 10519)
+++ packages/veusz/trunk/debian/control 2014-02-15 16:25:24 UTC (rev 10520)
@@ -6,11 +6,14 @@
Build-Depends: debhelper (>= 7.3.5~),
docbook-utils,
docbook-xml,
+ fop,
graphicsmagick,
libqt4-dev,
perl,
python-all-dbg,
python-all-dev (>= 2.6.5-13~),
+ python-pyfits,
+ python-h5py,
python-numpy (>= 1:1.4.1-4~),
python-numpy-dbg,
python-qt4-dbg,
@@ -19,6 +22,7 @@
python-sip-dev,
xauth,
xfonts-base,
+ xmlto,
xvfb
Standards-Version: 3.9.4
X-Python-Version: >= 2.4
@@ -33,13 +37,15 @@
veusz-helpers (>= ${source:Version}),
${misc:Depends},
${python:Depends}
-Suggests: python-pyfits
+Suggests: python-h5py,
+ python-pyfits
Description: 2D scientific plotting application with graphical interface
Veusz is a 2D scientific plotting and graphing package, designed to
produce publication-ready Postscript or PDF output. Veusz provides a GUI,
command line and scripting interface (based on Python) to its plotting
facilities. The plots are built using an object-based system to
- provide a consistent interface.
+ provide a consistent interface. Veusz supports reading data from CSV, text,
+ HDF5 and FITS formats.
Package: veusz-helpers
Architecture: any
Added: packages/veusz/trunk/debian/patches/arm-self-test.diff
===================================================================
--- packages/veusz/trunk/debian/patches/arm-self-test.diff (rev 0)
+++ packages/veusz/trunk/debian/patches/arm-self-test.diff 2014-02-15 16:25:24 UTC (rev 10520)
@@ -0,0 +1,37 @@
+Description: Fix self test failures on ARM
+Origin: upstream, https://github.com/jeremysanders/veusz/commit/96b18186c198ad37350420356fa5cf000332c0bc
+Bug: https://github.com/jeremysanders/veusz/issues/58
+Author: Jeremy Sanders <jeremy at jeremysanders.net>
+
+diff --git a/tests/runselftest.py b/tests/runselftest.py
+index 1ec0944..870710c 100755
+--- a/tests/runselftest.py
++++ b/tests/runselftest.py
+@@ -233,12 +233,7 @@ def runTests():
+
+ oldflt = svg_export.fltStr
+ def fltStr(v, prec=1):
+- # this is to get consistent rounding to get the self test correct... yuck
+- # decimal would work, but that drags in loads of code
+- # convert float to string with prec decimal places
+-
+- v = round(v, prec+2)
+-
++ """Only output floats to 1 dp."""
+ return oldflt(v, prec=prec)
+
+ if __name__ == '__main__':
+diff --git a/veusz/document/svg_export.py b/veusz/document/svg_export.py
+index ae343ff..b90dde7 100644
+--- a/veusz/document/svg_export.py
++++ b/veusz/document/svg_export.py
+@@ -44,6 +44,9 @@ def fltStr(v, prec=2):
+ """Change a float to a string, using a maximum number of decimal places
+ but removing trailing zeros."""
+
++ # ensures consistent rounding behaviour on different platforms
++ v = round(v, prec+2)
++
+ val = ('% 20.10f' % v)[:10+prec]
+
+ # drop any trailing zeros
Modified: packages/veusz/trunk/debian/patches/series
===================================================================
--- packages/veusz/trunk/debian/patches/series 2014-02-14 00:15:56 UTC (rev 10519)
+++ packages/veusz/trunk/debian/patches/series 2014-02-15 16:25:24 UTC (rev 10520)
@@ -0,0 +1 @@
+arm-self-test.diff
Modified: packages/veusz/trunk/debian/rules
===================================================================
--- packages/veusz/trunk/debian/rules 2014-02-14 00:15:56 UTC (rev 10519)
+++ packages/veusz/trunk/debian/rules 2014-02-15 16:25:24 UTC (rev 10520)
@@ -68,7 +68,7 @@
# delete files generated by rules
rm -f debian/veusz.xpm
rm -f Documents/manual.html Documents/manual.pdf \
- Documents/manual.txt \
+ Documents/manual.txt Documents/manual.fo \
Documents/veusz.1 Documents/veusz_listen.1
# delete any self test failures
rm -f tests/*.temp.selftest
Deleted: packages/veusz/trunk/debian/veusz.desktop
===================================================================
--- packages/veusz/trunk/debian/veusz.desktop 2014-02-14 00:15:56 UTC (rev 10519)
+++ packages/veusz/trunk/debian/veusz.desktop 2014-02-15 16:25:24 UTC (rev 10520)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Veusz
-GenericName=Scientific plotting
-Comment=For graphing and manipulation of scientific data
-MimeType=application/x-veusz;
-# veusz can open .vsz files
-Exec=veusz %F
-Icon=veusz
-Terminal=false
-Type=Application
-Categories=Graphics;
Modified: packages/veusz/trunk/debian/veusz.install
===================================================================
--- packages/veusz/trunk/debian/veusz.install 2014-02-14 00:15:56 UTC (rev 10519)
+++ packages/veusz/trunk/debian/veusz.install 2014-02-15 16:25:24 UTC (rev 10520)
@@ -1,5 +1,6 @@
-debian/veusz.desktop usr/share/applications/
-debian/veusz.xpm usr/share/pixmaps
+support/veusz.desktop usr/share/applications/
+support/veusz.xml usr/share/mime/packages/
+debian/veusz.xpm usr/share/pixmaps/
usr/bin
usr/lib/python*/*-packages/veusz/*.py
usr/lib/python*/*-packages/veusz/*/*.py
More information about the Python-apps-commits
mailing list