From 3dfed6f3513a5ffa4fa48ea43c5903f37a3b56d3 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 8 May 2009 22:16:40 +0200 Subject: [PATCH] rules: Use 'pyversions -vr' instead of 'pysupport-parseversions'. Added XS-Python-Version field to control, replacing the pyversions file. --- debian/changelog | 6 +++++- debian/control | 1 + debian/pyversions | 1 - debian/rules | 6 +----- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 debian/pyversions diff --git a/debian/changelog b/debian/changelog index f82314e..99e426a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ rrdtool (1.3.7-1) unstable; urgency=low - Remove .txt and .pod documentation from the 'rrdtool' binary package - the manpages are a lot more useful. - Pass --fail-missing (instead of --list-missing) to dh_install. + - Use 'pyversions -vr' instead of 'pysupport-parseversions'. * Added new binary package rrdtool-dbg. Unfortunately, segfaults and the like are not uncommon in rrdtool - this will help to trace them back more easily (Closes: #518480). @@ -33,14 +34,17 @@ rrdtool (1.3.7-1) unstable; urgency=low - Moved librrd-ruby* packages from section "interpreters" to the newly added section "ruby". - Updated standards-version to 3.8.1 - no changes. + - Added XS-Python-Version field, specifying versions >= 2.3. * debian/librrd-dev.install: - Added /usr/lib/pkgconfig/librrd.pc (Closes: #522144). * debian/rrdtool.install, debian/rrdtool.examples: - Install examples/* and ifOctets.tcl using dh_install instead of dh_installexamples. This allows the use of --fail-missing when running dh_install. + * Removed debian/pyversions - has been replaced by the XS-Python-Version + field. - -- Sebastian Harl Fri, 08 May 2009 18:00:59 +0200 + -- Sebastian Harl Fri, 08 May 2009 22:13:21 +0200 rrdtool (1.3.1-4) unstable; urgency=high diff --git a/debian/control b/debian/control index e941de3..57e203e 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, quilt, Homepage: http://oss.oetiker.ch/rrdtool/ Vcs-Browser: http://git.snow-crash.org/?p=pkg-rrdtool.git;a=summary Vcs-Git: git://git.snow-crash.org/pkg-rrdtool.git/ +XS-Python-Version: >= 2.3 Package: rrdtool Architecture: any diff --git a/debian/pyversions b/debian/pyversions deleted file mode 100644 index 57a7586..0000000 --- a/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.3- diff --git a/debian/rules b/debian/rules index 9290ed3..cce2ae2 100755 --- a/debian/rules +++ b/debian/rules @@ -12,11 +12,7 @@ include /usr/share/quilt/quilt.make RUBY_VERS := 1.8 1.9 RUBY_DEFAULT_VERS := 1.8 -#Python versions to build for. The work-around-doko way. -PY_VERS := $(shell set -e; \ - for py in `pysupport-parseversions debian/pyversions`; do \ - if [ -x /usr/bin/python$$py ]; then echo $$py; fi; \ - done) +PY_VERS := $(shell pyversions -vr) #tcl version we're building for TCL_VERS := $(shell dpkg -s tcl-dev | grep '^Depends' \ -- 2.30.2