diff -u egenix-mx-base-2.0.6ubuntu1/debian/movefiles.sh egenix-mx-base-2.0.6ubuntu1/debian/movefiles.sh --- egenix-mx-base-2.0.6ubuntu1/debian/movefiles.sh +++ egenix-mx-base-2.0.6ubuntu1/debian/movefiles.sh @@ -10,7 +10,7 @@ for ver in $VERSIONS; do for pkg in $PACKAGES; do - debpkg=python$ver-egenix-mx$(echo -n $pkg | tr '[:upper:]' '[:lower:]') + debpkg=python-egenix-mx$(echo -n $pkg | tr '[:upper:]' '[:lower:]') if [ -f debian/$debpkg/usr/lib/python$ver/site-packages/mx/$pkg/mx$pkg/mx$pkg.h ]; then mv debian/$debpkg/usr/lib/python$ver/site-packages/mx/$pkg/mx$pkg/mx$pkg.h \ diff -u egenix-mx-base-2.0.6ubuntu1/debian/changelog egenix-mx-base-2.0.6ubuntu1/debian/changelog --- egenix-mx-base-2.0.6ubuntu1/debian/changelog +++ egenix-mx-base-2.0.6ubuntu1/debian/changelog @@ -1,3 +1,9 @@ +egenix-mx-base (2.0.6ubuntu1-1ubuntu5) edgy; urgency=low + + * merged from debian + + -- Michael Vogt Fri, 13 Oct 2006 13:51:08 +0200 + egenix-mx-base (2.0.6ubuntu1-1ubuntu4) dapper; urgency=low * Drop python2.3 packages. reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/postinst.template +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/postinst.template @@ -1,23 +0,0 @@ -#! /bin/sh -e - -VERSION=@VERSION@ -PACKAGE=@DEBPKG@ -DIRLIST="/usr/lib/python$VERSION/site-packages/mx" - -#DEBHELPER# - -case "$1" in - configure|abort-upgrade|abort-remove|abort-deconfigure) - for i in $DIRLIST ; do - /usr/bin/python$VERSION -O /usr/lib/python$VERSION/compileall.py -q $i - /usr/bin/python$VERSION /usr/lib/python$VERSION/compileall.py -q $i - done - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -exit 0 diff -u egenix-mx-base-2.0.6ubuntu1/debian/installtemplates.sh egenix-mx-base-2.0.6ubuntu1/debian/installtemplates.sh --- egenix-mx-base-2.0.6ubuntu1/debian/installtemplates.sh +++ egenix-mx-base-2.0.6ubuntu1/debian/installtemplates.sh @@ -8,16 +8,11 @@ for ver in $VERSIONS; do for pkg in $PACKAGES; do - debpkg=python$ver-egenix-mx$(echo -n $pkg | tr '[:upper:]' '[:lower:]') + debpkg=python-egenix-mx$(echo -n $pkg | tr '[:upper:]' '[:lower:]') install -d debian/$debpkg/usr/share/doc-base sed -e "s/@PKGNAME@/$debpkg/g" \ -e "s/@FULLNAME@/eGenix mx$pkg/g" \ -e "s/@PKG@/mx$pkg/g" \ debian/$debpkg.doc-base - - sed -e "s/@DEBPKG@/$debpkg/g" debian/$debpkg.prerm - sed -e "s/@DEBPKG@/$debpkg/g" \ - -e "s/@VERSION@/$ver/g" \ - debian/$debpkg.postinst done done reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/prerm.template +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/prerm.template @@ -1,9 +0,0 @@ -#! /bin/sh -e - -PACKAGE=@DEBPKG@ - -dpkg --listfiles $PACKAGE | - awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | - xargs rm -f >&2 - -#DEBHELPER# diff -u egenix-mx-base-2.0.6ubuntu1/debian/patches/04_DateTime_format_fix.dpatch egenix-mx-base-2.0.6ubuntu1/debian/patches/04_DateTime_format_fix.dpatch --- egenix-mx-base-2.0.6ubuntu1/debian/patches/04_DateTime_format_fix.dpatch +++ egenix-mx-base-2.0.6ubuntu1/debian/patches/04_DateTime_format_fix.dpatch @@ -36,14 +36,14 @@ (long)self->year,(int)self->month,(int)self->day, - (int)self->hour,(int)self->minute,(float)second); + (int)self->hour,(int)self->minute,abs(second), -+ abs((second-(double)abs(second)))*1000.0); ++ abs((second-(double)abs(second))*1000.0)); else - sprintf(buffer,"-%04li-%02i-%02i %02i:%02i:%05.2f", + sprintf(buffer,"-%04li-%02i-%02i %02i:%02i:%02i.%03i", (long)-self->year,(int)self->month,(int)self->day, - (int)self->hour,(int)self->minute,(float)second); + (int)self->hour,(int)self->minute,abs(second), -+ abs((second-(double)abs(second)))*1000.0); ++ abs((second-(double)abs(second))*1000.0)); } /* Returns a string indicating the date in ISO format. */ diff -u egenix-mx-base-2.0.6ubuntu1/debian/patches/00list egenix-mx-base-2.0.6ubuntu1/debian/patches/00list --- egenix-mx-base-2.0.6ubuntu1/debian/patches/00list +++ egenix-mx-base-2.0.6ubuntu1/debian/patches/00list @@ -2,0 +3 @@ +05_DateTime_ampm_parse_fix reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.3-egenix-mxdatetime.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.3-egenix-mxdatetime.files @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/DateTime reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.3-egenix-mxproxy.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.3-egenix-mxproxy.files @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/Proxy reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.3-egenix-mxqueue.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.3-egenix-mxqueue.files @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/Queue reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.3-egenix-mxstack.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.3-egenix-mxstack.files @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/Stack reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.3-egenix-mxtexttools.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.3-egenix-mxtexttools.files @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/TextTools reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.3-egenix-mxtools.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.3-egenix-mxtools.files @@ -1,5 +0,0 @@ -usr/lib/python2.3/site-packages/mx/Misc -usr/lib/python2.3/site-packages/mx/Tools -usr/lib/python2.3/site-packages/mx/Log.* -usr/lib/python2.3/site-packages/mx/NewBuiltins.* -usr/lib/python2.3/site-packages/mx/__init__.* reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.4-egenix-mxdatetime.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.4-egenix-mxdatetime.files @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/DateTime reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.4-egenix-mxproxy.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.4-egenix-mxproxy.files @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/Proxy reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.4-egenix-mxqueue.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.4-egenix-mxqueue.files @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/Queue reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.4-egenix-mxstack.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.4-egenix-mxstack.files @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/Stack reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.4-egenix-mxtexttools.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.4-egenix-mxtexttools.files @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/TextTools reverted: --- egenix-mx-base-2.0.6ubuntu1/debian/python2.4-egenix-mxtools.files +++ egenix-mx-base-2.0.6ubuntu1.orig/debian/python2.4-egenix-mxtools.files @@ -1,5 +0,0 @@ -usr/lib/python2.4/site-packages/mx/Misc -usr/lib/python2.4/site-packages/mx/Tools -usr/lib/python2.4/site-packages/mx/Log.* -usr/lib/python2.4/site-packages/mx/NewBuiltins.* -usr/lib/python2.4/site-packages/mx/__init__.* diff -u egenix-mx-base-2.0.6ubuntu1/debian/control egenix-mx-base-2.0.6ubuntu1/debian/control --- egenix-mx-base-2.0.6ubuntu1/debian/control +++ egenix-mx-base-2.0.6ubuntu1/debian/control @@ -2,36 +2,19 @@ Section: python Priority: optional Maintainer: Joel Rosdahl -Build-Depends: dpatch, debhelper (>= 4.2.28), python, python2.4-dev -Standards-Version: 3.6.1 - -Package: python2.4-egenix-mxdatetime -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, python2.4 -Description: date and time handling routines for Python 2.4 - mxDateTime is an extension package that provides three new object - types, DateTime, DateTimeDelta and RelativeDateTime, which let you - store and handle date/time values in a much more natural way than by - using ticks (seconds since 1.1.70 0:00 UTC; the encoding used by the - time module). - . - You can add, subtract and even multiply instances, pickle and copy - them and convert the results to strings, COM dates, ticks and some - other more esoteric values. In addition, there are several convenient - constructors and formatters at hand to greatly simplify dealing with - dates and times in real-world applications. - . - In addition to providing an easy-to-use Python interface the package - also exports a comfortable C API interface for other extensions to - build upon. This is especially interesting for database applications - which often have to deal with date/time values. - . - This Debian package is built for Python 2.4. +Build-Depends: dpatch, debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-10), python-central (>= 0.4.17) +XS-Python-Standards-Version: 0.4 +XS-Python-Version: all +Standards-Version: 3.7.2 Package: python-egenix-mxdatetime -Architecture: all -Depends: ${python:Depends}, python2.4-egenix-mxdatetime -Description: date and time handling routines for Python [dummy package] +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, python-egenix-mxtools +Provides: ${python:Provides} +Conflicts: python2.3-egenix-mxdatetime, python2.4-egenix-mxdatetime +Replaces: python2.3-egenix-mxdatetime, python2.4-egenix-mxdatetime +XB-Python-Version: ${python:Versions} +Description: date and time handling routines for Python mxDateTime is an extension package that provides three new object types, DateTime, DateTimeDelta and RelativeDateTime, which let you store and handle date/time values in a much more natural way than by @@ -48,34 +31,15 @@ also exports a comfortable C API interface for other extensions to build upon. This is especially interesting for database applications which often have to deal with date/time values. - . - This Debian package is an empty dummy package that always depends on - a package built for Debian's default Python version. - -Package: python2.4-egenix-mxproxy -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, python2.4 -Description: generic proxy wrapper type for Python 2.4 - mxProxy is an extension package that provides a new type that is - suitable to implement Bastion like features without the need to use - restricted execution environments. - . - The type's main features are secure data encapsulation (the hidden - objects are not accessible from Python since they are stored in - internal C structures), customizable attribute lookup methods and a - cleanup protocol that helps in breaking circular references prior to - object deletion. - . - The latest version adds a very interesting new feature: weak references - which help you work with circular references in a way that doesn't - cause memory leakage in a Python system. - . - This Debian package is built for Python 2.4. Package: python-egenix-mxproxy -Architecture: all -Depends: ${python:Depends}, python2.4-egenix-mxproxy -Description: generic proxy wrapper type for Python [dummy package] +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, python-egenix-mxtools +Provides: ${python:Provides} +Conflicts: python2.3-egenix-mxproxy, python2.4-egenix-mxproxy +Replaces: python2.3-egenix-mxproxy, python2.4-egenix-mxproxy +XB-Python-Version: ${python:Versions} +Description: generic proxy wrapper type for Python mxProxy is an extension package that provides a new type that is suitable to implement Bastion like features without the need to use restricted execution environments. @@ -89,75 +53,39 @@ The latest version adds a very interesting new feature: weak references which help you work with circular references in a way that doesn't cause memory leakage in a Python system. - . - This Debian package is an empty dummy package that always depends on - a package built for Debian's default Python version. - -Package: python2.4-egenix-mxqueue -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, python2.4 -Description: fast and memory-efficient queue for Python 2.4 - mxQueue is an extension package that provides a new object type called - Queue. It works much like what you would expect from such a type. - . - This Debian package is built for Python 2.4. Package: python-egenix-mxqueue -Architecture: all -Depends: ${python:Depends}, python2.4-egenix-mxqueue -Description: fast and memory-efficient queue for Python [dummy package] +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, python-egenix-mxtools +Provides: ${python:Provides} +Conflicts: python2.3-egenix-mxqueue, python2.4-egenix-mxqueue +Replaces: python2.3-egenix-mxqueue, python2.4-egenix-mxqueue +XB-Python-Version: ${python:Versions} +Description: fast and memory-efficient queue for Python mxQueue is an extension package that provides a new object type called Queue. It works much like what you would expect from such a type. - . - This Debian package is an empty dummy package that always depends on - a package built for Debian's default Python version. - -Package: python2.4-egenix-mxstack -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, python2.4 -Description: fast and memory-efficient stack for Python 2.4 - mxStack is an extension package that provides a new object type called - Stack. It works much like what you would expect from such a type, - having .push() and .pop() methods and focuses on obtaining maximum - speed at low memory costs. - . - This Debian package is built for Python 2.4. Package: python-egenix-mxstack -Architecture: all -Depends: ${python:Depends}, python2.4-egenix-mxstack -Description: fast and memory-efficient stack for Python [dummy package] +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, python-egenix-mxtools +Provides: ${python:Provides} +Conflicts: python2.3-egenix-mxstack, python2.4-egenix-mxstack +Replaces: python2.3-egenix-mxstack, python2.4-egenix-mxstack +XB-Python-Version: ${python:Versions} +Description: fast and memory-efficient stack for Python mxStack is an extension package that provides a new object type called Stack. It works much like what you would expect from such a type, having .push() and .pop() methods and focuses on obtaining maximum speed at low memory costs. - . - This Debian package is an empty dummy package that always depends on - a package built for Debian's default Python version. - -Package: python2.4-egenix-mxtexttools -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, python2.4 -Description: fast text manipulation tools for Python 2.4 - mxTextTools is an extension package for Python that provides several - useful functions and types that implement high-performance text - manipulation and searching algorithms in addition to a very flexible - and extendable state machine, the Tagging Engine, that allows scanning - and processing text based on low-level byte-code "programs" written - using Python tuples. It gives you access to the speed of C without the - need to do any compile and link steps every time you change the parsing - description. - . - Applications include parsing structured text, finding and extracting - text (either exact or using translation tables) and recombining strings - to form new text. - . - This Debian package is built for Python 2.4. Package: python-egenix-mxtexttools -Architecture: all -Depends: ${python:Depends}, python2.4-egenix-mxtexttools -Description: fast text manipulation tools for Python [dummy package] +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, python-egenix-mxtools +Provides: ${python:Provides} +Conflicts: python2.3-egenix-mxtexttools, python2.4-egenix-mxtexttools +Replaces: python2.3-egenix-mxtexttools, python2.4-egenix-mxtexttools +XB-Python-Version: ${python:Versions} +Description: fast text manipulation tools for Python mxTextTools is an extension package for Python that provides several useful functions and types that implement high-performance text manipulation and searching algorithms in addition to a very flexible @@ -170,31 +98,15 @@ Applications include parsing structured text, finding and extracting text (either exact or using translation tables) and recombining strings to form new text. - . - This Debian package is an empty dummy package that always depends on - a package built for Debian's default Python version. - -Package: python2.4-egenix-mxtools -Architecture: any -Depends: ${shlibs:Depends}, python2.4 -Description: collection of new builtins for Python 2.4 - mxTools is an extension package that includes a collection of handy - functions and objects giving additional functionality in form of new - builtins to the Python programmer. - . - The package auto-installs the new functions and objects as builtins - upon first import. This means that they become instantly available to - all other modules without any further action on your part. Add the line - import mx.Tools.NewBuiltins to your site.py script and they will be - available to all users at your site as if they were installed in the - Python interpreter itself. - . - This Debian package is built for Python 2.4. Package: python-egenix-mxtools -Architecture: all -Depends: ${python:Depends}, python2.4-egenix-mxtools -Description: collection of new builtins for Python [dummy package] +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends} +Provides: ${python:Provides} +Conflicts: python2.3-egenix-mxtools, python2.4-egenix-mxtools +Replaces: python2.3-egenix-mxtools, python2.4-egenix-mxtools +XB-Python-Version: ${python:Versions} +Description: collection of new builtins for Python mxTools is an extension package that includes a collection of handy functions and objects giving additional functionality in form of new builtins to the Python programmer. @@ -205,9 +117,6 @@ import mx.Tools.NewBuiltins to your site.py script and they will be available to all users at your site as if they were installed in the Python interpreter itself. - . - This Debian package is an empty dummy package that always depends on - a package built for Debian's default Python version. Package: python-egenix-mx-base-dev Architecture: all diff -u egenix-mx-base-2.0.6ubuntu1/debian/rules egenix-mx-base-2.0.6ubuntu1/debian/rules --- egenix-mx-base-2.0.6ubuntu1/debian/rules +++ egenix-mx-base-2.0.6ubuntu1/debian/rules @@ -4,89 +4,89 @@ #export DH_VERBOSE = 1 # This is the debhelper compatibility version to use. -export DH_COMPAT = 4 +export DH_COMPAT = 5 # Load rules for dpatch. include /usr/share/dpatch/dpatch.make -PYTHON2.3 = /usr/bin/python2.3 -PYTHON2.4 = /usr/bin/python2.4 +PYVERS = $(shell pyversions -r debian/control) -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp +build: build-stamp + +build-stamp: $(PYVERS:%=build-ext-%-stamp) + touch $@ -build: configure-stamp build-stamp -build-stamp: patch-stamp +build-ext-python%-stamp: dh_testdir -# $(PYTHON2.3) setup.py build -g - $(PYTHON2.4) setup.py build -g -# sh -e debian/installtemplates.sh 2.3 2.4 - sh -e debian/installtemplates.sh 2.4 - touch build-stamp + python$* setup.py build -g + sh -e debian/installtemplates.sh $* + touch $@ clean: clean1 unpatch clean1: dh_testdir dh_testroot - rm -f build-stamp configure-stamp - rm -f debian/*.prerm debian/*.postinst debian/*.doc-base + rm -f build*stamp + rm -f debian/*.doc-base # Can't run setup.py clean because it removes *.pyd, which makes # "unrepresentable changes to source files". -# $(PYTHON2.3) setup.py clean -# $(PYTHON2.4) setup.py clean find -name "*~" -o -name "*.pyc" | xargs -r rm -f rm -rf build debian/python*-tmp dh_clean -install: build +install: build install-prereq $(PYVERS:%=install-ext-%) + +install-prereq: dh_testdir dh_testroot dh_clean -k dh_installdirs + +install-ext-python%: dh_installdirs \ -ppython-egenix-mx-base-dev \ - usr/include/python2.4/mx + usr/include/python$*/mx -# Build for all Python versions. -# $(PYTHON2.3) setup.py install --root=debian/python2.3-tmp - $(PYTHON2.4) setup.py install --root=debian/python2.4-tmp + python$* setup.py install --root=debian/python$*-tmp # Ugly fix for bug #242447: include missing ExitFunctions.py in mxTools. -# cp debian/python2.3-tmp/usr/lib/python2.3/site-packages/mx/BeeBase/ExitFunctions.py \ -# debian/python2.3-tmp/usr/lib/python2.3/site-packages/mx/Misc - cp debian/python2.4-tmp/usr/lib/python2.4/site-packages/mx/BeeBase/ExitFunctions.py \ - debian/python2.4-tmp/usr/lib/python2.4/site-packages/mx/Misc + cp debian/python$*-tmp/usr/lib/python$*/site-packages/mx/BeeBase/ExitFunctions.py \ + debian/python$*-tmp/usr/lib/python$*/site-packages/mx/Misc # Change /usr/local/bin/python to /usr/bin/pythonX.Y -# sh -e debian/pathmangle.sh /usr/bin/python2.3 debian/python2.3-tmp - sh -e debian/pathmangle.sh /usr/bin/python2.4 debian/python2.4-tmp + sh -e debian/pathmangle.sh /usr/bin/python$* debian/python$*-tmp # Collect files. -# dh_movefiles -ppython2.3-egenix-mxdatetime \ -# -ppython2.3-egenix-mxproxy \ -# -ppython2.3-egenix-mxqueue \ -# -ppython2.3-egenix-mxstack \ -# -ppython2.3-egenix-mxtexttools \ -# -ppython2.3-egenix-mxtools \ -# --sourcedir=debian/python2.3-tmp - dh_movefiles -ppython2.4-egenix-mxdatetime \ - -ppython2.4-egenix-mxproxy \ - -ppython2.4-egenix-mxqueue \ - -ppython2.4-egenix-mxstack \ - -ppython2.4-egenix-mxtexttools \ - -ppython2.4-egenix-mxtools \ - --sourcedir=debian/python2.4-tmp + dh_install -ppython-egenix-mxdatetime \ + -ppython-egenix-mxproxy \ + -ppython-egenix-mxqueue \ + -ppython-egenix-mxstack \ + -ppython-egenix-mxtexttools \ + -ppython-egenix-mxtools \ + --sourcedir=debian/python$*-tmp # Move C header files and other stuff to the right location. -# sh -e debian/movefiles.sh 2.3 2.4 - sh -e debian/movefiles.sh 2.4 + sh -e debian/movefiles.sh $* # Populate -dev package with generic headers. -# cp mx/stdlib/*.h debian/python-egenix-mx-base-dev/usr/include/python2.3/mx - cp mx/stdlib/*.h debian/python-egenix-mx-base-dev/usr/include/python2.4/mx + cp mx/stdlib/*.h debian/python-egenix-mx-base-dev/usr/include/python$*/mx + + -find debian/python$*-tmp -name '*.py[co]' | xargs rm -f + + : # Replace all '#!' calls to python with /usr/bin/python + : # and make them executable + for i in `find debian -mindepth 3 -type f`; do \ + sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ + $$i > $$i.temp; \ + if cmp --quiet $$i $$i.temp; then \ + rm -f $$i.temp; \ + else \ + mv -f $$i.temp $$i; \ + chmod 755 $$i; \ + echo "fixed interpreter: $$i"; \ + fi; \ + done # Architecture-independent files are built here. binary-indep: build install @@ -98,7 +98,8 @@ dh_link -i dh_compress -i dh_fixperms -i - dh_python -i --noscripts + dh_pycentral -i + dh_python -i dh_installdeb -i dh_gencontrol -i dh_md5sums -i @@ -115,7 +116,8 @@ dh_link -a dh_compress -a dh_fixperms -a - dh_python -a --noscripts + dh_pycentral -a + dh_python -a dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a @@ -126 +128,2 @@ -.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch clean1 + +.PHONY: binary binary-arch binary-indep build clean clean1 install patch unpatch reverted: --- egenix-mx-base-2.0.6ubuntu1/xxx +++ egenix-mx-base-2.0.6ubuntu1.orig/xxx @@ -1,24 +0,0 @@ ---- egenix-mx-base-2.0.6ubuntu1.orig/mx/DateTime/mxDateTime/mxDateTime.c -+++ egenix-mx-base-2.0.6ubuntu1/mx/DateTime/mxDateTime/mxDateTime.c -@@ -1946,14 +1946,17 @@ - 60.00 to show up even when the indictated time does not point - to a leap second. */ - second = floor(self->second * 100.0) / 100.0; -+ /* Straub 00.000 second formating problem with de_AT.utf8 */ - if (self->year >= 0) -- sprintf(buffer,"%04li-%02i-%02i %02i:%02i:%05.2f", -+ sprintf(buffer,"%04li-%02i-%02i %02i:%02i:%02i.%03i", - (long)self->year,(int)self->month,(int)self->day, -- (int)self->hour,(int)self->minute,(float)second); -+ (int)self->hour,(int)self->minute,abs(second), -+ abs((second-(double)abs(second)))*1000.0); - else -- sprintf(buffer,"-%04li-%02i-%02i %02i:%02i:%05.2f", -+ sprintf(buffer,"-%04li-%02i-%02i %02i:%02i:%02i.%03i", - (long)-self->year,(int)self->month,(int)self->day, -- (int)self->hour,(int)self->minute,(float)second); -+ (int)self->hour,(int)self->minute,abs(second), -+ abs((second-(double)abs(second)))*1000.0); - } - - /* Returns a string indicating the date in ISO format. */ only in patch2: unchanged: --- egenix-mx-base-2.0.6ubuntu1.orig/debian/python-egenix-mxdatetime.install +++ egenix-mx-base-2.0.6ubuntu1/debian/python-egenix-mxdatetime.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/DateTime only in patch2: unchanged: --- egenix-mx-base-2.0.6ubuntu1.orig/debian/python-egenix-mxproxy.install +++ egenix-mx-base-2.0.6ubuntu1/debian/python-egenix-mxproxy.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/Proxy only in patch2: unchanged: --- egenix-mx-base-2.0.6ubuntu1.orig/debian/python-egenix-mxqueue.install +++ egenix-mx-base-2.0.6ubuntu1/debian/python-egenix-mxqueue.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/Queue only in patch2: unchanged: --- egenix-mx-base-2.0.6ubuntu1.orig/debian/python-egenix-mxstack.install +++ egenix-mx-base-2.0.6ubuntu1/debian/python-egenix-mxstack.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/Stack only in patch2: unchanged: --- egenix-mx-base-2.0.6ubuntu1.orig/debian/patches/05_DateTime_ampm_parse_fix.dpatch +++ egenix-mx-base-2.0.6ubuntu1/debian/patches/05_DateTime_ampm_parse_fix.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_datetime_ampm_parse.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## +## DP: Fix for AM/PM-related parse bug in mxDateTime. See +## . + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./mx/DateTime/Parser.py /tmp/dpep-work.GYWaa0/egenix-mx-base-2.0.6/mx/DateTime/Parser.py +--- ./mx/DateTime/Parser.py 2003-08-09 19:24:45.000000000 +0200 ++++ /tmp/dpep-work.GYWaa0/egenix-mx-base-2.0.6/mx/DateTime/Parser.py 2006-05-14 10:54:27.000000000 +0200 +@@ -456,7 +456,13 @@ + hour = atoi(hour) + if ampm: + if ampm[0] in ('p', 'P'): +- hour = hour + 12 ++ # 12pm = midday ++ if hour < 12: ++ hour = hour + 12 ++ else: ++ # 12am = midnight ++ if hour >= 12: ++ hour = hour - 12 + if minute: + minute = atoi(minute) + else: only in patch2: unchanged: --- egenix-mx-base-2.0.6ubuntu1.orig/debian/python-egenix-mxtexttools.install +++ egenix-mx-base-2.0.6ubuntu1/debian/python-egenix-mxtexttools.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/TextTools only in patch2: unchanged: --- egenix-mx-base-2.0.6ubuntu1.orig/debian/python-egenix-mxtools.install +++ egenix-mx-base-2.0.6ubuntu1/debian/python-egenix-mxtools.install @@ -0,0 +1,5 @@ +usr/lib/python*/site-packages/mx/Misc +usr/lib/python*/site-packages/mx/Tools +usr/lib/python*/site-packages/mx/Log.* +usr/lib/python*/site-packages/mx/NewBuiltins.* +usr/lib/python*/site-packages/mx/__init__.*