diff -u tau-2.14.6/tools/src/TauIL/Makefile.inc tau-2.14.6/tools/src/TauIL/Makefile.inc --- tau-2.14.6/tools/src/TauIL/Makefile.inc +++ tau-2.14.6/tools/src/TauIL/Makefile.inc @@ -1,4 +1,4 @@ -TAU_HOME = /disc5/dwitch/deb/tau/tau-2.14.6 +TAU_HOME = /home/packages/tmp/tau-2.14.6 TAUIL_HOME = $(TAU_HOME)/tools/src/TauIL diff -u tau-2.14.6/tools/src/dms/src/examples/testBuild tau-2.14.6/tools/src/dms/src/examples/testBuild --- tau-2.14.6/tools/src/dms/src/examples/testBuild +++ tau-2.14.6/tools/src/dms/src/examples/testBuild @@ -1,5 +1,5 @@ #!/bin/sh -TAUROOT=/disc5/dwitch/deb/tau/tau-2.14.6 +TAUROOT=/home/packages/tmp/tau-2.14.6 CONFIG_ARCH=default PERFDMF_HOME=${TAUROOT}/tools/src/dms diff -u tau-2.14.6/tools/src/dms/src/examples/testSimpleExample tau-2.14.6/tools/src/dms/src/examples/testSimpleExample --- tau-2.14.6/tools/src/dms/src/examples/testSimpleExample +++ tau-2.14.6/tools/src/dms/src/examples/testSimpleExample @@ -1,5 +1,5 @@ #!/bin/sh -TAUROOT=/disc5/dwitch/deb/tau/tau-2.14.6 +TAUROOT=/home/packages/tmp/tau-2.14.6 CONFIG_ARCH=default PERFDMF_HOME=${TAUROOT}/tools/src/dms XMLSAX_JAR=${TAUROOT}/${CONFIG_ARCH}/lib/xerces.jar diff -u tau-2.14.6/tools/src/dms/src/examples/testScalabilityExample tau-2.14.6/tools/src/dms/src/examples/testScalabilityExample --- tau-2.14.6/tools/src/dms/src/examples/testScalabilityExample +++ tau-2.14.6/tools/src/dms/src/examples/testScalabilityExample @@ -1,5 +1,5 @@ #!/bin/sh -TAUROOT=/disc5/dwitch/deb/tau/tau-2.14.6 +TAUROOT=/home/packages/tmp/tau-2.14.6 CONFIG_ARCH=default PERFDMF_HOME=${TAUROOT}/tools/src/dms XMLSAX_JAR=${TAUROOT}/${CONFIG_ARCH}/lib/xerces.jar diff -u tau-2.14.6/tools/src/dms/src/examples/testCopy tau-2.14.6/tools/src/dms/src/examples/testCopy --- tau-2.14.6/tools/src/dms/src/examples/testCopy +++ tau-2.14.6/tools/src/dms/src/examples/testCopy @@ -1,5 +1,5 @@ #!/bin/sh -TAUROOT=/disc5/dwitch/deb/tau/tau-2.14.6 +TAUROOT=/home/packages/tmp/tau-2.14.6 CONFIG_ARCH=default PERFDMF_HOME=${TAUROOT}/tools/src/dms XMLSAX_JAR=${TAUROOT}/${CONFIG_ARCH}/lib/xerces.jar diff -u tau-2.14.6/tools/src/dms/src/examples/testDelete tau-2.14.6/tools/src/dms/src/examples/testDelete --- tau-2.14.6/tools/src/dms/src/examples/testDelete +++ tau-2.14.6/tools/src/dms/src/examples/testDelete @@ -1,5 +1,5 @@ #!/bin/sh -TAUROOT=/disc5/dwitch/deb/tau/tau-2.14.6 +TAUROOT=/home/packages/tmp/tau-2.14.6 CONFIG_ARCH=default PERFDMF_HOME=${TAUROOT}/tools/src/dms XMLSAX_JAR=${TAUROOT}/${CONFIG_ARCH}/lib/xerces.jar diff -u tau-2.14.6/tools/src/dms/src/examples/testSave tau-2.14.6/tools/src/dms/src/examples/testSave --- tau-2.14.6/tools/src/dms/src/examples/testSave +++ tau-2.14.6/tools/src/dms/src/examples/testSave @@ -1,5 +1,5 @@ #!/bin/sh -TAUROOT=/disc5/dwitch/deb/tau/tau-2.14.6 +TAUROOT=/home/packages/tmp/tau-2.14.6 CONFIG_ARCH=default PERFDMF_HOME=${TAUROOT}/tools/src/dms XMLSAX_JAR=${TAUROOT}/${CONFIG_ARCH}/lib/xerces.jar diff -u tau-2.14.6/.all_configs tau-2.14.6/.all_configs --- tau-2.14.6/.all_configs +++ tau-2.14.6/.all_configs @@ -5,0 +6,3 @@ +-arch=default +-prefix=/home/packages/tmp/tau-2.14.6/debian/BUILD/usr/lib/tau -pthread +-arch=default diff -u tau-2.14.6/debian/changelog tau-2.14.6/debian/changelog --- tau-2.14.6/debian/changelog +++ tau-2.14.6/debian/changelog @@ -1,3 +1,11 @@ +tau (2.14.6-2.1) unstable; urgency=low + + * NMU. + * Convert to the updated Python policy. Collapse tau-python-common, + python2.3-dev, python2.4-dev into a python-tau package. Closes: #373389. + + -- Matthias Klose Tue, 11 Jul 2006 08:57:54 +0000 + tau (2.14.6-2) unstable; urgency=low * Rebuilt with g++-4.0. diff -u tau-2.14.6/debian/control tau-2.14.6/debian/control --- tau-2.14.6/debian/control +++ tau-2.14.6/debian/control @@ -2,7 +2,8 @@ Section: devel Priority: optional Maintainer: Yann Dirson -Build-Depends: debhelper (>> 4), dh-buildinfo, tcsh, python2.3-dev, python2.4-dev +Build-Depends: debhelper (>= 5.0.37.2), dh-buildinfo, tcsh, python-all-dev (>= 2.3.5-11), python-central (>= 0.5) +XS-Python-Version: all Standards-Version: 3.6.2 Package: tau @@ -39,42 +40,20 @@ actively developed. Unfortunately, those tools cannot build yet using free tools. -Package: tau-python-common +Package: python-tau Section: python -Architecture: all -Depends: tau (= ${Source-Version}) -Recommends: python2.3-tau | python2.4-tau -Replaces: tau-examples (<= 2.12.8-1), python2.2-tau (<= 2.12.8-3) +Architecture: any +Depends: tau (= ${Source-Version}), ${python:Depends}, ${shlibs:Depends} +Provides: tau-python-common, ${python:Provides} +Conflicts: tau-python-common, python2.3-tau, python2.4-tau +Replaces: tau-python-common, python2.3-tau, python2.4-tau, tau-examples (<= 2.12.8-1), python2.2-tau (<= 2.12.8-3) +XB-Python-Version: ${python:Versions} Description: Tuning and Analysis Utilities - support for python bindings TAU is a profiling toolkit specially made for parallel computing (multi-thread, multi-process, MPI, PVM). . - This package contains support files for the packages providing TAU - python bindings, as well as examples of use of these bindings. - -Package: python2.3-tau -Section: python -Architecture: any -Depends: tau-python-common (= ${Source-Version}), python2.3 -Description: Tuning and Analysis Utilities - python2.3 bindings - TAU is a profiling toolkit specially made for parallel computing - (multi-thread, multi-process, MPI, PVM). - . - This package provides a python2.3 package providing bindings to the - TAU functionality, as well as some auto-instrumentation support for - python programs. - -Package: python2.4-tau -Section: python -Architecture: any -Depends: tau-python-common (= ${Source-Version}), python2.4 -Description: Tuning and Analysis Utilities - python2.4 bindings - TAU is a profiling toolkit specially made for parallel computing - (multi-thread, multi-process, MPI, PVM). - . - This package provides a python2.4 package providing bindings to the - TAU functionality, as well as some auto-instrumentation support for - python programs. + This package python bindings to the TAU functionality, as well as + some auto-instrumentation support for python programs. Package: tau-examples Architecture: all diff -u tau-2.14.6/debian/rules tau-2.14.6/debian/rules --- tau-2.14.6/debian/rules +++ tau-2.14.6/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ALL_PY_VERS = 2.3 2.4 +ALL_PY_VERS := $(shell pyversions -vr debian/control) export DH_OPTIONS @@ -165,8 +165,9 @@ mkdir -p debian/tau-examples/usr/share/doc/tau ln -s ../tau-examples/examples debian/tau-examples/usr/share/doc/tau/ - mkdir -p debian/tau-python-common/usr/share/doc/tau-examples/examples/python - ln -s ../tau-examples/examples/python debian/tau-python-common/usr/share/doc/tau-python-common/examples + mkdir -p debian/python-tau/usr/share/doc/tau-examples/examples/python + mkdir -p debian/python-tau/usr/share/doc/python-tau + ln -s ../tau-examples/examples/python debian/python-tau/usr/share/doc/python-tau/examples dh_installexamples # This is already in python-tau @@ -203,10 +204,6 @@ dh_testdir dh_testroot # dh_installdebconf - for v in ${ALL_PY_VERS}; do \ - mkdir -p debian/python$$v-tau/usr/share/doc ;\ - ln -s tau-python-common debian/python$$v-tau/usr/share/doc/python$$v-tau ;\ - done # dh_installexamples dh_installdocs dh_buildinfo @@ -225,6 +222,8 @@ # dh_link dh_strip dh_compress + DH_PYCENTRAL=nomove dh_pycentral + dh_python dh_fixperms dh_makeshlibs dh_installdeb reverted: --- tau-2.14.6/debian/tau-python-common.examples +++ tau-2.14.6.orig/debian/tau-python-common.examples @@ -1 +0,0 @@ -examples/python/* reverted: --- tau-2.14.6/debian/tau-python-common.files +++ tau-2.14.6.orig/debian/tau-python-common.files @@ -1 +0,0 @@ -/usr/lib/tau/*/lib/tau.py reverted: --- tau-2.14.6/debian/python2.3-tau.files +++ tau-2.14.6.orig/debian/python2.3-tau.files @@ -1 +0,0 @@ -/usr/lib/python2.3 reverted: --- tau-2.14.6/debian/python2.4-tau.files +++ tau-2.14.6.orig/debian/python2.4-tau.files @@ -1 +0,0 @@ -/usr/lib/python2.4 only in patch2: unchanged: --- tau-2.14.6.orig/debian/python-tau.files +++ tau-2.14.6/debian/python-tau.files @@ -0,0 +1,2 @@ +/usr/lib/python* +/usr/lib/tau/*/lib/tau.py only in patch2: unchanged: --- tau-2.14.6.orig/debian/python-tau.examples +++ tau-2.14.6/debian/python-tau.examples @@ -0,0 +1 @@ +examples/python/*