diff -u nautilus-sendto-0.12/debian/control nautilus-sendto-0.12/debian/control --- nautilus-sendto-0.12/debian/control +++ nautilus-sendto-0.12/debian/control @@ -1,7 +1,8 @@ Source: nautilus-sendto Section: gnome Priority: optional -Maintainer: Oystein Gisnas +XSBC-Original-Maintainer: Oystein Gisnas +Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 5.0), cdbs, dh-buildinfo, @@ -13,12 +14,13 @@ libgconf2-dev (>= 2.13.0), libebook1.2-dev (>= 1.5.3), pidgin-dev (>= 2.0.0), - gajim, libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libxml-parser-perl, - gconf2 -Uploaders: Debian GNOME Maintainers , Loic Minier + gconf2, + libgnomebt0-dev (>= 0.6.0), + libbtctl4-dev (>= 0.8.0) +Uploaders: Debian GNOME Maintainers , Loic Minier , Oystein Gisnas Standards-Version: 3.7.2 Package: nautilus-sendto @@ -28,16 +30,18 @@ ${misc:Depends} -Suggests: evolution (>= 2.4), - pidgin (>= 2.0.0), - sylpheed-claws, - gajim, +Recommends: evolution (>= 2.4), + pidgin, + gnome-bluetooth +Suggests: claws-mail, python-dbus Description: integrates Evolution and Pidgin into the Nautilus file manager The Nautilus Send To plugin provides the Nautilus file manager with a context menu component for quickly sending files to accounts in an Evolution email - address book, contacts on a Pidgin or Gajim instant messaging list, or through + address book, contacts on a Pidgin instant messaging list, or through Sylpheed Claws. . Nautilus Send To also provides the option of compressing the files (tar.bz2, tar.gz, or zip) before sending. . + To make use of the bluetooth functionality, install 'gnome-bluetooth'. + . Author: Roberto Majadas diff -u nautilus-sendto-0.12/debian/control.in nautilus-sendto-0.12/debian/control.in --- nautilus-sendto-0.12/debian/control.in +++ nautilus-sendto-0.12/debian/control.in @@ -1,7 +1,8 @@ Source: nautilus-sendto Section: gnome Priority: optional -Maintainer: Oystein Gisnas +XSBC-Original-Maintainer: Oystein Gisnas +Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 5.0), cdbs, dh-buildinfo, @@ -13,11 +14,12 @@ libgconf2-dev (>= 2.13.0), libebook1.2-dev (>= 1.5.3), pidgin-dev (>= 2.0.0), - gajim, libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libxml-parser-perl, - gconf2 + gconf2, + libgnomebt0-dev (>= 0.6.0), + libbtctl4-dev (>= 0.8.0) Uploaders: @GNOME_TEAM@ Standards-Version: 3.7.2 @@ -28,16 +30,18 @@ ${misc:Depends} -Suggests: evolution (>= 2.4), - pidgin (>= 2.0.0), - sylpheed-claws, - gajim, +Recommends: evolution (>= 2.4), + pidgin, + gnome-bluetooth +Suggests: claws-mail, python-dbus Description: integrates Evolution and Pidgin into the Nautilus file manager The Nautilus Send To plugin provides the Nautilus file manager with a context menu component for quickly sending files to accounts in an Evolution email - address book, contacts on a Pidgin or Gajim instant messaging list, or through + address book, contacts on a Pidgin instant messaging list, or through Sylpheed Claws. . Nautilus Send To also provides the option of compressing the files (tar.bz2, tar.gz, or zip) before sending. . + To make use of the bluetooth functionality, install 'gnome-bluetooth'. + . Author: Roberto Majadas diff -u nautilus-sendto-0.12/debian/changelog nautilus-sendto-0.12/debian/changelog --- nautilus-sendto-0.12/debian/changelog +++ nautilus-sendto-0.12/debian/changelog @@ -1,3 +1,19 @@ +nautilus-sendto (0.12-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #160714) remaining changes: + - debian/patches/nautilus-sendto-0.7-thunderbird.patch: + - update from Whoopie to list thunderbird attachments correctly + - debian/control.in: + - updated maintainer field + - drop gajim Build-Depends and Suggests + - add libgnomebt0-dev (>= 0.6.0), libbtctl4-dev (>= 0.8.0) to + Build-Depends + - fixed Reccomends and Suggests field + - small changes in the package description + - debian/rules: build with --enable-bluetooth instead of --with-gajim + + -- Mario Bonino Wed, 07 Nov 2007 11:45:22 +0100 + nautilus-sendto (0.12-2) unstable; urgency=low * 20_pidgin-debug-info.patch: Fix unresolved pidgin plugin diff -u nautilus-sendto-0.12/debian/rules nautilus-sendto-0.12/debian/rules --- nautilus-sendto-0.12/debian/rules +++ nautilus-sendto-0.12/debian/rules @@ -18,7 +18,7 @@ DEB_DH_MAKESHLIBS_ARGS += --noscripts DEB_DH_SHLIBDEPS_ARGS_ALL += --exclude=/usr/lib/nautilus-sendto/plugins -DEB_CONFIGURE_EXTRA_FLAGS += --with-gajim=/usr +DEB_CONFIGURE_EXTRA_FLAGS += --enable-bluetooth binary-post-install/nautilus-sendto:: # Remove unnecessary libtool library files only in patch2: unchanged: --- nautilus-sendto-0.12.orig/debian/patches/nautilus-sendto-0.7-thunderbird.patch +++ nautilus-sendto-0.12/debian/patches/nautilus-sendto-0.7-thunderbird.patch @@ -0,0 +1,43 @@ +diff -Nur nautilus-sendto-0.12/configure nautilus-sendto-0.12.new/configure +--- nautilus-sendto-0.12/configure 2007-08-13 17:31:01.000000000 +0200 ++++ nautilus-sendto-0.12.new/configure 2007-11-07 11:52:56.000000000 +0100 +@@ -20633,7 +20633,7 @@ + + + +-enable_thunderbird=no ++enable_thunderbird=yes + if test "x$enable_thunderbird" = "xyes"; then + HAVE_THUNDERBIRD_TRUE= + HAVE_THUNDERBIRD_FALSE='#' +diff -Nur nautilus-sendto-0.12/src/plugins/thunderbird.c nautilus-sendto-0.12.new/src/plugins/thunderbird.c +--- nautilus-sendto-0.12/src/plugins/thunderbird.c 2007-08-13 17:13:26.000000000 +0200 ++++ nautilus-sendto-0.12.new/src/plugins/thunderbird.c 2007-11-07 11:51:59.000000000 +0100 +@@ -37,7 +37,7 @@ + printf ("Init thunderbird plugin\n"); + hash = g_hash_table_new (g_str_hash, g_str_equal); + +- t_cmd = g_find_program_in_path ("mozilla-thunderbird"); ++ t_cmd = g_find_program_in_path ("thunderbird"); + if (t_cmd == NULL) + return FALSE; + return TRUE; +@@ -74,14 +74,15 @@ + g_string_append_printf (mailto, "to=%s,", send_to); + } + +- t_cmd = g_find_program_in_path ("mozilla-thunderbird"); ++ t_cmd = g_find_program_in_path ("thunderbird"); + if (t_cmd == NULL) + return FALSE; + +- g_string_append_printf (mailto," attachment='\"%s\"'",file_list->data); ++ g_string_append_printf (mailto,"\"attachment='%s",file_list->data); + for (l = file_list->next ; l; l=l->next){ +- g_string_append_printf (mailto,",'\"%s\"'",l->data); ++ g_string_append_printf (mailto,",%s",l->data); + } ++ g_string_append (mailto, "'\""); + cmd = g_strdup_printf ("%s %s", t_cmd, mailto->str); + g_spawn_command_line_async (cmd, NULL); + g_free (cmd);