tags 547872 pending thanks I have uploaded Stuart's NMU to DELAYED/5.
An interdiff is attached to this email which brings the package from the previous nmu to this one. Thanks, stew
diff -u pyx-0.10/debian/compat pyx-0.10/debian/compat --- pyx-0.10/debian/compat +++ pyx-0.10/debian/compat @@ -1 +1 @@ -4 +7 diff -u pyx-0.10/debian/changelog pyx-0.10/debian/changelog --- pyx-0.10/debian/changelog +++ pyx-0.10/debian/changelog @@ -1,3 +1,18 @@ +pyx (0.10-0+nmu2) unstable; urgency=low + + * Non-maintainer upload + * Fix build system for compatibility with Python 2.6 (closes: #547872) + - change debhelper compat level to dh7. + - remove unneeded sections of debian/rules. + - remove versioned depends/conflicts/replaces for packages that haven't + existed since Sarge. + * Silence DeprecationWarning output from Python 2.6. + * Move doc package to doc section. + * Add doc-base entries for documentation. + * Bump standards version to 3.8.3 (no changes required). + + -- Stuart Prescott <stuart+deb...@nanonanonano.net> Wed, 30 Sep 2009 01:09:13 +0100 + pyx (0.10-0+nmu1) unstable; urgency=low * Non-maintainer upload diff -u pyx-0.10/debian/copyright pyx-0.10/debian/copyright --- pyx-0.10/debian/copyright +++ pyx-0.10/debian/copyright @@ -1,7 +1,7 @@ Upstream source: http://pyx.sf.net/ It is currently maintained by -Ernesto Nadir Crespo Avila <ecre...@debianvenezuela.org +Ernesto Nadir Crespo Avila <ecre...@debianvenezuela.org> Upstream authors: Copyright 2002-2007 Jörg Lehmann <joe...@users.sourceforge.net> @@ -26 +26 @@ -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License can be found in '/usr/share/common-licenses/GPL-2'. diff -u pyx-0.10/debian/rules pyx-0.10/debian/rules --- pyx-0.10/debian/rules +++ pyx-0.10/debian/rules @@ -2,92 +2,30 @@ -# $Id: rules 350 2003-09-24 02:26:28Z bob $ -# Sample debian/rules that uses debhelper. -# This file is public domain software, originally written by Joey Hess. - -docdir=/usr/share/doc/python-pyx-doc -versions=$(shell pyversions -r debian/control) - -# noopt is handled in setup.py -# nostrip handled by dh_strip - -build: build-stamp -build-stamp: - dh_testdir - for p in $(versions); do \ - $$p setup.py build_ext -g; \ - done - touch build-stamp - -clean: - dh_testdir - rm -f build-stamp - for p in $(versions); do \ - $$p setup.py clean -a ; \ - done - find -name \*.pyc -exec rm {} \; - make -C faq clean - make -C manual clean - -rm -rf debian/output - dh_clean -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - for p in $(versions); do \ - $$p setup.py install --root=$(CURDIR)/debian/python-pyx --no-compile; \ - done - - for f in `find $(CURDIR)/debian/python-pyx -name \*.py`; do \ - sed -e '\,^#!/usr/bin/env $(python)$$,d' < $$f > $$f.tmp; \ - mv $$f.tmp $$f; \ - done +%: + dh $@ + +binary: binary-arch binary-indep + +# build arch-indep files in the binary-indep target to prevent FTBFS on buildd +binary-indep: doc install + dh $@ doc: - dh_testdir make -C faq pdf - make -C manual pdf + # FIXME: the manual uses mkhowto which is not in python2.6 + PYTHON_VERSION=2.5 make -C manual pdf + +override_dh_clean: + dh_clean + make -C faq clean + make -C manual clean -# Build architecture-independent files here. -binary-indep: install doc - dh_testdir - dh_testroot - install -D -o root -g root -m 0644 manual/manual.pdf $(CURDIR)/debian/python-pyx-doc/$(docdir)/manual.pdf - install -D -o root -g root -m 0644 faq/pyxfaq.pdf $(CURDIR)/debian/python-pyx-doc/$(docdir)/pyxfaq.pdf - find gallery examples \( -name "*.py" -o -name "*.dat" -o -name "*.jpg" \) \ - -exec install -D -m 0644 {} $(CURDIR)/debian/python-pyx-doc/usr/share/doc/python-pyx-doc/{} \;; \ - dh_installchangelogs -i CHANGES - dh_installdocs -i -A README AUTHORS - dh_link -i - dh_compress -i -Xmanual.pdf -Xpyxfaq.pdf - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs -a CHANGES - dh_installdocs -a -A README AUTHORS - for p in $(versions); do \ - install -m 0644 debian/siteconfig.py debian/python-pyx/usr/lib/$$p/site-packages/pyx; \ - done - dh_pycentral - dh_link -a - dh_strip - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a +override_dh_compress: + dh_compress --all -X.pdf -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install doc +override_dh_fixperms: + dh_fixperms + find debian/python-pyx-doc/usr/share/doc/python-pyx-doc/examples/ \ + -type f -print0 | \ + xargs -0r chmod 0644 -# vim:ts=4:sw=4: +.PHONY: install doc binary binary-indep doc override_dh_clean override_dh_compress diff -u pyx-0.10/debian/control pyx-0.10/debian/control --- pyx-0.10/debian/control +++ pyx-0.10/debian/control @@ -1,19 +1,18 @@ Source: pyx Maintainer: Ernesto Nadir Crespo Avila <ecre...@debianvenezuela.org> -Standards-Version: 3.7.2 +Standards-Version: 3.8.3 Section: python Priority: optional -Build-Depends: debhelper (>= 5.0.37.1), python-all-dev, libkpathsea-dev, python (>= 2.3.5-7), python-central (>= 0.5) +Build-Depends: debhelper (>= 7.3.5), python-all-dev, libkpathsea-dev, python, python-support Build-Depends-Indep: texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended, tipa XS-Python-Version: all +Homepage: http://pyx.sourceforge.net/ Package: python-pyx Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends} +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} Recommends: texlive-latex-base Suggests: python-pyx-doc, python-imaging, texlive-fonts-recommended -Conflicts: python2.3-pyx, python2.2-pyx, python-pyx-common -Replaces: python2.3-pyx, python-pyx-common XB-Python-Version: ${python:Versions} Provides: ${python:Provides} Description: Python module for generating PostScript graphics @@ -33,6 +32,8 @@ +Section: doc +Depends: ${misc:Depends} Recommends: pdf-viewer Description: Python module for generating PostScript graphics (documentation) PyX is a Python module for generating encapsulated PostScript figures using an abstraction of PostScript and TeX. . - This package contains the manual for PyX in PDF format. + This package contains the manual for PyX in PDF format and examples. only in patch2: unchanged: --- pyx-0.10.orig/debian/python-pyx-doc.docs +++ pyx-0.10/debian/python-pyx-doc.docs @@ -0,0 +1,5 @@ +README +AUTHORS +faq/pyxfaq.pdf +manual/manual.pdf +gallery only in patch2: unchanged: --- pyx-0.10.orig/debian/python-pyx-doc.doc-base.manual +++ pyx-0.10/debian/python-pyx-doc.doc-base.manual @@ -0,0 +1,10 @@ +Document: pyx-manual +Title: PyX Programming Manual +Author: Jörg Lehmann <joe...@users.sourceforge.net>, + André Wobst <wob...@users.sourceforge.net> +Abstract: Programming reference for the PyX plotting library for preparing + scientific plots using Python and LaTeX. +Section: Science/Data Analysis + +Format: PDF +Files: /usr/share/doc/python-pyx-doc/manual.pdf only in patch2: unchanged: --- pyx-0.10.orig/debian/python-pyx.docs +++ pyx-0.10/debian/python-pyx.docs @@ -0,0 +1,2 @@ +README +AUTHORS only in patch2: unchanged: --- pyx-0.10.orig/debian/python-pyx-doc.examples +++ pyx-0.10/debian/python-pyx-doc.examples @@ -0,0 +1 @@ +examples/* only in patch2: unchanged: --- pyx-0.10.orig/debian/python-pyx-doc.doc-base.examples +++ pyx-0.10/debian/python-pyx-doc.doc-base.examples @@ -0,0 +1,14 @@ +Document: pyx-examples +Title: PyX examples +Author: Jörg Lehmann <joe...@users.sourceforge.net>, + Michael Schindler <m-schind...@users.sourceforge.net>, + André Wobst <wob...@users.sourceforge.net> +Abstract: Simple examples of the PyX plotting library, illustrating various + aspects of this Python library for plotting scientific data, including: + controlling axes, tick labels, reading data from files, plotting equations, + adding pictures to plots, adding labels and text to plots. +Section: Science/Data Analysis + +Format: Text +Files: /usr/share/doc/python-pyx-doc/examples/* +Index: /usr/share/doc/python-pyx-doc/examples/README only in patch2: unchanged: --- pyx-0.10.orig/debian/pyversions +++ pyx-0.10/debian/pyversions @@ -0,0 +1 @@ +2.4- only in patch2: unchanged: --- pyx-0.10.orig/debian/python-pyx-doc.doc-base.faq +++ pyx-0.10/debian/python-pyx-doc.doc-base.faq @@ -0,0 +1,9 @@ +Document: pyx-faq +Title: Some frequently and not so frequently asked questions about PyX +Author: Gert-Ludwig Ingold <gert.ing...@physik.uni-augsburg.de> +Abstract: FAQ for the PyX plotting library for preparing scientific plots + using Python and LaTeX. +Section: Science/Data Analysis + +Format: PDF +Files: /usr/share/doc/python-pyx-doc/pyxfaq.pdf only in patch2: unchanged: --- pyx-0.10.orig/debian/python-pyx.install +++ pyx-0.10/debian/python-pyx.install @@ -0,0 +1,3 @@ +etc/pyxrc +usr/lib/python*/*-packages/* +usr/share/pyx/* only in patch2: unchanged: --- pyx-0.10.orig/debian/python-pyx-doc.doc-base.gallery +++ pyx-0.10/debian/python-pyx-doc.doc-base.gallery @@ -0,0 +1,14 @@ +Document: pyx-gallery +Title: PyX gallery +Author: Jörg Lehmann <joe...@users.sourceforge.net>, + Michael Schindler <m-schind...@users.sourceforge.net>, + André Wobst <wob...@users.sourceforge.net> +Abstract: More complicated or real world examples of the PyX plotting library, + illustrating various aspects of this Python library for plotting scientific + data. The code is designed to be a starting point for your own experiments + with PyX. +Section: Science/Data Analysis + +Format: Text +Files: /usr/share/doc/python-pyx-doc/gallery/* +Index: /usr/share/doc/python-pyx-doc/gallery/README only in patch2: unchanged: --- pyx-0.10.orig/pyx/text.py +++ pyx-0.10/pyx/text.py @@ -25,6 +25,10 @@ import config, siteconfig, unit, box, canvas, trafo, version, attr, style, dvifile import bbox as bboxmodule +# Suppress this python 2.6 warning +import warnings +warnings.filterwarnings("ignore", r".*popen.*", DeprecationWarning, "pyx\.text") + ############################################################################### # texmessages # - please don't get confused:
signature.asc
Description: Digital signature
