r15717 - in /packages/unstable/nautilus-python/debian: NEWS README.Debian changelog control control.in dirs patches/01_fix-extension-directory.patch patches/dlopen-nasty.patch patches/update.patch rules watch
ross at users.alioth.debian.org
ross at users.alioth.debian.org
Sun Apr 20 15:44:40 UTC 2008
Author: ross
Date: Sun Apr 20 15:44:40 2008
New Revision: 15717
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15717
Log:
nautilus-python (0.5.0-1) unstable; urgency=low
* New upstream release.
* Add watch file, and patches from Ubuntu
* Also add nasty patch to load libpython2.5.so.1. Ugly.
-- Ross Burton <ross at debian.org> Sun, 20 Apr 2008 16:33:37 +0100
Added:
packages/unstable/nautilus-python/debian/NEWS
packages/unstable/nautilus-python/debian/patches/01_fix-extension-directory.patch
packages/unstable/nautilus-python/debian/patches/dlopen-nasty.patch
packages/unstable/nautilus-python/debian/patches/update.patch
packages/unstable/nautilus-python/debian/watch
Modified:
packages/unstable/nautilus-python/debian/README.Debian
packages/unstable/nautilus-python/debian/changelog
packages/unstable/nautilus-python/debian/control
packages/unstable/nautilus-python/debian/control.in
packages/unstable/nautilus-python/debian/dirs
packages/unstable/nautilus-python/debian/rules
Added: packages/unstable/nautilus-python/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/NEWS?rev=15717&op=file
==============================================================================
--- packages/unstable/nautilus-python/debian/NEWS (added)
+++ packages/unstable/nautilus-python/debian/NEWS Sun Apr 20 15:44:40 2008
@@ -1,0 +1,7 @@
+nautilus-python (0.5.0-1) unstable; urgency=low
+
+ * This version of nautilus-python requires Nautilus 2.22. Because there
+ have been API/ABI changes, the extension directory has changed to
+ /usr/lib/nautilus/extension-2.0/python.
+
+ -- Ross Burton <ross at debian.org> Sun, 20 Apr 2008 16:43:55 +0100
Modified: packages/unstable/nautilus-python/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/README.Debian?rev=15717&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/README.Debian (original)
+++ packages/unstable/nautilus-python/debian/README.Debian Sun Apr 20 15:44:40 2008
@@ -3,7 +3,7 @@
Plugins are loaded from two locations:
- /usr/lib/nautilus/extensions-1.0/python - all-user plugin directory
+ /usr/lib/nautilus/extensions-2.0/python - all-user plugin directory
~/.nautilus/python-extensions - per-user plugin directory
Sample plugins can be found in /usr/share/doc/python-nautilus/examples. To use
Modified: packages/unstable/nautilus-python/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/changelog?rev=15717&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/changelog (original)
+++ packages/unstable/nautilus-python/debian/changelog Sun Apr 20 15:44:40 2008
@@ -1,3 +1,11 @@
+nautilus-python (0.5.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add watch file, and patches from Ubuntu
+ * Also add nasty patch to load libpython2.5.so.1. Ugly.
+
+ -- Ross Burton <ross at debian.org> Sun, 20 Apr 2008 16:33:37 +0100
+
nautilus-python (0.4.3-2) unstable; urgency=low
[ Ross Burton ]
Modified: packages/unstable/nautilus-python/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/control?rev=15717&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/control (original)
+++ packages/unstable/nautilus-python/debian/control Sun Apr 20 15:44:40 2008
@@ -4,7 +4,7 @@
Maintainer: Ross Burton <ross at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, python, python-dev, python-gtk2-dev (>= 2.8.0), python-gnome2-dev (>= 2.12.1-3), libnautilus-extension-dev (>= 2.6.0), libeel2-dev (>= 2.6.0)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: python-nautilus
Architecture: any
Modified: packages/unstable/nautilus-python/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/control.in?rev=15717&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/control.in (original)
+++ packages/unstable/nautilus-python/debian/control.in Sun Apr 20 15:44:40 2008
@@ -1,10 +1,10 @@
Source: nautilus-python
-Section: gnome
+Section: python
Priority: optional
Maintainer: Ross Burton <ross at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, python, python-dev, python-gtk2-dev (>= 2.8.0), python-gnome2-dev (>= 2.12.1-3), libnautilus-extension-dev (>= 2.6.0), libeel2-dev (>= 2.6.0)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, python, python-dev, python-gtk2-dev (>= 2.8.0), python-gnome2-dev (>= 2.12.1-3), libnautilus-extension-dev (>= 2.22.0), libeel2-dev (>= 2.6.0)
+Standards-Version: 3.7.3
Package: python-nautilus
Architecture: any
Modified: packages/unstable/nautilus-python/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/dirs?rev=15717&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/dirs (original)
+++ packages/unstable/nautilus-python/debian/dirs Sun Apr 20 15:44:40 2008
@@ -1,1 +1,1 @@
-usr/lib/nautilus/extensions-1.0/python
+usr/lib/nautilus/extensions-2.0/python
Added: packages/unstable/nautilus-python/debian/patches/01_fix-extension-directory.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/patches/01_fix-extension-directory.patch?rev=15717&op=file
==============================================================================
--- packages/unstable/nautilus-python/debian/patches/01_fix-extension-directory.patch (added)
+++ packages/unstable/nautilus-python/debian/patches/01_fix-extension-directory.patch Sun Apr 20 15:44:40 2008
@@ -1,0 +1,56 @@
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/examples/README.in nautilus-python-0.5.0.new/examples/README.in
+--- nautilus-python-0.5.0/examples/README.in 2008-01-11 12:07:15.000000000 +0100
++++ nautilus-python-0.5.0.new/examples/README.in 2008-04-11 19:30:44.000000000 +0200
+@@ -1,6 +1,6 @@
+ To try any of the examples, copy them over to:
+
+- @NAUTILUS_LIBDIR@/nautilus/extensions-1.0/python/
++ @NAUTILUS_LIBDIR@/nautilus/extensions-2.0/python/
+ or:
+ ~/.nautilus/python-extensions/
+
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/nautilus-python.pc.in nautilus-python-0.5.0.new/nautilus-python.pc.in
+--- nautilus-python-0.5.0/nautilus-python.pc.in 2008-01-11 12:07:15.000000000 +0100
++++ nautilus-python-0.5.0.new/nautilus-python.pc.in 2008-04-11 19:30:54.000000000 +0200
+@@ -4,4 +4,4 @@
+
+ prefix=@prefix@
+ libdir=${prefix}/lib
+-pythondir=@NAUTILUS_LIBDIR@/nautilus/extensions-1.0/python
++pythondir=@NAUTILUS_LIBDIR@/nautilus/extensions-2.0/python
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/nautilus-python.spec.in nautilus-python-0.5.0.new/nautilus-python.spec.in
+--- nautilus-python-0.5.0/nautilus-python.spec.in 2008-01-11 12:07:15.000000000 +0100
++++ nautilus-python-0.5.0.new/nautilus-python.spec.in 2008-04-11 19:31:07.000000000 +0200
+@@ -45,7 +45,7 @@
+ %defattr(-,root,root,-)
+ %doc AUTHORS ChangeLog NEWS
+ %{_libdir}/nautilus-python
+-%{_libdir}/nautilus/extensions-1.0
++%{_libdir}/nautilus/extensions-2.0
+ %{_libdir}/pkgconfig/nautilus-python.pc
+
+ %changelog
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/README nautilus-python-0.5.0.new/README
+--- nautilus-python-0.5.0/README 2008-01-11 12:07:15.000000000 +0100
++++ nautilus-python-0.5.0.new/README 2008-04-11 19:31:42.000000000 +0200
+@@ -6,7 +6,7 @@
+
+ For examples and documentation check the examples sub directory.
+
+-Note that scripts are loaded from $prefix/lib/nautilus/extensions-1.0/python
++Note that scripts are loaded from $prefix/lib/nautilus/extensions-2.0/python
+
+ Try to copy test.py to that directory for an example
+
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/src/nautilus-python.c nautilus-python-0.5.0.new/src/nautilus-python.c
+--- nautilus-python-0.5.0/src/nautilus-python.c 2008-04-11 19:28:51.000000000 +0200
++++ nautilus-python-0.5.0.new/src/nautilus-python.c 2008-04-11 19:31:29.000000000 +0200
+@@ -332,7 +332,7 @@
+
+ all_types = g_array_new(FALSE, FALSE, sizeof(GType));
+
+- nautilus_python_load_dir(module, NAUTILUS_LIBDIR "/nautilus/extensions-1.0/python");
++ nautilus_python_load_dir(module, NAUTILUS_LIBDIR "/nautilus/extensions-2.0/python");
+ user_extensions_dir = g_strdup_printf("%s/.nautilus/python-extensions/",
+ g_get_home_dir());
+ nautilus_python_load_dir(module, user_extensions_dir);
Added: packages/unstable/nautilus-python/debian/patches/dlopen-nasty.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/patches/dlopen-nasty.patch?rev=15717&op=file
==============================================================================
--- packages/unstable/nautilus-python/debian/patches/dlopen-nasty.patch (added)
+++ packages/unstable/nautilus-python/debian/patches/dlopen-nasty.patch Sun Apr 20 15:44:40 2008
@@ -1,0 +1,13 @@
+--- 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");
Added: packages/unstable/nautilus-python/debian/patches/update.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/patches/update.patch?rev=15717&op=file
==============================================================================
--- packages/unstable/nautilus-python/debian/patches/update.patch (added)
+++ packages/unstable/nautilus-python/debian/patches/update.patch Sun Apr 20 15:44:40 2008
@@ -1,0 +1,55 @@
+Index: src/nautilus.defs
+===================================================================
+--- src/nautilus.defs (révision 54)
++++ src/nautilus.defs (copie de travail)
+@@ -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")
Modified: packages/unstable/nautilus-python/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/rules?rev=15717&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/rules (original)
+++ packages/unstable/nautilus-python/debian/rules Sun Apr 20 15:44:40 2008
@@ -11,5 +11,5 @@
DEB_DH_MAKESHLIBS_ARGS_python-nautilus += --noscripts
binary-post-install/python-nautilus::
- rm -f debian/python-nautilus/usr/lib/nautilus/extensions-1.0/python/*
+ rm -f debian/python-nautilus/usr/lib/nautilus/extensions-2.0/python/*
rm -rf debian/python-nautilus/usr/share/doc/nautilus-python/
Added: packages/unstable/nautilus-python/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/watch?rev=15717&op=file
==============================================================================
--- packages/unstable/nautilus-python/debian/watch (added)
+++ packages/unstable/nautilus-python/debian/watch Sun Apr 20 15:44:40 2008
@@ -1,0 +1,3 @@
+version=3
+http://ftp.gnome.org/pub/GNOME/sources/nautilus-python/([\d\.]+)/nautilus-python-([\d\.]+)\.tar\.gz debian uupdate
+
More information about the pkg-gnome-commits
mailing list