Package: pyrex
Version: 0.9.8.5-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch
*** /tmp/tmpa5iNkC
In Ubuntu, we've applied the attached patch to achieve the following:
* Merge from debian unstable. Remaining changes:
- Depend on python-dev: it supplies the python headers needed
to build the C files pyrex generates.
- debian/patches/02_baseexception.dpatch:
* Fix deprecation warning in Pyrex/Compiler/Errors.py
* drop " --install-layout=deb", uses py_setup_install_args now
We thought you might be interested in doing the same.
if you prefer it to be two seperate bugreports (one for the python-dev
change and one for the base-exception fix) I'm happy to do that :)
Thanks,
Michael
-- System Information:
Debian Release: squeeze/sid
APT prefers maverick-updates
APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500,
'maverick')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.35-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_DK.utf8, LC_CTYPE=en_DK.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u pyrex-0.9.8.5/debian/control pyrex-0.9.8.5/debian/control
--- pyrex-0.9.8.5/debian/control
+++ pyrex-0.9.8.5/debian/control
@@ -14,7 +15,7 @@
Package: python-pyrex
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python-dev
Provides: ${python:Provides}
Recommends: python-all-dev
XB-Python-Version: all
diff -u pyrex-0.9.8.5/debian/changelog pyrex-0.9.8.5/debian/changelog
diff -u pyrex-0.9.8.5/debian/patches/00list pyrex-0.9.8.5/debian/patches/00list
--- pyrex-0.9.8.5/debian/patches/00list
+++ pyrex-0.9.8.5/debian/patches/00list
@@ -1,0 +2 @@
+02_baseexception
only in patch2:
unchanged:
--- pyrex-0.9.8.5.orig/debian/patches/02_baseexception.dpatch
+++ pyrex-0.9.8.5/debian/patches/02_baseexception.dpatch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_baseexception.dpatch by Robert Collins <robe...@robertcollins.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad pyrex-0.9.8.5~/Pyrex/Compiler/Errors.py pyrex-0.9.8.5/Pyrex/Compiler/Errors.py
+--- pyrex-0.9.8.5~/Pyrex/Compiler/Errors.py 2008-05-24 16:23:03.000000000 +1000
++++ pyrex-0.9.8.5/Pyrex/Compiler/Errors.py 2009-05-24 00:50:54.000000000 +1000
+@@ -14,7 +14,6 @@
+
+ def __init__(self, position = None, message = ""):
+ self.position = position
+- self.message = message
+ if position:
+ pos_str = "%s:%d:%d: " % position
+ else:
+diff -urNad pyrex-0.9.8.5~/Pyrex/Plex/Errors.py pyrex-0.9.8.5/Pyrex/Plex/Errors.py
+--- pyrex-0.9.8.5~/Pyrex/Plex/Errors.py 2003-07-08 18:35:31.000000000 +1000
++++ pyrex-0.9.8.5/Pyrex/Plex/Errors.py 2009-05-24 00:53:54.000000000 +1000
+@@ -9,7 +9,7 @@
+ import exceptions
+
+ class PlexError(exceptions.Exception):
+- message = ""
++ pass
+
+ class PlexTypeError(PlexError, TypeError):
+ pass
+@@ -29,10 +29,10 @@
+ pass
+
+ class AmbiguousAction(PlexError):
+- message = "Two tokens with different actions can match the same string"
+
+ def __init__(self):
+- pass
++ PlexError.__init__(self, "Two tokens with different actions can match the same string")
++
+
+ class UnrecognizedInput(PlexError):
+ scanner = None
