r21896 - in /desktop/unstable/vte/debian: changelog control patches/70_python_env.patch patches/series

[dktrkranz at users.alioth.debian.org]

Author: dktrkranz
Date: Sat Oct 10 11:53:52 2009
New Revision: 21896

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21896
Log:
Fix Python environment passing

Added:
    desktop/unstable/vte/debian/patches/70_python_env.patch
Modified:
    desktop/unstable/vte/debian/changelog
    desktop/unstable/vte/debian/control
    desktop/unstable/vte/debian/patches/series

Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=21896&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte/debian/changelog [utf-8] Sat Oct 10 11:53:52 2009
@@ -1,3 +1,10 @@
+vte (1:0.22.2-2) unstable; urgency=low
+
+  * debian/patches/70_python_env.patch:
+    - Fix Python environment passing, GNOME #587894.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 10 Oct 2009 13:43:27 +0200
+
 vte (1:0.22.2-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/vte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/control?rev=21896&op=diff
==============================================================================
--- desktop/unstable/vte/debian/control [utf-8] (original)
+++ desktop/unstable/vte/debian/control [utf-8] Sat Oct 10 11:53:52 2009
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>, Sebastian Dröge <slomo at debian.org>
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3
 Build-Depends: cdbs (>= 0.4.43),

Added: desktop/unstable/vte/debian/patches/70_python_env.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/70_python_env.patch?rev=21896&op=file
==============================================================================
--- desktop/unstable/vte/debian/patches/70_python_env.patch (added)
+++ desktop/unstable/vte/debian/patches/70_python_env.patch [utf-8] Sat Oct 10 11:53:52 2009
@@ -1,0 +1,40 @@
+GNOME #587894 - Fix Python environment passing
+
+Index: vte-0.22.2/python/vte.override
+===================================================================
+--- vte-0.22.2.orig/python/vte.override	2009-10-10 13:42:23.733533595 +0200
++++ vte-0.22.2/python/vte.override	2009-10-10 13:42:15.437536148 +0200
+@@ -114,7 +114,7 @@
+ 	int i, pos, n_envs;
+ 	PyObject *py_dict_k, *py_dict_v;
+ 
+-	if (py_envv == NULL || py_envv != Py_None) {
++	if (py_envv == NULL || py_envv == Py_None) {
+ 		return 0;
+ 	}
+ 
+@@ -124,20 +124,20 @@
+ 		pos = 0;
+ 		i = 0;
+ 		while (PyDict_Next(py_envv, &pos, &py_dict_k, &py_dict_v)) {
+-			*envv[i++] = g_strdup_printf("%s=%s",
++			(*envv)[i++] = g_strdup_printf("%s=%s",
+ 				PyString_AsString(py_dict_k),
+ 				PyString_AsString(py_dict_v));
+ 		}
+-		*envv[n_envs] = NULL;
++		(*envv)[n_envs] = NULL;
+ 	} else if (PySequence_Check(py_envv)) {
+ 		n_envs = PySequence_Length(py_envv);
+ 		*envv = g_new(gchar *, n_envs + 1);
+ 		for (i = 0; i < n_envs; i++) {
+ 			PyObject *item = PySequence_GetItem(py_envv, i);
+ 			Py_DECREF(item);  /* PySequence_GetItem INCREF's */
+-			*envv[i] = PyString_AsString(item);
++			(*envv)[i] = PyString_AsString(item);
+ 		}
+-		*envv[n_envs] = NULL;
++		(*envv)[n_envs] = NULL;
+ 	} else {
+ 		PyErr_SetString(PyExc_TypeError,
+ 				"envv must be a sequence or a dictionary");

Modified: desktop/unstable/vte/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/series?rev=21896&op=diff
==============================================================================
--- desktop/unstable/vte/debian/patches/series [utf-8] (original)
+++ desktop/unstable/vte/debian/patches/series [utf-8] Sat Oct 10 11:53:52 2009
@@ -1,4 +1,5 @@
 12_python_reaper.patch
 25_optional-ncurses.patch
 60_termcap-home-end.patch
+70_python_env.patch
 90_autoreconf.patch