Hi, Attached is the diff for my apoo 1.3-7.1 NMU.
-- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/apoo.dirs /tmp/Aedv66dF1m/apoo-1.3/debian/apoo.dirs --- /tmp/b6LY4AiurS/apoo-1.3/debian/apoo.dirs 2004-06-04 18:10:43.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/apoo.dirs 2006-08-13 02:10:41.000000000 +0200 @@ -1 +1,2 @@ -usr/share/doc/apoo +usr/bin +usr/lib/apoo diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/apoo.menu /tmp/Aedv66dF1m/apoo-1.3/debian/apoo.menu --- /tmp/b6LY4AiurS/apoo-1.3/debian/apoo.menu 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/apoo.menu 2006-08-13 01:58:28.000000000 +0200 @@ -0,0 +1,2 @@ +?package(apoo):needs="X11" section="Apps/Education"\ + title="apoo" command="/usr/bin/apoo" diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/changelog /tmp/Aedv66dF1m/apoo-1.3/debian/changelog --- /tmp/b6LY4AiurS/apoo-1.3/debian/changelog 2006-05-08 14:43:54.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/changelog 2006-08-13 02:14:16.000000000 +0200 @@ -1,3 +1,14 @@ +apoo (1.3-7.1) unstable; urgency=low + + * Non-maintainer upload. + * Update package to the last python policy (Closes: #380753): + + modules are private, so we only need one version at the time. + + simplify packaging accordingly. + * Use more dh_* tools to simplify overcomplicated packaging. + * Make exec-apoo find its tools, by appending /usr/lib/apoo to the sys.path. + + -- Pierre Habouzit <[EMAIL PROTECTED]> Sun, 13 Aug 2006 02:14:03 +0200 + apoo (1.3-7) unstable; urgency=low * Bug fix: "apoo: Spelling mistakes in package descripton", thanks to diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/control /tmp/Aedv66dF1m/apoo-1.3/debian/control --- /tmp/b6LY4AiurS/apoo-1.3/debian/control 2006-05-08 13:50:25.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/control 2006-08-13 01:56:29.000000000 +0200 @@ -2,47 +2,20 @@ Section: misc Priority: optional Maintainer: Rogerio Reis <[EMAIL PROTECTED]> -Build-Depends: debhelper (>> 4.0.0), python, python2.3, python2.4 +Build-Depends: debhelper (>> 4.0.0), +Build-Depends-Indep: python-dev, python-support (>= 0.4.0) Standards-Version: 3.7.2 Package: apoo Architecture: all -Depends: python (>= 2.3), python (<< 2.5), python-tk, python2.3-apoo -Description: An Assembly course aid - A virtual machine (a CPU) created for teaching purposes. All the programs - are written in Python and are very easy to extend to incorporate new - assembly-like pseudo-instuctions. A TK-based interface is provided, to +Depends: ${python:Depends}, python-tk +Conflicts: python2.3-apoo (<< 1.3-7.1), python2.4-apoo (<< 1.3-7.1) +Replaces: python2.3-apoo (<< 1.3-7.1), python2.4-apoo (<< 1.3-7.1) +Description: An Assembly course aid + A virtual machine (a CPU) created for teaching purposes. All the programs + are written in Python and are very easy to extend to incorporate new + assembly-like pseudo-instuctions. A TK-based interface is provided, to help debugging or just examining the execution of programs. Another program permits a tutor to create exercises and write rules to - automatically grade the students' solutions. - . - This package is an empty dummy package that always depends on - a package built for Debian's default Python version. + automatically grade the students' solutions. -Package: python2.3-apoo -Architecture: all -Depends: python2.3, python-tk -Conflicts: python2.3-apoo -Description: An Assembly course aid - A virtual machine (a CPU) created for teaching purposes. All the programs - are written in Python and are very easy to extend to incorporate new - assembly-like pseudo-instuctions. A TK-based interface is provided, to - help debugging or just examining the execution of programs. - Another program permits a tutor to create exercises and write rules to - automatically grade the students' solutions. - . - This package is built with python2.3 - -Package: python2.4-apoo -Architecture: all -Depends: python2.4, python-tk -Conflicts: apoo, python2.4-apoo -Description: An Assembly course aid - A virtual machine (a CPU) created for teaching purposes. All the programs - are written in Python and are very easy to extend to incorporate new - assembly-like pseudo-instuctions. A TK-based interface is provided, to - help debugging or just examining the execution of programs. - Another program permits a tutor to create exercises and write rules to - automatically grade the students' solutions. - . - This package is built with python2.4 diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/postinst /tmp/Aedv66dF1m/apoo-1.3/debian/postinst --- /tmp/b6LY4AiurS/apoo-1.3/debian/postinst 2003-08-11 13:24:31.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -#! /bin/sh -# postinst script for apoo -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/prerm /tmp/Aedv66dF1m/apoo-1.3/debian/prerm --- /tmp/b6LY4AiurS/apoo-1.3/debian/prerm 2003-08-11 13:24:52.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/prerm 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -#! /bin/sh -# prerm script for apoo -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <prerm> `remove' -# * <old-prerm> `upgrade' <new-version> -# * <new-prerm> `failed-upgrade' <old-version> -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> -# * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - failed-upgrade) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/python2.3-apoo.dirs /tmp/Aedv66dF1m/apoo-1.3/debian/python2.3-apoo.dirs --- /tmp/b6LY4AiurS/apoo-1.3/debian/python2.3-apoo.dirs 2004-06-04 17:54:26.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/python2.3-apoo.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/share/doc/python2.3-apoo/html usr/share/doc/python2.3-apoo/examples usr/bin usr/share/man/man1 usr/lib/apoo - diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/python2.3-apoo.menu /tmp/Aedv66dF1m/apoo-1.3/debian/python2.3-apoo.menu --- /tmp/b6LY4AiurS/apoo-1.3/debian/python2.3-apoo.menu 2004-06-04 17:55:30.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/python2.3-apoo.menu 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -?package(python2.3-apoo):needs="X11" section="Apps/Education"\ - title="apoo" command="/usr/bin/apoo" diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/python2.3-apoo.postinst /tmp/Aedv66dF1m/apoo-1.3/debian/python2.3-apoo.postinst --- /tmp/b6LY4AiurS/apoo-1.3/debian/python2.3-apoo.postinst 2003-08-24 13:39:36.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/python2.3-apoo.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -#! /bin/sh -# postinst script for apoo -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - /usr/bin/python2.3 /usr/lib/python2.3/compileall.py -f -q /usr/lib/apoo - /usr/bin/python2.3 -O /usr/lib/python2.3/compileall.py -f -q /usr/lib/apoo - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/python2.3-apoo.prerm /tmp/Aedv66dF1m/apoo-1.3/debian/python2.3-apoo.prerm --- /tmp/b6LY4AiurS/apoo-1.3/debian/python2.3-apoo.prerm 2003-08-18 10:21:19.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/python2.3-apoo.prerm 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -#! /bin/sh -# prerm script for apoo -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <prerm> `remove' -# * <old-prerm> `upgrade' <new-version> -# * <new-prerm> `failed-upgrade' <old-version> -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> -# * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - rm -f /usr/lib/apoo/*.pyc /usr/lib/apoo/*.pyo - ;; - failed-upgrade) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/python2.4-apoo.dirs /tmp/Aedv66dF1m/apoo-1.3/debian/python2.4-apoo.dirs --- /tmp/b6LY4AiurS/apoo-1.3/debian/python2.4-apoo.dirs 2005-03-23 19:12:47.000000000 +0100 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/python2.4-apoo.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/share/doc/python2.4-apoo/html usr/share/doc/python2.4-apoo/examples usr/bin usr/share/man/man1 usr/lib/apoo - diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/python2.4-apoo.postinst /tmp/Aedv66dF1m/apoo-1.3/debian/python2.4-apoo.postinst --- /tmp/b6LY4AiurS/apoo-1.3/debian/python2.4-apoo.postinst 2006-02-15 12:21:32.000000000 +0100 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/python2.4-apoo.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -#! /bin/sh -# postinst script for apoo -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - /usr/bin/python2.4 /usr/lib/python2.4/compileall.py -q -f /usr/lib/apoo - /usr/bin/python2.4 -O /usr/lib/python2.4/compileall.py -q -f /usr/lib/apoo - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/python2.4-apoo.prerm /tmp/Aedv66dF1m/apoo-1.3/debian/python2.4-apoo.prerm --- /tmp/b6LY4AiurS/apoo-1.3/debian/python2.4-apoo.prerm 2003-08-18 10:20:48.000000000 +0200 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/python2.4-apoo.prerm 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -#! /bin/sh -# prerm script for apoo -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <prerm> `remove' -# * <old-prerm> `upgrade' <new-version> -# * <new-prerm> `failed-upgrade' <old-version> -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> -# * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - rm -f /usr/lib/apoo/*.pyc /usr/lib/apoo/*.pyo - ;; - failed-upgrade) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/python2.4.menu /tmp/Aedv66dF1m/apoo-1.3/debian/python2.4.menu --- /tmp/b6LY4AiurS/apoo-1.3/debian/python2.4.menu 2005-03-23 19:13:00.000000000 +0100 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/python2.4.menu 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -?package(python2.4-apoo):needs="X11" section="Apps/Education"\ - title="apoo" command="/usr/bin/apoo" diff -Nru /tmp/b6LY4AiurS/apoo-1.3/debian/rules /tmp/Aedv66dF1m/apoo-1.3/debian/rules --- /tmp/b6LY4AiurS/apoo-1.3/debian/rules 2006-02-15 12:24:37.000000000 +0100 +++ /tmp/Aedv66dF1m/apoo-1.3/debian/rules 2006-08-13 02:07:47.000000000 +0200 @@ -3,23 +3,23 @@ INSTALL_PROGRAM = $(INSTALL) -m 755 -o root -g root INSTALL_DATA = $(INSTALL) -m 644 -o root -g root INSTALL_DIR = $(INSTALL) -d -m 755 -o root -g root -DESTDIR=`pwd`/debian +DESTDIR=`pwd`/debian/apoo DOCS = docs/help_apoo.txt docs/help_ass.txt docs/help_tester.txt EXAMPLES = examples/abs.apoo examples/fact.apoo examples/fib.apoo \ -examples/ifx1.apoo examples/ln.apoo examples/ln2.apoo \ -examples/max.apoo examples/mems.apoo examples/push.apoo \ -examples/sti.apoo examples/submax.apoo examples/subsoma.apoo \ -examples/t1.apoo examples/t1.tutor \ -examples/test1.apoo examples/test1.tutor examples/test2.apoo \ -examples/test2.tutor examples/teste2.apoo examples/while.apoo \ -examples/while1.apoo + examples/ifx1.apoo examples/ln.apoo examples/ln2.apoo \ + examples/max.apoo examples/mems.apoo examples/push.apoo \ + examples/sti.apoo examples/submax.apoo examples/subsoma.apoo \ + examples/t1.apoo examples/t1.tutor \ + examples/test1.apoo examples/test1.tutor examples/test2.apoo \ + examples/test2.tutor examples/teste2.apoo examples/while.apoo \ + examples/while1.apoo PYFILES = interface.py vpu.py vpu_tutor.py constants.py -DIRS = usr/bin usr/lib/apoo usr/share/doc +PYTHON = /usr/bin/python -PyVersions = 2.3 2.4 +DIRS = usr/bin usr/lib/apoo usr/share/doc build: dh_testdir @@ -28,51 +28,39 @@ dh_testdir dh_testroot dh_clean + $(RM) apoo exec-apoo -install: -# dh_installchangelogs -i --package=$$PKG ; \ +install: binary-indep: build install dh_testdir -i dh_testroot -i dh_clean -k - for v in ${PyVersions} ; do \ - PKG=python$$v-apoo ; \ - dh_installdirs --package=$$PKG ; \ - VDESTDIR="debian/$$PKG" ; \ - ${INSTALL_DATA} debian/apoo.1x $$VDESTDIR/usr/share/man/man1 ; \ - dh_link --package=$$PKG /usr/share/man/man1/apoo.1x /usr/share/man/man1/exec-apoo.1x ; \ - DOCDIR="debian/$$PKG/usr/share/doc/$$PKG" ; \ - ${INSTALL_DATA} debian/changelog $$DOCDIR/changelog.Debian ; \ - PYTHON=/usr/bin/python$$v ; \ - ${INSTALL_DATA} ${PYFILES} $$VDESTDIR/usr/lib/apoo ; \ - $$PYTHON subst.py %python% $$PYTHON < apoo.master > apoo ; \ - ${INSTALL_PROGRAM} apoo $$VDESTDIR/usr/bin ; \ - $$PYTHON subst.py %python% $$PYTHON < exec-apoo.master > exec-apoo ; \ - ${INSTALL_PROGRAM} exec-apoo $$VDESTDIR/usr/bin ; \ - rm apoo exec-apoo; \ - ${INSTALL_DIR} $$DOCDIR/examples $$DOCDIR/html ; \ - dh_installexamples --package=$$PKG -i ${EXAMPLES} ; \ - ${INSTALL_DATA} html/*.html $$DOCDIR/html ; \ - ${INSTALL_DATA} html/*.css $$DOCDIR/html ; \ - ${INSTALL_DATA} html/*.gif $$DOCDIR/html ; \ - dh_link --package=$$PKG -i /usr/share/doc/$$PKG/help_apoo.txt /usr/lib/apoo/help_apoo.txt ; \ - dh_link --package=$$PKG -i /usr/share/doc/$$PKG/help_ass.txt /usr/lib/apoo/help_ass.txt ; \ - dh_link --package=$$PKG -i /usr/share/doc/$$PKG/help_tester.txt /usr/lib/apoo/help_tester.txt ; \ - ${INSTALL_DATA} debian/copyright $$DOCDIR ; \ - ${INSTALL_DATA} ${DOCS} $$DOCDIR ; \ + + dh_installdirs -i + dh_installman -i debian/apoo.1x + dh_link /usr/share/man/man1/apoo.1x /usr/share/man/man1/exec-apoo.1x + + ${INSTALL_DATA} ${PYFILES} $(DESTDIR)/usr/lib/apoo + set -e; \ + for file in apoo exec-apoo; do \ + python subst.py %python% $(PYTHON) < $$file.master > $$file; \ + ${INSTALL_PROGRAM} $$file $(DESTDIR)/usr/bin; \ done - dh_installdirs --package="apoo" - DOCDIR="debian/apoo/usr/share/doc/apoo/" ; \ - ${INSTALL_DATA} debian/copyright $$DOCDIR ; \ - ${INSTALL_DATA} debian/changelog $$DOCDIR/changelog.Debian + + dh_installexamples -i ${EXAMPLES} + + dh_installdirs -i + dh_installdocs -i ${DOCS} html/ + dh_installchangelogs -i + dh_pysupport -i dh_compress -i - dh_installmenu + dh_installmenu -i dh_fixperms -i dh_installdeb -i - dh_shlibdeps -i - dh_gencontrol -i - dh_md5sums -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i dh_builddeb -i # Build architecture-dependent files here. diff -Nru /tmp/b6LY4AiurS/apoo-1.3/exec-apoo.master /tmp/Aedv66dF1m/apoo-1.3/exec-apoo.master --- /tmp/b6LY4AiurS/apoo-1.3/exec-apoo.master 2004-12-06 14:08:06.000000000 +0100 +++ /tmp/Aedv66dF1m/apoo-1.3/exec-apoo.master 2006-08-13 02:13:46.000000000 +0200 @@ -1,7 +1,9 @@ #!%python% -from vpu import * import sys +sys.path.append('/usr/lib/apoo') + +from vpu import * v = Vpu(32,{50000:("pass","print '%c'%(val%256),"), 50001:("val = raw_input()","print val,"),
signature.asc
Description: Digital signature