r18298 - in /packages/unstable/nautilus-python/debian: changelog patches/30_use-Py_ssize_t.patch patches/40_init-gnomevfs.patch

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

Author: pochu-guest
Date: Thu Jan 29 09:21:29 2009
New Revision: 18298

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18298
Log:
Acknowledge NMU, thanks Evgeni Golov.

Added:
    packages/unstable/nautilus-python/debian/patches/30_use-Py_ssize_t.patch
    packages/unstable/nautilus-python/debian/patches/40_init-gnomevfs.patch
Modified:
    packages/unstable/nautilus-python/debian/changelog

Modified: packages/unstable/nautilus-python/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/changelog?rev=18298&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/changelog (original)
+++ packages/unstable/nautilus-python/debian/changelog Thu Jan 29 09:21:29 2009
@@ -1,9 +1,25 @@
 nautilus-python (0.4.3-4) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Move to python section to fit override.
   * Wrap build-deps and deps.
 
+  [ Emilio Pozuelo Monfort ]
+  * Acknowledge NMU, thanks Evgeni Golov.
+
  -- Loic Minier <lool at dooz.org>  Sat, 05 Jul 2008 18:24:46 +0200
+
+nautilus-python (0.4.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add 30_use-Py_ssize_t.patch to make nautilus-python work
+    with python2.5 on arches where int isn't the same as Py_ssize_t.
+    Closes: #512310
+  * Add 40_init-gnomevfs.patch to stop freezing when gnomevfs isn't
+    initialized.
+    Closes: #512394, LP: #114189
+
+ -- Evgeni Golov <sargentd at die-welt.net>  Tue, 20 Jan 2009 12:42:44 +0100
 
 nautilus-python (0.4.3-3) unstable; urgency=medium
 

Added: packages/unstable/nautilus-python/debian/patches/30_use-Py_ssize_t.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/patches/30_use-Py_ssize_t.patch?rev=18298&op=file
==============================================================================
--- packages/unstable/nautilus-python/debian/patches/30_use-Py_ssize_t.patch (added)
+++ packages/unstable/nautilus-python/debian/patches/30_use-Py_ssize_t.patch Thu Jan 29 09:21:29 2009
@@ -1,0 +1,52 @@
+2008-01-11  Jonathan Rogers <jonner at teegra.net>
+	reviewed by: Johan Dahlin
+
+	* src/nautilus-python-object.c:
+	* src/nautilus-python.c: (nautilus_python_load_file):
+	* src/nautilus-python.h:
+	Use Py_ssize_t instead of int, so nautilus-python works on Python 2.5
+	fixes #444366	
+
+Index: nautilus-python/src/nautilus-python.c
+===================================================================
+--- nautilus-python/src/nautilus-python.c	(revision 47)
++++ nautilus-python/src/nautilus-python.c	(revision 48)
+@@ -114,7 +114,7 @@
+ 	PyObject *main_module, *main_locals, *locals, *key, *value;
+ 	PyObject *module;
+ 	GType gtype;
+-	int pos = 0;
++	Py_ssize_t pos = 0;
+ 	
+ 	debug_enter_args("filename=%s", filename);
+ 	
+Index: nautilus-python/src/nautilus-python-object.c
+===================================================================
+--- nautilus-python/src/nautilus-python-object.c	(revision 47)
++++ nautilus-python/src/nautilus-python-object.c	(revision 48)
+@@ -74,7 +74,7 @@
+ 
+ #define HANDLE_LIST(py_ret, type, type_name)                           \
+     {                                                                  \
+-        int i = 0;                                                     \
++        Py_ssize_t i = 0;                                                     \
+     	if (!PySequence_Check(py_ret) || PyString_Check(py_ret)) {     \
+     		PyErr_SetString(PyExc_TypeError,                           \
+     						METHOD_NAME " must return a sequence");    \
+Index: nautilus-python/src/nautilus-python.h
+===================================================================
+--- nautilus-python/src/nautilus-python.h	(revision 47)
++++ nautilus-python/src/nautilus-python.h	(revision 48)
+@@ -26,6 +26,12 @@
+ #include <glib/gprintf.h>
+ #include <Python.h>
+ 
++#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
++typedef int Py_ssize_t;
++#define PY_SSIZE_T_MAX INT_MAX
++#define PY_SSIZE_T_MIN INT_MIN
++#endif
++
+ typedef enum {
+     NAUTILUS_PYTHON_DEBUG_MISC = 1 << 0,
+ } NautilusPythonDebug;

Added: packages/unstable/nautilus-python/debian/patches/40_init-gnomevfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/patches/40_init-gnomevfs.patch?rev=18298&op=file
==============================================================================
--- packages/unstable/nautilus-python/debian/patches/40_init-gnomevfs.patch (added)
+++ packages/unstable/nautilus-python/debian/patches/40_init-gnomevfs.patch Thu Jan 29 09:21:29 2009
@@ -1,0 +1,20 @@
+=== modified file 'nautilus-python-0.4.3/src/nautilusmodule.c'
+--- nautilus-python-0.4.3/src/nautilusmodule.c	2007-11-30 13:59:46 +0000
++++ nautilus-python-0.4.3/src/nautilusmodule.c	2007-12-02 08:27:18 +0000
+@@ -27,6 +27,7 @@
+ /* include this first, before NO_IMPORT_PYGOBJECT is defined */
+ #include <pygobject.h>
+ #include <pygtk/pygtk.h>
++#include "pygnomevfs.h"
+ 
+ void pynautilus_register_classes (PyObject *d);
+ void pynautilus_add_constants(PyObject *module, const gchar *strip_prefix);
+@@ -45,6 +46,7 @@
+ 	
+     init_pygobject ();
+     init_pygtk ();
++    init_pygnomevfs();
+ 
+     m = Py_InitModule ("nautilus", pynautilus_functions);
+     d = PyModule_GetDict (m);
+