okay, he'res the right diff for the NMU to work ... -- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -u pytone-2.3.0/debian/rules pytone-2.3.0/debian/rules --- pytone-2.3.0/debian/rules +++ pytone-2.3.0/debian/rules @@ -28,7 +28,7 @@ dh_testdir # Compile our pcm module - python2.3 setup.py build_ext -i + python setup.py build_ext -i touch build-stamp @@ -39,7 +39,7 @@ rm -f build-stamp #clean up everything - python2.3 setup.py clean + python setup.py clean find -name '*.pyc' -exec rm {} \; dh_clean src/pcm.so src/bufferedao.so @@ -69,7 +69,7 @@ dh_strip dh_compress dh_fixperms - dh_python + dh_pysupport dh_installdeb dh_shlibdeps dh_gencontrol reverted: --- pytone-2.3.0/debian/patches/01_pytone_chpath.dpatch +++ pytone-2.3.0.orig/debian/patches/01_pytone_chpath.dpatch @@ -1,31 +0,0 @@ -#!/bin/sh -e -## 01_pytone_chpath.dpatch by Alexander Wirt <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Changes the patch of the python.py callerscript - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p0 < $0;; - -unpatch) patch $patch_opts -p0 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - [EMAIL PROTECTED]@ ---- pytone 2004-01-11 13:24:51.000000000 +0100 -+++ /tmp/pytone 2004-01-11 13:25:51.000000000 +0100 -@@ -1,2 +1,2 @@ - #!/bin/sh --python src/pytone.py "$@" -+python2.3 /usr/share/pytone/pytone.py "$@" reverted: --- pytone-2.3.0/debian/patches/02_pytone_ctl.chpath.dpatch +++ pytone-2.3.0.orig/debian/patches/02_pytone_ctl.chpath.dpatch @@ -1,31 +0,0 @@ -#!/bin/sh -e -## 02_pytonectl_chpath.dpatch by Alexander Wirt <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Changes the patch of the python.py callerscript - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p0 < $0;; - -unpatch) patch $patch_opts -p0 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - [EMAIL PROTECTED]@ ---- /tmp/pytonectl 2004-01-11 13:14:24.000000000 +0100 -+++ pytonectl 2004-01-11 13:15:32.000000000 +0100 -@@ -1,2 +1,2 @@ - #!/bin/sh --python src/pytonectl.py "$@" -+python2.3 /usr/share/pytone/pytonectl.py "$@" reverted: --- pytone-2.3.0/debian/patches/00list +++ pytone-2.3.0.orig/debian/patches/00list @@ -1,2 +0,0 @@ -01_pytone_chpath.dpatch -02_pytone_ctl.chpath.dpatch diff -u pytone-2.3.0/debian/control pytone-2.3.0/debian/control --- pytone-2.3.0/debian/control +++ pytone-2.3.0/debian/control @@ -2,8 +2,8 @@ Section: sound Priority: optional Maintainer: Alexander Wirt <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0), python2.3-dev, dpatch, python2.3, python, libao-dev -Standards-Version: 3.6.2 +Build-Depends: debhelper (>= 4.0.0), python-dev, dpatch, libao-dev, python-support (>= 0.4) +Standards-Version: 3.7.2 Package: pytone Architecture: any diff -u pytone-2.3.0/debian/dirs pytone-2.3.0/debian/dirs --- pytone-2.3.0/debian/dirs +++ pytone-2.3.0/debian/dirs @@ -2 +2 @@ -usr/share/pytone/plugins +usr/lib/pytone diff -u pytone-2.3.0/debian/pytone.install pytone-2.3.0/debian/pytone.install --- pytone-2.3.0/debian/pytone.install +++ pytone-2.3.0/debian/pytone.install @@ -1,14 +1,15 @@ -locale/de/LC_MESSAGES/*.mo usr/share/locale/de/LC_MESSAGES/ -locale/it/LC_MESSAGES/*.mo usr/share/locale/it/LC_MESSAGES/ -locale/pl/LC_MESSAGES/*.mo usr/share/locale/pl/LC_MESSAGES/ -locale/fr/LC_MESSAGES/*.mo usr/share/locale/fr/LC_MESSAGES/ -pytone usr/bin -pytonectl usr/bin -src/pcm.so usr/lib/site-python/ -src/bufferedao.so /usr/lib/site-python/ -src/*.py usr/share/pytone/ -src/services/* usr/share/pytone/services -conf/pytonerc etc/ -conf/* usr/share/doc/pytone/examples -src/plugins/minimal.py usr/share/doc/pytone/examples/plugins -src/plugins/* /usr/share/pytone/plugins +locale/de/LC_MESSAGES/*.mo usr/share/locale/de/LC_MESSAGES/ +locale/it/LC_MESSAGES/*.mo usr/share/locale/it/LC_MESSAGES/ +locale/pl/LC_MESSAGES/*.mo usr/share/locale/pl/LC_MESSAGES/ +locale/fr/LC_MESSAGES/*.mo usr/share/locale/fr/LC_MESSAGES/ + +src/pcm.so usr/lib/pytone/ +src/bufferedao.so usr/lib/pytone/ + +src/*.py usr/lib/pytone/ +src/services/* usr/lib/pytone/services +src/plugins/* usr/lib/pytone/plugins + +conf/pytonerc etc/ +conf/* usr/share/doc/pytone/examples +src/plugins/minimal.py usr/share/doc/pytone/examples/plugins diff -u pytone-2.3.0/debian/changelog pytone-2.3.0/debian/changelog --- pytone-2.3.0/debian/changelog +++ pytone-2.3.0/debian/changelog @@ -1,3 +1,27 @@ +pytone (2.3.0-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Redo the previous NMU correctly: + + build for the current python (no more python2.3 references). + + use python-support. + + install all in /usr/lib/pytone. + + make /usr/bin/pythone{,ctl} be links instead of scripts, no more + dpatche's. + + -- Pierre Habouzit <[EMAIL PROTECTED]> Wed, 30 Aug 2006 09:52:01 +0200 + +pytone (2.3.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Update package to the last python policy (Closes: #380921): + + build for current python (remove references to python2.3). + + remove python2.3 dpatch'es. + + use python-support. + + use distutils better, avoid custom dh_install's. + * bump Standards-Version to 3.7.2. + + -- Pierre Habouzit <[EMAIL PROTECTED]> Tue, 29 Aug 2006 22:00:11 +0200 + pytone (2.3.0-1) unstable; urgency=low * New upstream release only in patch2: unchanged: --- pytone-2.3.0.orig/debian/pytone.links +++ pytone-2.3.0/debian/pytone.links @@ -0,0 +1,2 @@ +usr/lib/pytone/pytone.py usr/bin/pytone +usr/lib/pytone/pytonectl.py usr/bin/pytonectl
signature.asc
Description: Digital signature