diff -u nautilus-python-0.5.0/debian/changelog nautilus-python-0.5.0/debian/changelog --- nautilus-python-0.5.0/debian/changelog +++ nautilus-python-0.5.0/debian/changelog @@ -1,3 +1,15 @@ +nautilus-python (0.5.0-0ubuntu2) hardy; urgency=low + + * Add the ".1" to the module name of python that we try and g_module_open + so that it works without having the python -dev package installed. + This is fragile as it is hardcoded, and wouldn't be accepted upstream + as it would break on Windows. However it will work ok for Hardy, + as it is a more controlled environment. (LP: #44704) + * Take the patch from http://bugzilla.gnome.org/show_bug.cgi?id=518824 + to catch nautilus-python up with nautilus changes. + + -- James Westby Mon, 31 Mar 2008 11:32:08 +0100 + nautilus-python (0.5.0-0ubuntu1) hardy; urgency=low * New upstream release (LP: #186267) only in patch2: unchanged: --- nautilus-python-0.5.0.orig/src/nautilus-python.c +++ nautilus-python-0.5.0/src/nautilus-python.c @@ -205,8 +205,8 @@ if (Py_IsInitialized()) return TRUE; - debug("g_module_open " PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX); - libpython = g_module_open(PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX, 0); + debug("g_module_open " PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX ".1"); + libpython = g_module_open(PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX ".1", 0); if (!libpython) g_warning("g_module_open libpython failed: %s", g_module_error()); debug("Py_Initialize"); only in patch2: unchanged: --- nautilus-python-0.5.0.orig/src/nautilus.defs +++ nautilus-python-0.5.0/src/nautilus.defs @@ -129,6 +129,18 @@ (return-type "gboolean") ) +(define-method get_file_type + (of-object "NautilusFileInfo") + (c-name "nautilus_file_info_get_file_type") + (return-type "GFileType") +) + +(define-method get_location + (of-object "NautilusFileInfo") + (c-name "nautilus_file_info_get_location") + (return-type "GFile") +) + (define-method get_name (of-object "NautilusFileInfo") (c-name "nautilus_file_info_get_name") @@ -141,6 +153,18 @@ (return-type "char*") ) +(define-method get_activation_uri + (of-object "NautilusFileInfo") + (c-name "nautilus_file_info_get_activation_uri") + (return-type "char*") +) + +(define-method get_parent_location + (of-object "NautilusFileInfo") + (c-name "nautilus_file_info_get_parent_location") + (return-type "GFile") +) + (define-method get_parent_uri (of-object "NautilusFileInfo") (c-name "nautilus_file_info_get_parent_uri") @@ -174,12 +198,6 @@ (return-type "gboolean") ) -(define-method get_vfs_file_info - (of-object "NautilusFileInfo") - (c-name "nautilus_file_info_get_vfs_file_info") - (return-type "GnomeVFSFileInfo*") -) - (define-method add_emblem (of-object "NautilusFileInfo") (c-name "nautilus_file_info_add_emblem")