[Python-modules-commits] r9497 - in packages/pyparted/trunk/debian/patches (6 files)
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Wed Aug 26 14:41:46 UTC 2009
Date: Wednesday, August 26, 2009 @ 14:41:45
Author: dktrkranz
Revision: 9497
Adhere to DEP3
Added:
packages/pyparted/trunk/debian/patches/no_HashNotImplemented.patch
(from rev 9485, packages/pyparted/trunk/debian/patches/no_HashNotImplemented)
packages/pyparted/trunk/debian/patches/python2.5_fallback.patch
(from rev 9485, packages/pyparted/trunk/debian/patches/python2.5_fallback)
Modified:
packages/pyparted/trunk/debian/patches/lower_parted_version.patch
packages/pyparted/trunk/debian/patches/series
Deleted:
packages/pyparted/trunk/debian/patches/no_HashNotImplemented
packages/pyparted/trunk/debian/patches/python2.5_fallback
Modified: packages/pyparted/trunk/debian/patches/lower_parted_version.patch
===================================================================
--- packages/pyparted/trunk/debian/patches/lower_parted_version.patch 2009-08-26 14:38:31 UTC (rev 9496)
+++ packages/pyparted/trunk/debian/patches/lower_parted_version.patch 2009-08-26 14:41:45 UTC (rev 9497)
@@ -1,6 +1,6 @@
-Description: Lower required parted version, current Debian version already fulfil pyparted requirements.
-Origin: Debian
-Forwarded: not-needed
+Description: Lower required parted version, current Debian version already fulfil pyparted requirements.
+Origin: Debian
+Forwarded: not-needed
Index: pyparted-2.1.1/configure
===================================================================
Deleted: packages/pyparted/trunk/debian/patches/no_HashNotImplemented
===================================================================
--- packages/pyparted/trunk/debian/patches/no_HashNotImplemented 2009-08-26 14:38:31 UTC (rev 9496)
+++ packages/pyparted/trunk/debian/patches/no_HashNotImplemented 2009-08-26 14:41:45 UTC (rev 9497)
@@ -1,131 +0,0 @@
-Description: Do not use PyObject_HashNotImplemented, not implemented in Python 2.5 and older.
-Origin: Debian
-Forwarded: not-needed
-
-Index: pyparted-2.0.12/include/typeobjects/pyconstraint.h
-===================================================================
---- pyparted-2.0.12.orig/include/typeobjects/pyconstraint.h 2009-05-18 23:48:15.000000000 +0200
-+++ pyparted-2.0.12/include/typeobjects/pyconstraint.h 2009-05-18 23:49:57.000000000 +0200
-@@ -78,7 +78,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_Constraint_str,
- .tp_getattro = PyObject_GenericGetAttr,
-Index: pyparted-2.0.12/include/typeobjects/pydevice.h
-===================================================================
---- pyparted-2.0.12.orig/include/typeobjects/pydevice.h 2009-05-18 23:48:16.000000000 +0200
-+++ pyparted-2.0.12/include/typeobjects/pydevice.h 2009-05-18 23:49:57.000000000 +0200
-@@ -63,7 +63,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_CHSGeometry_str,
- .tp_getattro = PyObject_GenericGetAttr,
-@@ -227,7 +227,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_Device_str,
- .tp_getattro = PyObject_GenericGetAttr,
-Index: pyparted-2.0.12/include/typeobjects/pydisk.h
-===================================================================
---- pyparted-2.0.12.orig/include/typeobjects/pydisk.h 2009-05-18 23:48:15.000000000 +0200
-+++ pyparted-2.0.12/include/typeobjects/pydisk.h 2009-05-18 23:49:57.000000000 +0200
-@@ -84,7 +84,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_Partition_str,
- .tp_getattro = PyObject_GenericGetAttr,
-@@ -202,7 +202,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_Disk_str,
- .tp_getattro = PyObject_GenericGetAttr,
-@@ -267,7 +267,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_DiskType_str,
- .tp_getattro = PyObject_GenericGetAttr,
-Index: pyparted-2.0.12/include/typeobjects/pyfilesys.h
-===================================================================
---- pyparted-2.0.12.orig/include/typeobjects/pyfilesys.h 2009-05-18 23:48:15.000000000 +0200
-+++ pyparted-2.0.12/include/typeobjects/pyfilesys.h 2009-05-18 23:49:57.000000000 +0200
-@@ -56,7 +56,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_FileSystemType_str,
- .tp_getattro = PyObject_GenericGetAttr,
-@@ -139,7 +139,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_FileSystem_str,
- .tp_getattro = PyObject_GenericGetAttr,
-Index: pyparted-2.0.12/include/typeobjects/pygeom.h
-===================================================================
---- pyparted-2.0.12.orig/include/typeobjects/pygeom.h 2009-05-18 23:48:16.000000000 +0200
-+++ pyparted-2.0.12/include/typeobjects/pygeom.h 2009-05-18 23:49:57.000000000 +0200
-@@ -96,7 +96,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_Geometry_str,
- .tp_getattro = PyObject_GenericGetAttr,
-Index: pyparted-2.0.12/include/typeobjects/pynatmath.h
-===================================================================
---- pyparted-2.0.12.orig/include/typeobjects/pynatmath.h 2009-05-18 23:48:15.000000000 +0200
-+++ pyparted-2.0.12/include/typeobjects/pynatmath.h 2009-05-18 23:49:57.000000000 +0200
-@@ -72,7 +72,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_Alignment_str,
- .tp_getattro = PyObject_GenericGetAttr,
-Index: pyparted-2.0.12/include/typeobjects/pytimer.h
-===================================================================
---- pyparted-2.0.12.orig/include/typeobjects/pytimer.h 2009-05-18 23:48:16.000000000 +0200
-+++ pyparted-2.0.12/include/typeobjects/pytimer.h 2009-05-18 23:49:57.000000000 +0200
-@@ -73,7 +73,7 @@
- /* .tp_as_number = XXX */
- /* .tp_as_sequence = XXX */
- /* .tp_as_mapping = XXX */
-- .tp_hash = PyObject_HashNotImplemented,
-+ /* .tp_hash = XXX */
- .tp_call = NULL,
- .tp_str = (reprfunc) _ped_Timer_str,
- .tp_getattro = PyObject_GenericGetAttr,
Copied: packages/pyparted/trunk/debian/patches/no_HashNotImplemented.patch (from rev 9485, packages/pyparted/trunk/debian/patches/no_HashNotImplemented)
===================================================================
--- packages/pyparted/trunk/debian/patches/no_HashNotImplemented.patch (rev 0)
+++ packages/pyparted/trunk/debian/patches/no_HashNotImplemented.patch 2009-08-26 14:41:45 UTC (rev 9497)
@@ -0,0 +1,131 @@
+Description: Do not use PyObject_HashNotImplemented, not implemented in Python 2.5 and older.
+Origin: Debian
+Forwarded: not-needed
+
+Index: pyparted-2.0.12/include/typeobjects/pyconstraint.h
+===================================================================
+--- pyparted-2.0.12.orig/include/typeobjects/pyconstraint.h 2009-05-18 23:48:15.000000000 +0200
++++ pyparted-2.0.12/include/typeobjects/pyconstraint.h 2009-05-18 23:49:57.000000000 +0200
+@@ -78,7 +78,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_Constraint_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+Index: pyparted-2.0.12/include/typeobjects/pydevice.h
+===================================================================
+--- pyparted-2.0.12.orig/include/typeobjects/pydevice.h 2009-05-18 23:48:16.000000000 +0200
++++ pyparted-2.0.12/include/typeobjects/pydevice.h 2009-05-18 23:49:57.000000000 +0200
+@@ -63,7 +63,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_CHSGeometry_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+@@ -227,7 +227,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_Device_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+Index: pyparted-2.0.12/include/typeobjects/pydisk.h
+===================================================================
+--- pyparted-2.0.12.orig/include/typeobjects/pydisk.h 2009-05-18 23:48:15.000000000 +0200
++++ pyparted-2.0.12/include/typeobjects/pydisk.h 2009-05-18 23:49:57.000000000 +0200
+@@ -84,7 +84,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_Partition_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+@@ -202,7 +202,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_Disk_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+@@ -267,7 +267,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_DiskType_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+Index: pyparted-2.0.12/include/typeobjects/pyfilesys.h
+===================================================================
+--- pyparted-2.0.12.orig/include/typeobjects/pyfilesys.h 2009-05-18 23:48:15.000000000 +0200
++++ pyparted-2.0.12/include/typeobjects/pyfilesys.h 2009-05-18 23:49:57.000000000 +0200
+@@ -56,7 +56,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_FileSystemType_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+@@ -139,7 +139,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_FileSystem_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+Index: pyparted-2.0.12/include/typeobjects/pygeom.h
+===================================================================
+--- pyparted-2.0.12.orig/include/typeobjects/pygeom.h 2009-05-18 23:48:16.000000000 +0200
++++ pyparted-2.0.12/include/typeobjects/pygeom.h 2009-05-18 23:49:57.000000000 +0200
+@@ -96,7 +96,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_Geometry_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+Index: pyparted-2.0.12/include/typeobjects/pynatmath.h
+===================================================================
+--- pyparted-2.0.12.orig/include/typeobjects/pynatmath.h 2009-05-18 23:48:15.000000000 +0200
++++ pyparted-2.0.12/include/typeobjects/pynatmath.h 2009-05-18 23:49:57.000000000 +0200
+@@ -72,7 +72,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_Alignment_str,
+ .tp_getattro = PyObject_GenericGetAttr,
+Index: pyparted-2.0.12/include/typeobjects/pytimer.h
+===================================================================
+--- pyparted-2.0.12.orig/include/typeobjects/pytimer.h 2009-05-18 23:48:16.000000000 +0200
++++ pyparted-2.0.12/include/typeobjects/pytimer.h 2009-05-18 23:49:57.000000000 +0200
+@@ -73,7 +73,7 @@
+ /* .tp_as_number = XXX */
+ /* .tp_as_sequence = XXX */
+ /* .tp_as_mapping = XXX */
+- .tp_hash = PyObject_HashNotImplemented,
++ /* .tp_hash = XXX */
+ .tp_call = NULL,
+ .tp_str = (reprfunc) _ped_Timer_str,
+ .tp_getattro = PyObject_GenericGetAttr,
Deleted: packages/pyparted/trunk/debian/patches/python2.5_fallback
===================================================================
--- packages/pyparted/trunk/debian/patches/python2.5_fallback 2009-08-26 14:38:31 UTC (rev 9496)
+++ packages/pyparted/trunk/debian/patches/python2.5_fallback 2009-08-26 14:41:45 UTC (rev 9497)
@@ -1,33 +0,0 @@
-Description: Fallback to Python 2.5
-Origin: Debian
-Forwarded: not-needed
-
-Index: pyparted-2.0.8/src/parted/cachedlist.py
-===================================================================
---- pyparted-2.0.8.orig/src/parted/cachedlist.py 2009-03-22 16:57:15.000000000 +0100
-+++ pyparted-2.0.8/src/parted/cachedlist.py 2009-03-22 16:57:44.000000000 +0100
-@@ -20,7 +20,10 @@
- # Red Hat Author(s): Chris Lumens <clumens at redhat.com>
- #
-
--from collections import Sequence
-+try:
-+ from collections import Sequence
-+except ImportError:
-+ Sequence = type('Sequence', (object,), {})
-
- class CachedList(Sequence):
- """CachedList()
-Index: pyparted-2.0.8/src/parted/partition.py
-===================================================================
---- pyparted-2.0.8.orig/src/parted/partition.py 2009-03-22 16:56:44.000000000 +0100
-+++ pyparted-2.0.8/src/parted/partition.py 2009-03-22 16:56:54.000000000 +0100
-@@ -118,7 +118,7 @@
- """The name of this partition."""
- try:
- return self.__partition.get_name()
-- except parted.PartitionException as msg:
-+ except parted.PartitionException:
- return None
-
- @property
Copied: packages/pyparted/trunk/debian/patches/python2.5_fallback.patch (from rev 9485, packages/pyparted/trunk/debian/patches/python2.5_fallback)
===================================================================
--- packages/pyparted/trunk/debian/patches/python2.5_fallback.patch (rev 0)
+++ packages/pyparted/trunk/debian/patches/python2.5_fallback.patch 2009-08-26 14:41:45 UTC (rev 9497)
@@ -0,0 +1,33 @@
+Description: Fallback to Python 2.5
+Origin: Debian
+Forwarded: not-needed
+
+Index: pyparted-2.0.8/src/parted/cachedlist.py
+===================================================================
+--- pyparted-2.0.8.orig/src/parted/cachedlist.py 2009-03-22 16:57:15.000000000 +0100
++++ pyparted-2.0.8/src/parted/cachedlist.py 2009-03-22 16:57:44.000000000 +0100
+@@ -20,7 +20,10 @@
+ # Red Hat Author(s): Chris Lumens <clumens at redhat.com>
+ #
+
+-from collections import Sequence
++try:
++ from collections import Sequence
++except ImportError:
++ Sequence = type('Sequence', (object,), {})
+
+ class CachedList(Sequence):
+ """CachedList()
+Index: pyparted-2.0.8/src/parted/partition.py
+===================================================================
+--- pyparted-2.0.8.orig/src/parted/partition.py 2009-03-22 16:56:44.000000000 +0100
++++ pyparted-2.0.8/src/parted/partition.py 2009-03-22 16:56:54.000000000 +0100
+@@ -118,7 +118,7 @@
+ """The name of this partition."""
+ try:
+ return self.__partition.get_name()
+- except parted.PartitionException as msg:
++ except parted.PartitionException:
+ return None
+
+ @property
Modified: packages/pyparted/trunk/debian/patches/series
===================================================================
--- packages/pyparted/trunk/debian/patches/series 2009-08-26 14:38:31 UTC (rev 9496)
+++ packages/pyparted/trunk/debian/patches/series 2009-08-26 14:41:45 UTC (rev 9497)
@@ -1,4 +1,4 @@
-python2.5_fallback
-no_HashNotImplemented
+python2.5_fallback.patch
+no_HashNotImplemented.patch
lower_parted_version.patch
no_PARTITION_APPLE_TV_RECOVERY.patch
More information about the Python-modules-commits
mailing list