[Python-modules-commits] r11156 - in packages/python-axiom/trunk/debian (6 files)

[jwilk-guest at users.alioth.debian.org]

    Date: Thursday, January 14, 2010 @ 13:57:54
  Author: jwilk-guest
Revision: 11156

* Make the package ready for Python 2.6. Closes: #557925
  - Fix debian/runtrail.py to deal with site-packages/dist-packages
    discrepancy.
  - Patch the axiom.Item.MetaItem class so that comparisons work as
    intended.
  - Build-depend on python-epsilon (>= 0.6.0-2), which fixes build failure.
* Use quilt to manage patches.

Added:
  packages/python-axiom/trunk/debian/patches/
  packages/python-axiom/trunk/debian/patches/python2.6.diff
  packages/python-axiom/trunk/debian/patches/series
Modified:
  packages/python-axiom/trunk/debian/changelog
  packages/python-axiom/trunk/debian/control
  packages/python-axiom/trunk/debian/rules

Modified: packages/python-axiom/trunk/debian/changelog
===================================================================
--- packages/python-axiom/trunk/debian/changelog	2010-01-14 12:32:26 UTC (rev 11155)
+++ packages/python-axiom/trunk/debian/changelog	2010-01-14 13:57:54 UTC (rev 11156)
@@ -1,8 +1,14 @@
 python-axiom (0.6.0-2) UNRELEASED; urgency=low
 
-  * Make debian/runtrail.py ready for Python 2.6.
+  * Make the package ready for Python 2.6. Closes: #557925
+    - Fix debian/runtrail.py to deal with site-packages/dist-packages
+      discrepancy.
+    - Patch the axiom.Item.MetaItem class so that comparisons work as
+      intended.
+    - Build-depend on python-epsilon (>= 0.6.0-2), which fixes build failure.
+  * Use quilt to manage patches.
 
- -- Jakub Wilk <ubanus at users.sf.net>  Thu, 14 Jan 2010 13:30:29 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Thu, 14 Jan 2010 14:44:46 +0100
 
 python-axiom (0.6.0-1) unstable; urgency=low
 

Modified: packages/python-axiom/trunk/debian/control
===================================================================
--- packages/python-axiom/trunk/debian/control	2010-01-14 12:32:26 UTC (rev 11155)
+++ packages/python-axiom/trunk/debian/control	2010-01-14 13:57:54 UTC (rev 11156)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Tristan Seligmann <mithrandi at mithrandi.net>, Vincent Bernat <bernat at debian.org>
-Build-Depends: debhelper (>= 6), cdbs (>= 0.4.43), python, python-central (>= 0.5.6), python-epsilon (>= 0.5.11)
+Build-Depends: debhelper (>= 6), cdbs (>= 0.4.43), python, python-central (>= 0.5.6), python-epsilon (>= 0.6.0-2~), quilt
 Build-Depends-Indep: python-twisted-core, python-twisted-conch, python-pysqlite2, python-zopeinterface
 Homepage: http://www.divmod.org/trac/wiki/DivmodAxiom
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-axiom/trunk/

Added: packages/python-axiom/trunk/debian/patches/python2.6.diff
===================================================================
--- packages/python-axiom/trunk/debian/patches/python2.6.diff	                        (rev 0)
+++ packages/python-axiom/trunk/debian/patches/python2.6.diff	2010-01-14 13:57:54 UTC (rev 11156)
@@ -0,0 +1,46 @@
+Description:
+  In Python 2.6, the `type` object defines __lt__, __gt__ etc. methods, so it's
+  not enough to provide own __cmp__ method to override all comparison operators.
+Author: Jakub Wilk <ubanus at users.sf.net>
+
+Index: python-axiom-0.6.0/axiom/item.py
+===================================================================
+--- python-axiom-0.6.0.orig/axiom/item.py	2010-01-14 14:42:26.000000000 +0100
++++ python-axiom-0.6.0/axiom/item.py	2010-01-14 14:42:58.000000000 +0100
+@@ -101,6 +101,36 @@
+                        (other.typeName, other.schemaVersion))
+         return NotImplemented
+ 
++    def __lt__(self, other):
++        if isinstance(other, MetaItem):
++            return (self.typeName, self.schemaVersion) < (other.typeName, other.schemaVersion)
++        return NotImplemented
++
++    def __gt__(self, other):
++        if isinstance(other, MetaItem):
++            return (self.typeName, self.schemaVersion) > (other.typeName, other.schemaVersion)
++        return NotImplemented
++
++    def __le__(self, other):
++        if isinstance(other, MetaItem):
++            return (self.typeName, self.schemaVersion) <= (other.typeName, other.schemaVersion)
++        return NotImplemented
++
++    def __ge__(self, other):
++        if isinstance(other, MetaItem):
++            return (self.typeName, self.schemaVersion) >= (other.typeName, other.schemaVersion)
++        return NotImplemented
++
++    def __eq__(self, other):
++        if isinstance(other, MetaItem):
++            return (self.typeName, self.schemaVersion) == (other.typeName, other.schemaVersion)
++        return NotImplemented
++
++    def __ne__(self, other):
++        if isinstance(other, MetaItem):
++            return (self.typeName, self.schemaVersion) != (other.typeName, other.schemaVersion)
++        return NotImplemented
++
+ 
+ def noop():
+     pass

Added: packages/python-axiom/trunk/debian/patches/series
===================================================================
--- packages/python-axiom/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-axiom/trunk/debian/patches/series	2010-01-14 13:57:54 UTC (rev 11156)
@@ -0,0 +1 @@
+python2.6.diff

Modified: packages/python-axiom/trunk/debian/rules
===================================================================
--- packages/python-axiom/trunk/debian/rules	2010-01-14 12:32:26 UTC (rev 11155)
+++ packages/python-axiom/trunk/debian/rules	2010-01-14 13:57:54 UTC (rev 11156)
@@ -3,6 +3,7 @@
 DEB_INSTALL_MANPAGES_python-axiom := debian/axiomatic.1
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 PKGDIR=debian/python-axiom/
 
 install/python-axiom::