reverted: --- newt-0.52.2/debian/patches/001_python2.3.patch +++ newt-0.52.2.orig/debian/patches/001_python2.3.patch @@ -1,16 +0,0 @@ -# The default version of python in Debian Sid is currently 2.3 -# Drop this patch when that changes. -# -- amck, 2005-10-22. - -diff -ruN newt-0.52.1-old/Makefile.in newt-0.52.1/Makefile.in ---- newt-0.52.2-old/Makefile.in 2005-09-30 15:20:53.000000000 +0100 -+++ newt-0.52.2/Makefile.in 2005-10-22 20:45:11.000000000 +0100 -@@ -10,7 +10,7 @@ - CVSTAG = r$(subst .,-,$(VERSION)) - SONAME = @SONAME@ - --PYTHONVERS = python2.4 -+PYTHONVERS = python2.3 - - WHIPTCLSO=whiptcl.so - diff -u newt-0.52.2/debian/control newt-0.52.2/debian/control --- newt-0.52.2/debian/control +++ newt-0.52.2/debian/control @@ -3,7 +3,8 @@ Priority: optional Maintainer: Alastair McKinstry Standards-Version: 3.6.2 -Build-Depends: dbs, python2.3-dev, sgmltools-lite, libslang2-dev (>=2.0.4-2), libpopt-dev, debhelper (>=5), gettext, libfribidi-dev, tcl8.4-dev +Build-Depends: dbs, python-all-dev (>= 2.3.5-7), sgmltools-lite, libslang2-dev (>=2.0.4-2), libpopt-dev, debhelper (>=5.0.37.1), gettext, libfribidi-dev, tcl8.4-dev, python-central (>= 0.4.12) +XS-Python-Version: all Package: libnewt-dev Architecture: any @@ -42,7 +43,8 @@ Architecture: any Section: python Priority: standard -Depends: libnewt0.52 (=${Source-Version}) , ${python:Depends}, ${misc:Depends} +Depends: libnewt0.52 (=${Source-Version}) , python (>= 2.3), python (<< 2.5), ${misc:Depends} +XB-Python-Version: 2.3, 2.4 Description: A NEWT module for Python This module allows you to built a text UI for your Python scripts using newt. reverted: --- newt-0.52.2/debian/python-newt.prerm.in +++ newt-0.52.2.orig/debian/python-newt.prerm.in @@ -1,15 +0,0 @@ -#!/bin/sh - -if ( [ "$1" = "upgrade" ] || [ "$1" = "remove" ] ) && [ -L /usr/doc/__PKG__ ]; then - rm -f /usr/doc/__PKG__ -fi - -# sample prerm script for Debian python packages. -# Written 1998 by Gregor Hoffleit . -# - -PACKAGE=python-newt - -dpkg --listfiles $PACKAGE | - awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | - xargs rm -f >&2 diff -u newt-0.52.2/debian/changelog newt-0.52.2/debian/changelog --- newt-0.52.2/debian/changelog +++ newt-0.52.2/debian/changelog @@ -1,3 +1,18 @@ +newt (0.52.2-4.2) unstable; urgency=low + + * python-newt: Include support for supported python versions. + * Build-depend on python-all-dev (>= 2.3.5-7) and debhelper (>= 5.0.37.1). + + -- Matthias Klose Tue, 13 Jun 2006 13:07:23 +0000 + +newt (0.52.2-4.1) experimental; urgency=low + + * Build for python2.4. + * Hardcode the python dependencies for this upload, so that we can build + without 2.4 as the default version. + + -- Matthias Klose Sun, 11 Jun 2006 15:07:35 +0000 + newt (0.52.2-4) unstable; urgency=low * Translations: diff -u newt-0.52.2/debian/rules newt-0.52.2/debian/rules --- newt-0.52.2/debian/rules +++ newt-0.52.2/debian/rules @@ -14,7 +14,7 @@ VERSION=0.52.2 SONAME=0.52 -PYVER=2.3 +PYVERS=$(shell pyversions -vr debian/control) LIB_PKG=libnewt$(SONAME) DEV_PKG=libnewt-dev @@ -89,6 +89,7 @@ dh_testroot dh_clean rm -rf $(SOURCE_DIR) $(STAMP_DIR) + rm -f debian/python-newt.dirs debian/python-newt.install debian/python-newt.postinst # rm -rf debian/substvars debian/*.bak debian/*~ *~ binary: binary-indep binary-arch @@ -186,11 +187,19 @@ $(PYTHON_PKG): build dh_testdir dh_testroot + for v in $(PYVERS); do \ + echo usr/lib/python$$v/site-packages >> debian/$@.dirs; \ + echo python$$v/_snackmodule.so usr/lib/python$$v/site-packages \ + >> debian/$@.install; \ + echo snack.py usr/lib/python$$v/site-packages \ + >> debian/$@.install; \ + done dh_installdirs -p $@ dh_install -p $@ --sourcedir=$(BUILD_TREE) dh_strip -p $@ dh_makeshlibs -p $@ dh_python -p $@ + DH_PYCENTRAL=nomove dh_pycentral -p $@ dh_installdocs -p $@ -p $@ $(BUILD_TREE)/newt.spec # Currently disabled, as debian-test has been removed. # chmod +x debian/whiptail/usr/lib/debian-test/tests/whiptail/test-newt.sh/test-newt.sh reverted: --- newt-0.52.2/debian/python-newt.dirs +++ newt-0.52.2.orig/debian/python-newt.dirs @@ -1,2 +0,0 @@ -usr/lib/python2.3 -usr/lib/python2.3/site-packages reverted: --- newt-0.52.2/debian/python-newt.install +++ newt-0.52.2.orig/debian/python-newt.install @@ -1,2 +0,0 @@ -python2.3/_snackmodule.so usr/lib/python2.3/site-packages -snack.py usr/lib/python2.3/site-packages only in patch2: unchanged: --- newt-0.52.2.orig/debian/patches/001_python.patch +++ newt-0.52.2/debian/patches/001_python.patch @@ -0,0 +1,16 @@ +# The default version of python in Debian Sid is currently 2.3 +# Drop this patch when that changes. +# -- amck, 2005-10-22. + +diff -ruN newt-0.52.1-old/Makefile.in newt-0.52.1/Makefile.in +--- newt-0.52.2-old/Makefile.in 2005-09-30 15:20:53.000000000 +0100 ++++ newt-0.52.2/Makefile.in 2005-10-22 20:45:11.000000000 +0100 +@@ -10,7 +10,7 @@ + CVSTAG = r$(subst .,-,$(VERSION)) + SONAME = @SONAME@ + +-PYTHONVERS = python2.4 ++PYTHONVERS = $(shell pyversions --supported) + + WHIPTCLSO=whiptcl.so + only in patch2: unchanged: --- newt-0.52.2.orig/debian/x.substvars +++ newt-0.52.2/debian/x.substvars @@ -0,0 +1 @@ +python:Versions=all