--- nautilus-share-0.7.2.orig/debian/rules +++ nautilus-share-0.7.2/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_DH_INSTALLCHANGELOGS_ARGS = ChangeLog +DEB_DH_MAKESHLIBS_ARGS = -n +DEB_INSTALL_DOCS_ALL = AUTHORS +LDFLAGS += -Wl,--as-needed + +install/nautilus-share:: + find $(DEB_DESTDIR) -name '*.*a' -delete + +build/nautilus-share:: + cd po; intltool-update -p --verbose + +clean:: + rm -f intltool-merge intltool-update intltool-extract + +# hack to remove shlibs to fix lintian error +binary-predeb/nautilus-share:: + rm -f debian/nautilus-share/DEBIAN/shlibs --- nautilus-share-0.7.2.orig/debian/changelog +++ nautilus-share-0.7.2/debian/changelog @@ -0,0 +1,161 @@ +nautilus-share (0.7.2-4ubuntu1) jaunty; urgency=low + + * Merge from Debian (LP: #349678), remaining changes: + + debian/control, + debian/patches/05_dependencies.patch: + - Drop libeel dependency + + -- Chow Loong Jin Sat, 28 Mar 2009 21:35:21 +0800 + +nautilus-share (0.7.2-4) unstable; urgency=low + + * debian/patches/06_fix-validation.patch: + + Fix issue where field validation errors aren't cleared after being + corrected + * debian/patches/02_install_missing_samba.patch: + + Ask to retry if installation failed + + -- Chow Loong Jin Sat, 21 Mar 2009 20:11:02 +0800 + +nautilus-share (0.7.2-3) unstable; urgency=low + + * debian/patches/04_use_correct_icon.patch: + + Use folder-remote instead of gnome-fs-share + + -- Chow Loong Jin Fri, 20 Mar 2009 01:37:56 +0800 + +nautilus-share (0.7.2-2) unstable; urgency=low + + * debian/patches/04_use_correct_icon.patch: + + Updated to fix icon in properties dialog as well + + -- Chow Loong Jin Thu, 19 Mar 2009 23:21:45 +0800 + +nautilus-share (0.7.2-1) unstable; urgency=low + + * New upstream release + * debian/control: + + Change maintainer (Closes: #501938) + + Change build-dep to include CDBS and Quilt + + Move samba from Depends to Suggests since 02_install_missing_samba.patch + allows for automatic installing of samba + + Add libgnomevfs2-dev dependency + * debian/rules: + + Move to CDBS + + Build translation templates + + Omit installing useless doc files (retain AUTHORS only) + + Add -Wl,--as-needed to LDFLAGS to drop unnecessary dependencies + * debian/examples: + + Add smb.conf to this + * debian/copyright: + + Switched to new copyright format + + Added another name to Upstream-Maintainers + * debian/docs: + + Dropped, not needed. + * debian/smb.conf, debian/README.Debian: + + Update usershare directory (Closes: #500443) + * Import patches from Ubuntu: + + debian/patches/01_fix_install_dir.patch: + - Fix install dir location for nautilus extensions (Closes: #475230) + - Modified to use extension path from pkg-config + + debian/patches/02_install_missing_samba.patch: + - Ask to install samba and libpam-smbpass if it is not installed already + + debian/patches/03_no_verbose_logging.patch: + - Don't print extra messages in session logs when there is no issue + - Modified to also omit initializing and shutdown messages + + debian/patches/04_use_correct_icon.patch: + - Use gnome-fs-share icon in Nautilus + * debian/patches/05_dependencies.patch: + + Add needed cflags and libs from libgnomeui-2.0 and + gnome-vfs-2.0 + * debian/patches/99_ltmain_as-needed.patch: + + Imported from Banshee packaging, adds -Wl,--as-needed support + + -- Chow Loong Jin Wed, 18 Mar 2009 00:30:15 +0800 + +nautilus-share (0.7.2-0ubuntu8) jaunty; urgency=low + + * 04_fix_libraries.dpatch: + - Correctly include libgnomeui and libgnomevfs headers. Remove unused link + to libeel. (LP: #347971) + * 05_autoreconf.dpatch: + - Regenerate autoconf scripts + * Added libgnomevfs to Build-Depends + + -- Robert Ancell Tue, 24 Mar 2009 13:42:29 +0000 + +nautilus-share (0.7.2-0ubuntu7) intrepid; urgency=low + + * 02_install_missing_samba.dpatch: + - prompt for restarting session when installing samba and libpam-smbpass + to create NTLM password hash (sudoers are already in sambashare group + in intrepid) (LP: #212098) + - hidden window was not destroyed if user accepts installing samba + + -- Didier Roche Sat, 18 Oct 2008 14:00:09 +0200 + +nautilus-share (0.7.2-0ubuntu6) intrepid; urgency=low + + * rebuild using the new libgail gtk version + + -- Sebastien Bacher Wed, 18 Jun 2008 23:46:02 +0200 + +nautilus-share (0.7.2-0ubuntu5) hardy; urgency=low + + * 02_install_missing_samba.dpatch: + - install libpam-smbpass in addition to samba (LP: #208419) + + -- Michael Vogt Thu, 10 Apr 2008 11:46:49 +0200 + +nautilus-share (0.7.2-0ubuntu4) hardy; urgency=low + + * debian/rules: + - build translations template + + -- Sebastien Bacher Sat, 29 Mar 2008 15:25:57 +0100 + +nautilus-share (0.7.2-0ubuntu3) hardy; urgency=low + + * debian/patches/02_install_missing_samba.dpatch: + - check if samba is installed when trying to share something and not + when opening the properties dialog (lp: #207982) + * debian/patches/03_no_verbose_logging.dpatch: + - don't print extra messages in the session logs when there is no issue + * debian/patches/03_use_correct_icon.dpatch: + - use the gnome-fs-share icon in nautilus + + -- Sebastien Bacher Sat, 29 Mar 2008 14:49:27 +0100 + +nautilus-share (0.7.2-0ubuntu2) hardy; urgency=low + + * debian/control: + - suggest samba instead of depending on it + * debian/patches/02_install_missing_samba.dpatch: + - ask to install samba if it is not installed already + + -- Michael Vogt Wed, 12 Mar 2008 21:03:05 +0100 + +nautilus-share (0.7.2-0ubuntu1) hardy; urgency=low + + * New upstream release + * build against latest nautilus + * Modify Maintainer value to match the DebianMaintainerField + specification. + * added dpatch build-dependency + * debian/patches/01_fix_install_dir.dpatch: + - fix install dir location for nautilus extensions + + -- Michael Vogt Fri, 08 Feb 2008 19:20:32 +0100 + +nautilus-share (0.7.1-2) unstable; urgency=low + + * Upload to unstable + * Added an example of samba configuration file + + -- Thierry Randrianiriana Sun, 29 Apr 2007 18:48:52 +0300 + +nautilus-share (0.7.1-1) experimental; urgency=low + + * Initial release (Closes: #315229) + + -- Thierry Randrianiriana Sun, 18 Mar 2007 08:21:12 +0300 --- nautilus-share-0.7.2.orig/debian/examples +++ nautilus-share-0.7.2/debian/examples @@ -0,0 +1 @@ +debian/smb.conf --- nautilus-share-0.7.2.orig/debian/watch +++ nautilus-share-0.7.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://gentoo.ovibes.net/nautilus-share/nautilus-share-(.*)\.tar\.gz --- nautilus-share-0.7.2.orig/debian/copyright +++ nautilus-share-0.7.2/debian/copyright @@ -0,0 +1,31 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Upstream-Name: nautilus-share +Upstream-Maintainer: Sebastien Estienne , + Federico Mena Quintero +Upstream-Source: http://gentoo.ovibes.net/nautilus-share/ + +Files: * +Copyright: Copyright 2005 Ethium, Inc. +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, a full copy of this license can be found in + /usr/share/common-licenses/GPL-2 + +Files: debian/* +Copyright: Copyright 2007-2008, Thierry Randrianiriana +Copyright: Copyright 2009, Chow Loong Jin +License: GPL-2+ + --- nautilus-share-0.7.2.orig/debian/compat +++ nautilus-share-0.7.2/debian/compat @@ -0,0 +1 @@ +5 --- nautilus-share-0.7.2.orig/debian/README.Debian +++ nautilus-share-0.7.2/debian/README.Debian @@ -0,0 +1,20 @@ +nautilus-share for Debian +------------------------- + +A quick and easy way to have it running (must be done as root): + +#export USERSHARES_DIR="/var/lib/samba/usershares" +#export USERSHARES_GROUP="sambashare" +#mkdir ${USERSHARES_DIR} +#groupadd ${USERSHARES_GROUP} +#chown root:${USERSHARES_GROUP} ${USERSHARES_DIR} +#chmod 01770 ${USERSHARES_DIR} +#mv /etc/samba/smb.conf{,.bak} +#cp /usr/share/doc/nautilus-share/examples/smb.conf /etc/samba/ +#/etc/init.d/samba restart + +You must add users who can share folder in the usershare group, in this example the group is "sambashare": + +#usermod -a -G sambashare your_username + + -- Chow Loong Jin +XSBC-Original-Maintainer: Chow Loong Jin +Build-Depends: cdbs, + debhelper (>= 5), + autotools-dev, + quilt, + intltool (>= 0.29), + libgnomeui-dev, + libgnomevfs2-dev, + libnautilus-extension-dev (>= 2.10.0), + libglib2.0-dev (>= 2.4.0), + libglade2-dev (>= 2.4.0), +Standards-Version: 3.8.0 +Homepage: http://gentoo.ovibes.net/nautilus-share/ + +Package: nautilus-share +Architecture: any +Depends: nautilus (>= 2.10), ${shlibs:Depends}, ${misc:Depends} +Suggests: samba (>= 3.0.23) +Description: Nautilus extension to share folder using Samba + Nautilus Share allows you to quickly share a folder from + the GNOME Nautilus file manager without requiring root access. --- nautilus-share-0.7.2.orig/debian/smb.conf +++ nautilus-share-0.7.2/debian/smb.conf @@ -0,0 +1,9 @@ +[global] +workgroup = HOME +security = share + +usershare path = /var/lib/samba/usershares +usershare max shares = 100 +usershare allow guests = yes +usershare owner only = yes +wins support = no --- nautilus-share-0.7.2.orig/debian/patches/02_install_missing_samba.patch +++ nautilus-share-0.7.2/debian/patches/02_install_missing_samba.patch @@ -0,0 +1,273 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +Index: nautilus-share/src/nautilus-share.c +=================================================================== +--- nautilus-share.orig/src/nautilus-share.c 2009-03-21 16:11:06.000000000 +0800 ++++ nautilus-share/src/nautilus-share.c 2009-03-21 19:19:57.000000000 +0800 +@@ -32,6 +32,7 @@ + #include + + #include ++#include + #include "nautilus-share.h" + + #include +@@ -45,6 +46,9 @@ + #include + #include + ++#include ++#include ++ + #include + + #include +@@ -52,6 +56,7 @@ + + #include + #include ++#include + + #include "shares.h" + +@@ -573,6 +578,223 @@ + property_page_check_sensitivity (page); + } + ++static gchar* ++create_temp_file (const gchar *packages[]) ++{ ++ int fd; ++ gchar *path, *str; ++ ++ path = g_strdup_printf ("/tmp/packages.XXXXXX"); ++ fd = mkstemp (path); ++ ++ while (*packages) ++ { ++ str = g_strdup_printf ("%s\ti\n", *packages); ++ write (fd, str, strlen (str)); ++ g_free (str); ++ packages++; ++ } ++ ++ close (fd); ++ return path; ++} ++ ++static gchar* ++get_synaptic_command_line (GtkWindow *window, ++ const gchar *path) ++{ ++ gchar *synaptic_path, *command; ++ ++ synaptic_path = g_find_program_in_path ("synaptic"); ++ command = g_strdup_printf ("%s --hide-main-window --non-interactive " ++ "--set-selections-file %s --parent-window-id %d", ++ synaptic_path, path, GDK_WINDOW_XID (GTK_WIDGET (window)->window)); ++ g_free (synaptic_path); ++ return command; ++} ++ ++static gboolean ++spawn_synaptic (GtkWindow *window, ++ const gchar *path, ++ gint *child_pid) ++{ ++ gchar **argv; ++ GError *error = NULL; ++ gboolean retval = TRUE; ++ gint i = 0; ++ ++ argv = g_new0 (gchar*, 6); ++ argv[i++] = g_find_program_in_path ("gksu"); ++ argv[i++] = g_strdup ("--desktop"); ++ argv[i++] = g_strdup ("/usr/share/applications/synaptic.desktop"); ++ argv[i++] = g_strdup ("--disable-grab"); ++ argv[i++] = get_synaptic_command_line (window, path); ++ argv[i++] = NULL; ++ ++ if (!gdk_spawn_on_screen (gtk_window_get_screen (window), ++ NULL, argv, NULL, ++ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, ++ NULL, NULL, child_pid, &error)) ++ { ++ //show_error_dialog (window, (error) ? error->message : ""); ++ fprintf(stderr, "synaptic spawn failed: %s", (error) ? error->message : ""); ++ g_error_free (error); ++ retval = FALSE; ++ } ++ ++ g_strfreev (argv); ++ ++ return retval; ++} ++ ++gboolean ++on_wait_timeout (gpointer data) ++{ ++ gint pid, status; ++ ++ pid = GPOINTER_TO_INT (data); ++ ++ if (waitpid (pid, &status, WNOHANG) > 0) ++ { ++ gtk_main_quit (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gboolean ++wait_for_synaptic (GtkWindow *window, gint pid) ++{ ++ GdkCursor *cursor; ++ gint timer; ++ ++ cursor = gdk_cursor_new (GDK_WATCH); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); ++ gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE); ++ ++ /* wait here a bit until the process has exited */ ++ timer = g_timeout_add (500, on_wait_timeout, GINT_TO_POINTER (pid)); ++ gtk_main (); ++ ++ g_source_remove (timer); ++ gtk_widget_set_sensitive (GTK_WIDGET (window), TRUE); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); ++ ++ gdk_cursor_unref (cursor); ++ ++ return g_file_test ("/usr/sbin/smbd", G_FILE_TEST_IS_EXECUTABLE); ++} ++ ++static gboolean ++run_synaptic (GtkWidget* dialog) ++{ ++ pid_t pid; ++ gboolean retval = FALSE; ++ gint response; ++ GtkWidget* dialog_ask_retry; ++ ++ gchar **packages = g_new0 (gchar*, 3); ++ packages[0] = g_strdup("samba"); ++ packages[1] = g_strdup("libpam-smbpass"); ++ packages[2] = NULL; ++ gchar *path = create_temp_file (packages); ++ ++ while (1) ++ { ++ if (spawn_synaptic (dialog, path, &pid)) ++ if (retval = wait_for_synaptic (dialog, pid)) ++ break; ++ ++ dialog_ask_retry = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_CLOSE, ++ _("Sharing service installation failed")); ++ gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG(dialog_ask_retry), ++ _("Sharing service installation has failed." ++ "Would you like to retry the installation?")); ++ gtk_dialog_add_button (GTK_DIALOG(dialog_ask_retry), _("Retry"), GTK_RESPONSE_OK); ++ ++ response = gtk_dialog_run (GTK_DIALOG(dialog_ask_retry)); ++ gtk_widget_destroy (dialog_ask_retry); ++ ++ if (response != GTK_RESPONSE_OK) ++ { ++ retval = FALSE; ++ break; ++ } ++ } ++ ++ unlink (path); ++ g_free (path); ++ g_strfreev (packages); ++ ++ return retval; ++} ++ ++static gboolean ++check_and_install_samba (PropertyPage *page) ++{ ++ GtkWidget *dialog; ++ GtkWidget *dialog_ask_restart; ++ GtkWidget *nfs_check, *smb_check; ++ gint response; ++ gboolean retval = FALSE; ++ ++ // check if samba is available ++ if(g_file_test("/usr/sbin/smbd", G_FILE_TEST_IS_EXECUTABLE)) ++ return TRUE; ++ ++ // if not, ask to install it ++ dialog = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_CLOSE, ++ _("Sharing service is not installed")); ++ gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), ++ _("You need to install the Windows networks " ++ "sharing service in order to share your folders.")); ++ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Install service"), GTK_RESPONSE_OK); ++ ++ response = gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_hide (dialog); ++ ++ // run synaptic ++ if (response == GTK_RESPONSE_OK) { ++ response = NULL; ++ retval = run_synaptic (dialog); ++ // ask for reloading session to make libpam-smbpass create NTLM password hash ++ if (retval == TRUE) { ++ dialog_ask_restart = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_CLOSE, ++ _("Restart your session")); ++ gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog_ask_restart), ++ _("You need to restart your session in order to enable sharing.")); ++ gtk_dialog_add_button (GTK_DIALOG (dialog_ask_restart), _("Restart session"), GTK_RESPONSE_OK); ++ ++ response = gtk_dialog_run (GTK_DIALOG (dialog_ask_restart)); ++ gtk_widget_destroy (dialog_ask_restart); ++ } ++ ++ } ++ gtk_widget_destroy (dialog); ++ ++ // Tell gnome-session to save and exit the session ++ if (response == GTK_RESPONSE_OK) { ++ gnome_client_request_save (gnome_master_client(), ++ GNOME_SAVE_GLOBAL, ++ TRUE, ++ GNOME_INTERACT_ANY, ++ TRUE, ++ TRUE); ++ } ++ ++ return retval; ++} ++ + /*--------------------------------------------------------------------------*/ + static void + on_checkbutton_share_folder_toggled (GtkToggleButton *togglebutton, +@@ -582,6 +804,12 @@ + + page = user_data; + ++ if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->checkbutton_share_folder)) && !check_and_install_samba (page)) ++ { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->checkbutton_share_folder), FALSE); ++ return; ++ } ++ + property_page_check_sensitivity (page); + } + --- nautilus-share-0.7.2.orig/debian/patches/06_fix-validation.patch +++ nautilus-share-0.7.2/debian/patches/06_fix-validation.patch @@ -0,0 +1,16 @@ +Index: nautilus-share/src/nautilus-share.c +=================================================================== +--- nautilus-share.orig/src/nautilus-share.c 2009-03-21 02:42:29.000000000 +0800 ++++ nautilus-share/src/nautilus-share.c 2009-03-21 02:44:38.000000000 +0800 +@@ -507,8 +507,11 @@ + return FALSE; + } + else ++ { ++ property_page_set_normal (page); + return TRUE; + } ++ } + } + + static void --- nautilus-share-0.7.2.orig/debian/patches/series +++ nautilus-share-0.7.2/debian/patches/series @@ -0,0 +1,7 @@ +01_fix_install_dir.patch +02_install_missing_samba.patch +03_no_verbose_logging.patch +04_use_correct_icon.patch +05_dependencies.patch +06_fix-validation.patch +99_ltmain_as-needed.patch --- nautilus-share-0.7.2.orig/debian/patches/01_fix_install_dir.patch +++ nautilus-share-0.7.2/debian/patches/01_fix_install_dir.patch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_fix_install_dir.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +Index: nautilus-share/src/Makefile.am +=================================================================== +--- nautilus-share.orig/src/Makefile.am 2009-03-17 20:50:37.000000000 +0800 ++++ nautilus-share/src/Makefile.am 2009-03-17 20:54:52.000000000 +0800 +@@ -11,7 +11,7 @@ + $(GLIB_CFLAGS) + + # FIXME: get this from the .pc file +-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0 ++nautilus_extensiondir=$(shell pkg-config --variable=extensiondir libnautilus-extension) + + nautilus_extension_LTLIBRARIES=libnautilus-share.la + +Index: nautilus-share/src/Makefile.in +=================================================================== +--- nautilus-share.orig/src/Makefile.in 2009-03-17 20:50:37.000000000 +0800 ++++ nautilus-share/src/Makefile.in 2009-03-17 20:52:57.000000000 +0800 +@@ -245,7 +245,7 @@ + + + # FIXME: get this from the .pc file +-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0 ++nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0 + nautilus_extension_LTLIBRARIES = libnautilus-share.la + libnautilus_share_la_SOURCES = \ + nautilus-share.c \ --- nautilus-share-0.7.2.orig/debian/patches/99_ltmain_as-needed.patch +++ nautilus-share-0.7.2/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,32 @@ +Index: nautilus-share/ltmain.sh +=================================================================== +--- nautilus-share.orig/ltmain.sh 2009-03-18 00:26:29.000000000 +0800 ++++ nautilus-share/ltmain.sh 2009-03-18 00:26:32.000000000 +0800 +@@ -1794,6 +1794,11 @@ + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2137,6 +2142,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- nautilus-share-0.7.2.orig/debian/patches/03_no_verbose_logging.patch +++ nautilus-share-0.7.2/debian/patches/03_no_verbose_logging.patch @@ -0,0 +1,163 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_no_verbose_logging.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +Index: nautilus-share/src/shares.c +=================================================================== +--- nautilus-share.orig/src/shares.c 2009-03-17 21:17:14.000000000 +0800 ++++ nautilus-share/src/shares.c 2009-03-17 21:55:54.000000000 +0800 +@@ -78,7 +78,7 @@ + + stdout_contents = NULL; + stderr_contents = NULL; +- ++ /* + { + char **p; + +@@ -89,7 +89,7 @@ + + g_message ("end of spawn args; SPAWNING\n"); + } +- ++ */ + real_error = NULL; + retval = g_spawn_sync (NULL, /* cwd */ + real_argv, +@@ -102,7 +102,7 @@ + &exit_status, + &real_error); + +- g_message ("returned from spawn: %s: %s", retval ? "SUCCESS" : "FAIL", retval ? "" : real_error->message); ++ /* g_message ("returned from spawn: %s: %s", retval ? "SUCCESS" : "FAIL", retval ? "" : real_error->message); */ + + if (!retval) { + g_propagate_error (error, real_error); +@@ -141,7 +141,7 @@ + + exit_code = WEXITSTATUS (exit_status); + +- g_message ("exit code %d", exit_code); ++ /* g_message ("exit code %d", exit_code); */ + if (exit_code != 0) { + char *str; + char *message; +@@ -170,7 +170,7 @@ + } + + if (ret_key_file) { +- g_message ("caller wants GKeyFile"); ++ /* g_message ("caller wants GKeyFile"); */ + + *ret_key_file = NULL; + +@@ -205,14 +205,14 @@ + } else + retval = TRUE; + +- g_message ("success from calling net usershare and parsing its output"); ++ /* g_message ("success from calling net usershare and parsing its output"); */ + + out: + g_free (real_argv); + g_free (stdout_contents); + g_free (stderr_contents); + +- g_message ("------------------------------------------"); ++ /* g_message ("------------------------------------------"); */ + + return retval; + } +@@ -472,7 +472,7 @@ + + new_timestamp = time (NULL); + if (new_timestamp - refresh_timestamp > TIMESTAMP_THRESHOLD) { +- g_message ("REFRESHING SHARES"); ++ /* g_message ("REFRESHING SHARES"); */ + retval = refresh_shares (error); + } else + retval = TRUE; +@@ -606,7 +606,7 @@ + gboolean supports_success; + gboolean supports_guest_ok; + +- g_message ("add_share() start"); ++ /* g_message ("add_share() start"); */ + + if (throw_error_on_add) { + g_set_error (error, +@@ -646,7 +646,7 @@ + copy = copy_share_info (info); + add_share_info_to_hashes (copy); + +- g_message ("add_share() end SUCCESS"); ++ /* g_message ("add_share() end SUCCESS"); */ + + return TRUE; + } +@@ -658,7 +658,7 @@ + char *argv[2]; + GError *real_error; + +- g_message ("remove_share() start"); ++ /* g_message ("remove_share() start"); */ + + if (throw_error_on_remove) { + g_set_error (error, +@@ -699,7 +699,7 @@ + remove_share_info_from_hashes (old_info); + shares_free_share_info (old_info); + +- g_message ("remove_share() end SUCCESS"); ++ /* g_message ("remove_share() end SUCCESS"); */ + + return TRUE; + } +@@ -709,11 +709,11 @@ + { + ShareInfo *old_info; + +- g_message ("modify_share() start"); ++ /* g_message ("modify_share() start"); */ + + old_info = lookup_share_by_path (old_path); + if (old_info == NULL) { +- g_message ("modify_share() end; calling add_share() instead"); ++ /*g_message ("modify_share() end; calling add_share() instead");*/ + return add_share (info, error); + } + +@@ -748,7 +748,7 @@ + return FALSE; + } + +- g_message ("modify_share() end: will call add_share() with the new share info"); ++ /* g_message ("modify_share() end: will call add_share() with the new share info"); */ + return add_share (info, error); + } + +Index: nautilus-share/src/nautilus-share.c +=================================================================== +--- nautilus-share.orig/src/nautilus-share.c 2009-03-17 21:57:00.000000000 +0800 ++++ nautilus-share/src/nautilus-share.c 2009-03-17 21:57:28.000000000 +0800 +@@ -1432,7 +1432,7 @@ + void + nautilus_module_initialize (GTypeModule *module) + { +- g_print ("Initializing nautilus-share extension\n"); ++ /*g_print ("Initializing nautilus-share extension\n");*/ + + bindtextdomain("nautilus-share", NAUTILUS_SHARE_LOCALEDIR); + bind_textdomain_codeset("nautilus-share", "UTF-8"); +@@ -1444,7 +1444,7 @@ + void + nautilus_module_shutdown (void) + { +- g_print ("Shutting down nautilus-share extension\n"); ++ /*g_print ("Shutting down nautilus-share extension\n");*/ + /* FIXME freeing */ + } + --- nautilus-share-0.7.2.orig/debian/patches/04_use_correct_icon.patch +++ nautilus-share-0.7.2/debian/patches/04_use_correct_icon.patch @@ -0,0 +1,78 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_use_correct_icon.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +Index: nautilus-share/src/nautilus-share.c +=================================================================== +--- nautilus-share.orig/src/nautilus-share.c 2009-03-19 23:55:36.000000000 +0800 ++++ nautilus-share/src/nautilus-share.c 2009-03-19 23:55:36.000000000 +0800 +@@ -1328,7 +1328,7 @@ + item = nautilus_menu_item_new ("NautilusShare::share", + _("Sharing Options"), + _("Share this Folder"), +- "stock_shared-by-me"); ++ "folder-remote"); + g_signal_connect (item, "activate", + G_CALLBACK (share_this_folder_callback), + fileinfo); +Index: nautilus-share/interfaces/share-dialog.glade.in +=================================================================== +--- nautilus-share.orig/interfaces/share-dialog.glade.in 2009-03-19 23:52:07.000000000 +0800 ++++ nautilus-share/interfaces/share-dialog.glade.in 2009-03-19 23:55:36.000000000 +0800 +@@ -36,7 +36,8 @@ + + + True +- share-logo.png ++ 64 ++ folder-remote + 0.5 + 0.5 + 0 +Index: nautilus-share/Makefile.am +=================================================================== +--- nautilus-share.orig/Makefile.am 2009-03-19 23:56:03.000000000 +0800 ++++ nautilus-share/Makefile.am 2009-03-19 23:56:15.000000000 +0800 +@@ -1,2 +1,2 @@ +-SUBDIRS = src pixmaps interfaces po ++SUBDIRS = src interfaces po + EXTRA_DIST = intltool-update.in intltool-extract.in intltool-merge.in +Index: nautilus-share/Makefile.in +=================================================================== +--- nautilus-share.orig/Makefile.in 2009-03-19 23:56:21.000000000 +0800 ++++ nautilus-share/Makefile.in 2009-03-19 23:56:54.000000000 +0800 +@@ -226,7 +226,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = src pixmaps interfaces po ++SUBDIRS = src interfaces po + EXTRA_DIST = intltool-update.in intltool-extract.in intltool-merge.in + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive +Index: nautilus-share/interfaces/Makefile.am +=================================================================== +--- nautilus-share.orig/interfaces/Makefile.am 2009-03-19 23:57:09.000000000 +0800 ++++ nautilus-share/interfaces/Makefile.am 2009-03-19 23:57:23.000000000 +0800 +@@ -10,4 +10,4 @@ + CLEANFILES = $(interfaces) + + $(interfaces): %.glade: %.glade.in +- $(top_srcdir)/interfaces/fix.pl $(pixmapsdir) < $< > $@ ++ cp $< $@ +Index: nautilus-share/interfaces/Makefile.in +=================================================================== +--- nautilus-share.orig/interfaces/Makefile.in 2009-03-19 23:57:09.000000000 +0800 ++++ nautilus-share/interfaces/Makefile.in 2009-03-19 23:57:44.000000000 +0800 +@@ -404,7 +404,7 @@ + + + $(interfaces): %.glade: %.glade.in +- $(top_srcdir)/interfaces/fix.pl $(pixmapsdir) < $< > $@ ++ cp $< $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: --- nautilus-share-0.7.2.orig/debian/patches/05_dependencies.patch +++ nautilus-share-0.7.2/debian/patches/05_dependencies.patch @@ -0,0 +1,89 @@ +Index: nautilus-share/configure +=================================================================== +--- nautilus-share.orig/configure 2009-03-28 21:31:43.000000000 +0800 ++++ nautilus-share/configure 2009-03-28 21:34:04.000000000 +0800 +@@ -20683,12 +20683,12 @@ + pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED eel-2.0 >= \$EEL_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED" 2>/dev/null` ++ pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20701,12 +20701,12 @@ + pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED eel-2.0 >= \$EEL_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED" 2>/dev/null` ++ pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20725,14 +20725,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED"` ++ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0"` + else +- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED"` ++ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$NAUTILUS_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0) were not met: + + $NAUTILUS_PKG_ERRORS + +@@ -20743,7 +20743,7 @@ + and NAUTILUS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0) were not met: + + $NAUTILUS_PKG_ERRORS + +Index: nautilus-share/configure.in +=================================================================== +--- nautilus-share.orig/configure.in 2009-03-28 21:31:43.000000000 +0800 ++++ nautilus-share/configure.in 2009-03-28 21:34:04.000000000 +0800 +@@ -28,7 +28,7 @@ + AC_MSG_ERROR(you need to have pkgconfig installed !) + fi + +-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED) ++PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED libgnomeui-2.0 gnome-vfs-2.0) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) + PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= $LIBGLADE_REQUIRED) + +Index: nautilus-share/src/nautilus-share.c +=================================================================== +--- nautilus-share.orig/src/nautilus-share.c 2009-03-28 21:34:20.000000000 +0800 ++++ nautilus-share/src/nautilus-share.c 2009-03-28 21:34:31.000000000 +0800 +@@ -35,8 +35,6 @@ + #include + #include "nautilus-share.h" + +-#include +- + #include + + #include