diff -u egenix-mx-base-2.0.6/debian/movefiles.sh egenix-mx-base-2.0.6/debian/movefiles.sh --- egenix-mx-base-2.0.6/debian/movefiles.sh +++ egenix-mx-base-2.0.6/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.6/debian/changelog egenix-mx-base-2.0.6/debian/changelog --- egenix-mx-base-2.0.6/debian/changelog +++ egenix-mx-base-2.0.6/debian/changelog @@ -1,3 +1,9 @@ +egenix-mx-base (2.0.6-3.1) unstable; urgency=low + + * Drop the versioned package. + + -- Matthias Klose Mon, 12 Jun 2006 02:14:18 +0000 + egenix-mx-base (2.0.6-3) unstable; urgency=low * Standards-Version 3.6.2. diff -u egenix-mx-base-2.0.6/debian/control egenix-mx-base-2.0.6/debian/control --- egenix-mx-base-2.0.6/debian/control +++ egenix-mx-base-2.0.6/debian/control @@ -2,58 +2,17 @@ Section: python Priority: optional Maintainer: Joel Rosdahl -Build-Depends: dpatch, debhelper (>= 4.2.28), python, python2.3-dev, python2.4-dev +Build-Depends: dpatch, debhelper (>= 4.2.28), python-all-dev, python-central +XS-Python-Version: all Standards-Version: 3.6.2 -Package: python2.3-egenix-mxdatetime -Architecture: any -Depends: ${shlibs:Depends}, python2.3-egenix-mxtools, ${python:Depends} -Description: date and time handling routines for Python 2.3 - 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.3. - -Package: python2.4-egenix-mxdatetime -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, ${python:Depends} -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. - Package: python-egenix-mxdatetime -Architecture: all +Architecture: any Depends: ${python:Depends} +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 [dummy package] mxDateTime is an extension package that provides three new object types, DateTime, DateTimeDelta and RelativeDateTime, which let you @@ -75,49 +34,13 @@ This Debian package is an empty dummy package that always depends on a package built for Debian's default Python version. -Package: python2.3-egenix-mxproxy -Architecture: any -Depends: ${shlibs:Depends}, python2.3-egenix-mxtools, ${python:Depends} -Description: generic proxy wrapper type for Python 2.3 - 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.3. - -Package: python2.4-egenix-mxproxy -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, ${python:Depends} -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 +Architecture: any Depends: ${python:Depends} +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 [dummy package] mxProxy is an extension package that provides a new type that is suitable to implement Bastion like features without the need to use @@ -136,27 +59,13 @@ This Debian package is an empty dummy package that always depends on a package built for Debian's default Python version. -Package: python2.3-egenix-mxqueue -Architecture: any -Depends: ${shlibs:Depends}, python2.3-egenix-mxtools, ${python:Depends} -Description: fast and memory-efficient queue for Python 2.3 - 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.3. - -Package: python2.4-egenix-mxqueue -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, ${python:Depends} -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 +Architecture: any Depends: ${python:Depends} +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 [dummy package] 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. @@ -164,31 +73,13 @@ This Debian package is an empty dummy package that always depends on a package built for Debian's default Python version. -Package: python2.3-egenix-mxstack -Architecture: any -Depends: ${shlibs:Depends}, python2.3-egenix-mxtools, ${python:Depends} -Description: fast and memory-efficient stack for Python 2.3 - 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.3. - -Package: python2.4-egenix-mxstack -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, ${python:Depends} -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 +Architecture: any Depends: ${python:Depends} +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 [dummy package] 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, @@ -198,47 +89,13 @@ This Debian package is an empty dummy package that always depends on a package built for Debian's default Python version. -Package: python2.3-egenix-mxtexttools -Architecture: any -Depends: ${shlibs:Depends}, python2.3-egenix-mxtools, ${python:Depends} -Description: fast text manipulation tools for Python 2.3 - 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.3. - -Package: python2.4-egenix-mxtexttools -Architecture: any -Depends: ${shlibs:Depends}, python2.4-egenix-mxtools, ${python:Depends} -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 +Architecture: any Depends: ${python:Depends} +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 [dummy package] mxTextTools is an extension package for Python that provides several useful functions and types that implement high-performance text @@ -256,43 +113,13 @@ This Debian package is an empty dummy package that always depends on a package built for Debian's default Python version. -Package: python2.3-egenix-mxtools -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends} -Description: collection of new builtins for Python 2.3 - 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.3. - -Package: python2.4-egenix-mxtools -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends} -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 +Architecture: any 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 [dummy package] mxTools is an extension package that includes a collection of handy functions and objects giving additional functionality in form of new diff -u egenix-mx-base-2.0.6/debian/rules egenix-mx-base-2.0.6/debian/rules --- egenix-mx-base-2.0.6/debian/rules +++ egenix-mx-base-2.0.6/debian/rules @@ -9,21 +9,15 @@ # Load rules for dpatch. include /usr/share/dpatch/dpatch.make -PYTHON2.3 = /usr/bin/python2.3 -PYTHON2.4 = /usr/bin/python2.4 +PYVERS=$(shell pycentral showversions) -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp +build-stamp: $(PYVERS:%=build-python%) + touch $@ -build: configure-stamp build-stamp -build-stamp: patch-stamp - dh_testdir - $(PYTHON2.3) setup.py build -g - $(PYTHON2.4) setup.py build -g - sh -e debian/installtemplates.sh 2.3 2.4 - touch build-stamp +build-python%: + python$* setup.py build -g + sh -e debian/installtemplates.sh $* + touch $@ clean: clean1 unpatch @@ -40,7 +34,9 @@ rm -rf build debian/python*-tmp dh_clean -install: build +install: build install-prereq $(PYVERS:%=install-python%) + +install-prereq: dh_testdir dh_testroot dh_clean -k @@ -50,42 +46,46 @@ usr/include/python2.3/mx \ usr/include/python2.4/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 +install-python%: + 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_install -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_install -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 $* # 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 @@ -97,7 +97,8 @@ dh_link -i dh_compress -i dh_fixperms -i - dh_python -i + dh_pycentral -i +# dh_python -i dh_installdeb -i dh_gencontrol -i dh_md5sums -i @@ -114,7 +115,8 @@ dh_link -a dh_compress -a dh_fixperms -a - dh_python -a + dh_pycentral -a +# dh_python -a dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a diff -u egenix-mx-base-2.0.6/debian/installtemplates.sh egenix-mx-base-2.0.6/debian/installtemplates.sh --- egenix-mx-base-2.0.6/debian/installtemplates.sh +++ egenix-mx-base-2.0.6/debian/installtemplates.sh @@ -7,7 +7,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:]') install -d debian/$debpkg/usr/share/doc-base sed -e "s/@PKGNAME@/$debpkg/g" \ reverted: --- egenix-mx-base-2.0.6/debian/python2.3-egenix-mxdatetime.install +++ egenix-mx-base-2.0.6.orig/debian/python2.3-egenix-mxdatetime.install @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/DateTime reverted: --- egenix-mx-base-2.0.6/debian/python2.3-egenix-mxproxy.install +++ egenix-mx-base-2.0.6.orig/debian/python2.3-egenix-mxproxy.install @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/Proxy reverted: --- egenix-mx-base-2.0.6/debian/python2.3-egenix-mxqueue.install +++ egenix-mx-base-2.0.6.orig/debian/python2.3-egenix-mxqueue.install @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/Queue reverted: --- egenix-mx-base-2.0.6/debian/python2.3-egenix-mxstack.install +++ egenix-mx-base-2.0.6.orig/debian/python2.3-egenix-mxstack.install @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/Stack reverted: --- egenix-mx-base-2.0.6/debian/python2.3-egenix-mxtexttools.install +++ egenix-mx-base-2.0.6.orig/debian/python2.3-egenix-mxtexttools.install @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/mx/TextTools reverted: --- egenix-mx-base-2.0.6/debian/python2.3-egenix-mxtools.install +++ egenix-mx-base-2.0.6.orig/debian/python2.3-egenix-mxtools.install @@ -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.6/debian/python2.4-egenix-mxdatetime.install +++ egenix-mx-base-2.0.6.orig/debian/python2.4-egenix-mxdatetime.install @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/DateTime reverted: --- egenix-mx-base-2.0.6/debian/python2.4-egenix-mxproxy.install +++ egenix-mx-base-2.0.6.orig/debian/python2.4-egenix-mxproxy.install @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/Proxy reverted: --- egenix-mx-base-2.0.6/debian/python2.4-egenix-mxqueue.install +++ egenix-mx-base-2.0.6.orig/debian/python2.4-egenix-mxqueue.install @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/Queue reverted: --- egenix-mx-base-2.0.6/debian/python2.4-egenix-mxstack.install +++ egenix-mx-base-2.0.6.orig/debian/python2.4-egenix-mxstack.install @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/Stack reverted: --- egenix-mx-base-2.0.6/debian/python2.4-egenix-mxtexttools.install +++ egenix-mx-base-2.0.6.orig/debian/python2.4-egenix-mxtexttools.install @@ -1 +0,0 @@ -usr/lib/python2.4/site-packages/mx/TextTools reverted: --- egenix-mx-base-2.0.6/debian/python2.4-egenix-mxtools.install +++ egenix-mx-base-2.0.6.orig/debian/python2.4-egenix-mxtools.install @@ -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__.* only in patch2: unchanged: --- egenix-mx-base-2.0.6.orig/debian/python-egenix-mxdatetime.install +++ egenix-mx-base-2.0.6/debian/python-egenix-mxdatetime.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/DateTime only in patch2: unchanged: --- egenix-mx-base-2.0.6.orig/debian/python-egenix-mxproxy.install +++ egenix-mx-base-2.0.6/debian/python-egenix-mxproxy.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/Proxy only in patch2: unchanged: --- egenix-mx-base-2.0.6.orig/debian/python-egenix-mxqueue.install +++ egenix-mx-base-2.0.6/debian/python-egenix-mxqueue.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/Queue only in patch2: unchanged: --- egenix-mx-base-2.0.6.orig/debian/python-egenix-mxstack.install +++ egenix-mx-base-2.0.6/debian/python-egenix-mxstack.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/Stack only in patch2: unchanged: --- egenix-mx-base-2.0.6.orig/debian/python-egenix-mxtexttools.install +++ egenix-mx-base-2.0.6/debian/python-egenix-mxtexttools.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/mx/TextTools only in patch2: unchanged: --- egenix-mx-base-2.0.6.orig/debian/python-egenix-mxtools.install +++ egenix-mx-base-2.0.6/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__.*