--- gnome-user-share-2.25.92.orig/gnome-user-share.packaging.diff
+++ gnome-user-share-2.25.92/gnome-user-share.packaging.diff
@@ -0,0 +1,207 @@
+diff -ruN gnome-user-share-0.40/debian/changelog gnome-user-share-2.25.92/debian/changelog
+--- gnome-user-share-0.40/debian/changelog	2009-03-03 11:52:21.000000000 -0500
++++ gnome-user-share-2.25.92/debian/changelog	2009-03-03 12:52:49.000000000 -0500
+@@ -1,3 +1,30 @@
++gnome-user-share (2.25.92-0ubuntu1) jaunty; urgency=low
++
++  [ Ken VanDine ]
++  * New upstream release (LP: #337270)
++    - Update Swedish help manual, add Greek manual,
++    - Fix httpd configuration file
++    - Use mod_dnssd 0.6 to export the user TXT record, necessary to work
++      with the latest gvfs
++    - Check for httpd version and binary location at run-time, rather than
++      compile-time
++    - Documentation updates
++    - Use Apache's mod_dnssd module instead of doing the work ourselves
++    - Refuse to run as root, so as to avoid sensitive files being shared
++    - Add end-user documentation, and UI changes to match
++    - Make it possible for build daemons to build without Apache installed
++    - Port to BlueZ 4.x API
++    - UI fixes in the preferences dialogue
++    - Fix web file sharing on some distributions
++  * debian/patches/02_bluez4-update.patch removed, merged upstream
++  * Specify httpd binary instead of version
++
++  [ Daniel Holbach ]
++  * debian/control.in: added gnome-doc-utils (>= 0.3.2), rarian-compat to 
++    Build-Depends.
++
++ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 03 Mar 2009 10:58:43 -0500
++
+ gnome-user-share (0.40-0ubuntu1) intrepid; urgency=low
+ 
+   * New Upstream Release (LP: #280715):
+diff -ruN gnome-user-share-0.40/debian/control gnome-user-share-2.25.92/debian/control
+--- gnome-user-share-0.40/debian/control	2009-03-03 11:52:21.000000000 -0500
++++ gnome-user-share-2.25.92/debian/control	2009-03-03 12:53:01.000000000 -0500
+@@ -4,12 +4,12 @@
+ Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+ XSBC-Original-Maintainer: Sebastian Dröge <slomo@debian.org>
+ Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Sebastian Dröge <slomo@debian.org>
+-Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libglib2.0-dev (>= 2.15.2), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.4.0), libgconf2-dev, libavahi-client-dev (>= 0.6), libavahi-glib-dev (>= 0.6), libdbus-1-dev (>= 1.1.1), libdbus-glib-1-dev, libxml-parser-perl, libnotify-dev
++Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libglib2.0-dev (>= 2.15.2), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.4.0), libgconf2-dev, libavahi-client-dev (>= 0.6), libavahi-glib-dev (>= 0.6), libdbus-1-dev (>= 1.1.1), libdbus-glib-1-dev, libxml-parser-perl, libnotify-dev, gnome-doc-utils (>= 0.3.2), rarian-compat
+ Standards-Version: 3.7.3
+ 
+ Package: gnome-user-share
+ Architecture: any
+-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.2), apache2 (<< 2.3), avahi-daemon, obex-data-server (>= 0.3), bluez-gnome
++Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.2), apache2 (<< 2.3), libapache2-mod-dnssd (>=0.6), avahi-daemon, obex-data-server (>= 0.3), bluez-gnome
+ Description: User level public file sharing via WebDAV or ObexFTP
+  gnome-user-share is a small package that allows easy user-level file sharing
+  via WebDAV or ObexFTP. The shared files are announced on the network
+diff -ruN gnome-user-share-0.40/debian/control.in gnome-user-share-2.25.92/debian/control.in
+--- gnome-user-share-0.40/debian/control.in	2009-03-03 11:52:21.000000000 -0500
++++ gnome-user-share-2.25.92/debian/control.in	2009-03-03 12:49:10.000000000 -0500
+@@ -4,12 +4,12 @@
+ Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+ XSBC-Original-Maintainer: Sebastian Dröge <slomo@debian.org>
+ Uploaders: @GNOME_TEAM@
+-Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libglib2.0-dev (>= 2.15.2), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.4.0), libgconf2-dev, libavahi-client-dev (>= 0.6), libavahi-glib-dev (>= 0.6), libdbus-1-dev (>= 1.1.1), libdbus-glib-1-dev, libxml-parser-perl, libnotify-dev
++Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libglib2.0-dev (>= 2.15.2), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.4.0), libgconf2-dev, libavahi-client-dev (>= 0.6), libavahi-glib-dev (>= 0.6), libdbus-1-dev (>= 1.1.1), libdbus-glib-1-dev, libxml-parser-perl, libnotify-dev, gnome-doc-utils (>= 0.3.2), rarian-compat
+ Standards-Version: 3.7.3
+ 
+ Package: gnome-user-share
+ Architecture: any
+-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.2), apache2 (<< 2.3), avahi-daemon, obex-data-server (>= 0.3), bluez-gnome
++Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.2), apache2 (<< 2.3), libapache2-mod-dnssd (>=0.6), avahi-daemon, obex-data-server (>= 0.3), bluez-gnome
+ Description: User level public file sharing via WebDAV or ObexFTP
+  gnome-user-share is a small package that allows easy user-level file sharing
+  via WebDAV or ObexFTP. The shared files are announced on the network
+diff -ruN gnome-user-share-0.40/debian/patches/02_bluez4-update.patch gnome-user-share-2.25.92/debian/patches/02_bluez4-update.patch
+--- gnome-user-share-0.40/debian/patches/02_bluez4-update.patch	2009-03-03 11:52:21.000000000 -0500
++++ gnome-user-share-2.25.92/debian/patches/02_bluez4-update.patch	1969-12-31 19:00:00.000000000 -0500
+@@ -1,118 +0,0 @@
+-Index: src/obexpush.c
+-===================================================================
+---- src/obexpush.c	(revision 259)
+-+++ src/obexpush.c	(working copy)
+-@@ -184,7 +184,7 @@
+- 	DBusGConnection *connection;
+- 	DBusGProxy *manager;
+- 	GError *error = NULL;
+--	char **adapters;
+-+	GPtrArray *adapters;
+- 	gboolean retval = FALSE;
+- 	guint i;
+- 
+-@@ -193,52 +193,74 @@
+- 		return FALSE;
+- 
+- 	manager = dbus_g_proxy_new_for_name (connection, "org.bluez",
+--					     "/org/bluez", "org.bluez.Manager");
+-+					     "/", "org.bluez.Manager");
+- 	if (manager == NULL) {
+- 		dbus_g_connection_unref (connection);
+- 		return FALSE;
+- 	}
+- 
+--	if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, G_TYPE_STRV, &adapters, G_TYPE_INVALID) == FALSE) {
+-+	if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters, G_TYPE_INVALID) == FALSE) {
+- 		g_object_unref (manager);
+- 		dbus_g_connection_unref (connection);
+- 		return FALSE;
+- 	}
+- 
+--	for (i = 0; adapters[i] != NULL; i++) {
+--		DBusGProxy *adapter;
+--		gboolean bonded, trusted;
+-+	for (i = 0; i < adapters->len; i++) {
+-+		DBusGProxy *adapter, *device;
+-+		char *device_path;
+-+		GHashTable *props;
+- 
+--		g_message ("checking adapter %s", adapters[i]);
+-+		g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
+- 
+- 		adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
+--						    adapters[i], "org.bluez.Adapter");
+--		if (dbus_g_proxy_call (adapter, "HasBonding", NULL,
+--				      G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
+--				      G_TYPE_BOOLEAN, &bonded, G_TYPE_INVALID) != FALSE) {
+-+						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+-+
+-+		if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
+-+				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
+-+				       DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) == FALSE)
+-+		{
+-+			g_object_unref (adapter);
+-+			continue;
+-+		}
+-+
+-+		device = dbus_g_proxy_new_for_name (connection, "org.bluez", device_path, "org.bluez.Device");
+-+
+-+		if (dbus_g_proxy_call (device, "GetProperties", NULL,
+-+				       G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
+-+				       &props, G_TYPE_INVALID) != FALSE)
+-+		{
+-+			GValue *value;
+-+			gboolean bonded, trusted;
+-+
+-+			value = g_hash_table_lookup (props, "Paired");
+-+			bonded = g_value_get_boolean (value);
+- 			g_message ("%s is %s", bdaddr, bonded ? "bonded" : "not bonded");
+--			if (bonded != FALSE) {
+-+
+-+			if (bonded) {
+-+				g_hash_table_destroy (props);
+-+				g_object_unref (device);
+-+				g_object_unref (adapter);
+- 				retval = TRUE;
+--				g_object_unref (adapter);
+- 				break;
+- 			}
+--		}
+--		if (accept_setting == ACCEPT_BONDED_AND_TRUSTED &&
+--		    dbus_g_proxy_call (adapter, "IsTrusted", NULL,
+--				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
+--				       G_TYPE_BOOLEAN, &trusted, G_TYPE_INVALID) != FALSE) {
+-+			value = g_hash_table_lookup (props, "Trusted");
+-+			trusted = g_value_get_boolean (value);
+- 			g_message ("%s is %s", bdaddr, trusted ? "trusted" : "not trusted");
+--			if (trusted != FALSE) {
+-+
+-+			if (accept_setting == ACCEPT_BONDED_AND_TRUSTED
+-+			    && trusted) {
+-+				g_hash_table_destroy (props);
+-+				g_object_unref (device);
+-+				g_object_unref (adapter);
+- 				retval = TRUE;
+--				g_object_unref (adapter);
+- 				break;
+- 			}
+- 		}
+--
+- 		g_object_unref(adapter);
+- 	}
+- 
+--	g_strfreev(adapters);
+-+	g_ptr_array_free (adapters, TRUE);
+-+
+- 	g_object_unref(manager);
+- 	dbus_g_connection_unref(connection);
+- 
+-@@ -351,7 +373,7 @@
+- cancelled_cb (DBusGProxy *session,
+- 	      gpointer user_data)
+- {
+--	//FIXME implement properly
+-+	//FIXME implement properly, we never actually finished the transfer
+- 	g_message ("transfered was cancelled by the sender");
+- 	transfer_completed_cb (session, user_data);
+- }
+diff -ruN gnome-user-share-0.40/debian/rules gnome-user-share-2.25.92/debian/rules
+--- gnome-user-share-0.40/debian/rules	2009-03-03 11:52:21.000000000 -0500
++++ gnome-user-share-2.25.92/debian/rules	2009-03-03 12:29:51.000000000 -0500
+@@ -8,10 +8,7 @@
+ 
+ LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+ DEB_CONFIGURE_SCRIPT_ENV += HTTPD="/usr/sbin/apache2"
+-DEB_CONFIGURE_EXTRA_FLAGS += --with-httpd-version=2.2 --with-modules-path=/usr/lib/apache2/modules/
+-
+-clean::
+-	rm -f data/dav_user_2.2.conf
++DEB_CONFIGURE_EXTRA_FLAGS += --with-httpd=apache2 --with-modules-path=/usr/lib/apache2/modules/
+ 
+ install/gnome-user-share::
+ 	rm -f debian/gnome-user-share/usr/share/gnome-user-share/dav_user_2.0.conf
--- gnome-user-share-2.25.92.orig/debian/compat
+++ gnome-user-share-2.25.92/debian/compat
@@ -0,0 +1 @@
+5
--- gnome-user-share-2.25.92.orig/debian/copyright
+++ gnome-user-share-2.25.92/debian/copyright
@@ -0,0 +1,42 @@
+This package was debianized by Jeff Waugh <jdub@perkypants.org> on
+Fri, 26 Nov 2004 22:40:10 +1100.
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/
+
+Upstream Authors:
+  Alexander Larsson <alexl@redhat.com>
+  Bastien Nocera <bnocera@redhat.com>
+
+Copyright:
+Copyright (C) 2004 Red Hat, Inc.
+
+License:
+
+ 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 program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+For md5.[ch]:
+ This code implements the MD5 message-digest algorithm.
+ The algorithm is due to Ron Rivest.  This code was
+ written by Colin Plumb in 1993, no copyright is claimed.
+ This code is in the public domain; do with it what you wish.
+
+ Equivalent code is available from RSA Data Security, Inc.
+ This code has been tested against that, and is equivalent,
+ except that you don't need to include two pages of legalese
+ with every copy.
+
--- gnome-user-share-2.25.92.orig/debian/rules
+++ gnome-user-share-2.25.92/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DEB_CONFIGURE_SCRIPT_ENV += HTTPD="/usr/sbin/apache2"
+DEB_CONFIGURE_EXTRA_FLAGS += --with-httpd=apache2 --with-modules-path=/usr/lib/apache2/modules/
+
+install/gnome-user-share::
+	rm -f debian/gnome-user-share/usr/share/gnome-user-share/dav_user_2.0.conf
+
--- gnome-user-share-2.25.92.orig/debian/watch
+++ gnome-user-share-2.25.92/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/gnome/sources/gnome-user-share/([\d\.]+)/gnome-user-share-([\d\.]+)\.tar\.gz debian uupdate
--- gnome-user-share-2.25.92.orig/debian/changelog
+++ gnome-user-share-2.25.92/debian/changelog
@@ -0,0 +1,291 @@
+gnome-user-share (2.25.92-0ubuntu2netbook0buffalo2) buffalo; urgency=low
+
+  * debian/patches/14_fix_session_race.patch
+    - simplify dbus code to listen for ActiveChanged on ConsoleKit.Session
+      to prevent race causing obexpush and obexftp failure on hibernate/
+      thaw and suspend/resume. LP: #365866
+
+ -- Bill Filler <bill.filler@canonical.com>  Wed, 29 Apr 2009 16:14:45 -0400
+
+gnome-user-share (2.25.92-0ubuntu2netbook0buffalo1) buffalo; urgency=low
+
+  * Backport latest gnome-user-share from jaunty to buffalo
+  * debian/control.in:
+    - Drop all avahi and apache dependencies.
+    - Add librarian-dev to Build-Depends
+  * debian/patches/10_drop_apache.patch:
+    - Hide apache preferences, leaving only Bluetooth ones
+  * debian/patches/12_dont_require_gtk_2_14.patch:
+    - Let source build with old gtk
+
+ -- Michael Terry <michael.terry@canonical.com>  Wed, 22 Apr 2009 14:50:26 -0400
+
+gnome-user-share (2.25.92-0ubuntu2) jaunty; urgency=low
+
+  * debian/patches/01_notification.patch
+    - Display an alert box instead of a notification for files 
+      recieved, thanks Cody Russell! (LP: #337352)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 07 Apr 2009 08:26:04 -0400
+
+gnome-user-share (2.25.92-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release (LP: #337270)
+    - Update Swedish help manual, add Greek manual,
+    - Fix httpd configuration file
+    - Use mod_dnssd 0.6 to export the user TXT record, necessary to work
+      with the latest gvfs
+    - Check for httpd version and binary location at run-time, rather than
+      compile-time
+    - Documentation updates
+    - Use Apache's mod_dnssd module instead of doing the work ourselves
+    - Refuse to run as root, so as to avoid sensitive files being shared
+    - Add end-user documentation, and UI changes to match
+    - Make it possible for build daemons to build without Apache installed
+    - Port to BlueZ 4.x API
+    - UI fixes in the preferences dialogue
+    - Fix web file sharing on some distributions
+  * debian/patches/02_bluez4-update.patch:
+    - removed, merged upstream
+  * debian/rules:
+    - Don't remove dav_user_2.2.conf in clean, it is needed for the build
+      and is not a generated file
+  * debian/control.in:
+    - Added a dependency on libapache2-mod-dnssd (>=0.6)
+  * Specify httpd binary instead of version
+
+  [ Daniel Holbach ]
+  * debian/control.in: added gnome-doc-utils (>= 0.3.2), rarian-compat to
+    Build-Depends.
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 03 Mar 2009 10:58:43 -0500
+
+gnome-user-share (0.40-0ubuntu1) intrepid; urgency=low
+
+  * New Upstream Release (LP: #280715):
+    - ConsoleKit support (only activate file sharing when session is active)
+    - Add Notification to reveal and open files received over Bluetooth
+    - Make the httpd configuration file support multiple Apache MPMs
+    - move the configuration to Freedesktop compliant location
+  * debian/control.in:
+    - Add libnotify-dev to Build-Depends
+  * debian/patches/01_apache-config.patch: dropped, applied upstream
+
+ -- Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>  Thu, 09 Oct 2008 13:41:45 +0200
+
+gnome-user-share (0.31-3ubuntu1) intrepid; urgency=low
+
+  * debian/patches/02_bluez4-update.patch: stolen from fedora to support bluez
+    4.x (LP: #274950)
+
+ -- Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>  Sat, 27 Sep 2008 18:35:22 +0200
+
+gnome-user-share (0.31-3) unstable; urgency=medium
+
+  * debian/preinst:
+    + Remove obsolete conffile.
+  * debian/01_apache-config.patch:
+    + Fix apache config even more.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 18 Apr 2008 12:42:37 +0200
+
+gnome-user-share (0.31-2) unstable; urgency=low
+
+  * debian/patches/01_apache-config.patch,
+    debian/rules:
+    + Fix the apache config and don't ship a config for apache 2.0, we only
+      support 2.2.
+
+ -- Sebastian Dröge <slomo@debian.org>  Thu, 10 Apr 2008 08:43:56 +0200
+
+gnome-user-share (0.31-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 07 Apr 2008 12:23:18 +0200
+
+gnome-user-share (0.30-1) unstable; urgency=low
+
+  * New upstream release:
+    + debian/control.in:
+      - Depend on obex-data-server and bluez-gnome for ObexFTP file sharing.
+      - Update description.
+    + debian/copyright:
+      - Add Bastien as second upstream author.
+    + debian/control.in:
+      - Remove glade from build dependencies.
+    + debian/patches/01_debianise-dav-user-conf.diff,
+      debian/rules:
+      - Use the new configure parameter now instead of patching.
+    + debian/patches/02_README.diff:
+      - Dropped, this is fixed upstream now.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 18 Mar 2008 02:17:30 +0100
+
+gnome-user-share (0.21-1) unstable; urgency=low
+
+  * New upstream release:
+    + debian/gnome-user-share-session.*,
+      debian/rules:
+      - Don't build our own starter, upstream provides one now.
+    + debian/control.in:
+      - Update build dependencies.
+      - Update Standards-Version to 3.7.3, no additional changes needed.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 14 Mar 2008 14:35:18 +0100
+
+gnome-user-share (0.11-3) unstable; urgency=low
+
+  * debian/control:
+    + Update to Standards-Version 3.7.3, no additional changes needed.
+  * debian/rules:
+    + Use LDFLAGS for linking the gnome-user-share-session helper too.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sun, 06 Jan 2008 19:52:14 +0100
+
+gnome-user-share (0.11-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 16 Apr 2007 01:43:08 +0200
+
+gnome-user-share (0.11-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/rules,
+    debian/control:
+    + Use gnome-pkg-tools to add the Gnome team to Uploaders
+    + Add get-orig-source target
+  * debian/patches/01_debianise-dav-user-conf.diff:
+    + Updated for new upstream version
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue,  6 Mar 2007 18:36:22 +0100
+
+gnome-user-share (0.10-4) unstable; urgency=medium
+
+  * Urgency medium because of RC bugfix. This should go to etch.
+  * debian/patches/01_debianise-dav-user-conf.diff:
+    + Also load the mime module to allow usage of the TypesConfig directive
+      (Closes: #411171)
+
+ -- Sebastian Dröge <slomo@debian.org>  Sun, 18 Feb 2007 11:10:21 +0100
+
+gnome-user-share (0.10-3) unstable; urgency=low
+
+  * debian/control:
+    + Only build-depend on libselinux-dev on Linux platforms (Closes: #402135)
+    + Updated to use my debian.org mail address
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon,  8 Jan 2007 08:27:54 +0100
+
+gnome-user-share (0.10-2) unstable; urgency=low
+
+  * Acknowledge NMU (Closes: #391259)
+  * debian/control,
+    debian/rules:
+    + Add versioned apache2 dependency back but require apache 2.2
+  * debian/control:
+    + Update Standards-Version to 3.7.2
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Tue, 17 Oct 2006 17:59:26 +0200
+
+gnome-user-share (0.10-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Don't use a versioned dependency on apache2 (Closes: #391259).
+
+ -- Luk Claes <luk@debian.org>  Sun, 15 Oct 2006 18:16:58 +0200
+
+gnome-user-share (0.10-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/patches/01_debianise-dav-user-conf.diff:
+    + Update for the new filenames and patch the apache 2.0 and 2.2 configs
+  * Depend on apache2 (>= 2.0) and (<< 2.1). We need to rebuild when apache
+    2.2 gets into Debian to get the correct config file link for apache
+    created.
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Wed, 19 Apr 2006 15:10:13 +0200
+
+gnome-user-share (0.9-4) unstable; urgency=low
+
+  * Add a autostart .desktop file and a small loader that loads
+    gnome-user-share when it was enabled in the capplet. This way
+    gnome-user-share is started again with the session when it was enabled
+    before.
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Sun,  2 Apr 2006 13:55:20 +0200
+
+gnome-user-share (0.9-3) unstable; urgency=low
+
+  * Added debian/watch
+  * Added README to the package and patch it to include informations about
+    avahi and improve the language a bit (02_README.diff) (Closes: #353180)
+  * Updated to debhelper compat version 5
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Thu, 23 Feb 2006 19:51:20 +0100
+
+gnome-user-share (0.9-2) unstable; urgency=low
+
+  * Upload to unstable
+  * Add libxt-dev to Build-Depends to fix the failed configure check for X
+  * Use --as-needed to get rid of unneeded dependencies
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Tue, 17 Jan 2006 23:00:03 +0100
+
+gnome-user-share (0.9-1) experimental; urgency=low
+
+  * New upstream release
+  * Adjusted Build-Depends for avahi 0.6
+  * Upload to Debian (Closes: #283088)
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Wed, 21 Dec 2005 19:18:04 +0100
+
+gnome-user-share (0.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Tue, 15 Nov 2005 23:23:48 +0100
+
+gnome-user-share (0.7-0ubuntu2) dapper; urgency=low
+
+  * Add new FSF address to the copyright file
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Thu, 10 Nov 2005 07:08:06 +0100
+
+gnome-user-share (0.7-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Use avahi instead of howl and added Build-Depends for it
+  * Made Build-Depends stricter
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Wed,  9 Nov 2005 12:02:33 +0100
+
+gnome-user-share (0.4-1) hoary; urgency=low
+
+  * New upstream release
+
+ -- Jeff Waugh <jeff.waugh@canonical.com>  Sat,  4 Dec 2004 00:05:19 +1100
+
+gnome-user-share (0.3-3) hoary; urgency=low
+
+  * debian/control:
+    - Build-Depend on libxt-dev, because autoconf looks for Xt to determine
+      if X is installed.
+  * debian/patches/01_debianise-dav-user-conf.diff:
+    - Only define Max/MinSpareServers and MaxClients when using prefork.
+
+ -- Jeff Waugh <jeff.waugh@canonical.com>  Sat, 27 Nov 2004 01:48:26 +1100
+
+gnome-user-share (0.3-2) hoary; urgency=low
+
+  * Build-Depend on libx11-dev, libice-dev, libsm-dev
+
+ -- Jeff Waugh <jeff.waugh@canonical.com>  Sat, 27 Nov 2004 00:06:14 +1100
+
+gnome-user-share (0.3-1) hoary; urgency=low
+
+  * Initial Release
+
+ -- Jeff Waugh <jdub@perkypants.org>  Tue, 01 Jun 2004 16:14:59 +1000
+
--- gnome-user-share-2.25.92.orig/debian/control.in
+++ gnome-user-share-2.25.92/debian/control.in
@@ -0,0 +1,16 @@
+Source: gnome-user-share
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sebastian Dröge <slomo@debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libglib2.0-dev (>= 2.15.2), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.4.0), libgconf2-dev, libdbus-1-dev (>= 1.1.1), libdbus-glib-1-dev, libxml-parser-perl, libnotify-dev, gnome-doc-utils (>= 0.3.2), rarian-compat, librarian-dev 
+Standards-Version: 3.7.3
+
+Package: gnome-user-share
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, obex-data-server (>= 0.3), bluez-gnome
+Description: User level public file sharing via WebDAV or ObexFTP
+ gnome-user-share is a small package that allows easy user-level file sharing
+ via WebDAV or ObexFTP. The shared files are announced on the network
+ by Avahi.
--- gnome-user-share-2.25.92.orig/debian/preinst
+++ gnome-user-share-2.25.92/debian/preinst
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+rm_conffile() {
+  PKGNAME="hal"
+  CONFFILE="$1"
+
+  if [ -e "$CONFFILE" ]; then
+   md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+   old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+   if [ "$md5sum" != "$old_md5sum" ]; then
+     echo "Obsolete conffile $CONFFILE has been modified by you."
+     echo "Saving as $CONFFILE.dpkg-bak ..."
+     mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+   else
+     echo "Removing obsolete conffile $CONFFILE ..."
+     rm -f "$CONFFILE"
+   fi
+ fi
+}
+
+case "$1" in
+  install|upgrade)
+    if dpkg --compare-versions "$2" le "0.31-3"; then
+      rm_conffile "/etc/xdg/autostart/gnome-user-share-session.desktop"
+    fi
+esac
+
+#DEBHELPER#
+
+exit 0
--- gnome-user-share-2.25.92.orig/debian/control
+++ gnome-user-share-2.25.92/debian/control
@@ -0,0 +1,16 @@
+Source: gnome-user-share
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sebastian Dröge <slomo@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Sebastian Dröge <slomo@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libglib2.0-dev (>= 2.15.2), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.4.0), libgconf2-dev, libdbus-1-dev (>= 1.1.1), libdbus-glib-1-dev, libxml-parser-perl, libnotify-dev, gnome-doc-utils (>= 0.3.2), rarian-compat, librarian-dev 
+Standards-Version: 3.7.3
+
+Package: gnome-user-share
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, obex-data-server (>= 0.3), bluez-gnome
+Description: User level public file sharing via WebDAV or ObexFTP
+ gnome-user-share is a small package that allows easy user-level file sharing
+ via WebDAV or ObexFTP. The shared files are announced on the network
+ by Avahi.
--- gnome-user-share-2.25.92.orig/debian/patches/01_notification.patch
+++ gnome-user-share-2.25.92/debian/patches/01_notification.patch
@@ -0,0 +1,284 @@
+# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gnome-user-share/+bug/337352
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578226
+# Description: Display an alert box instead of a notification for files 
+#              recieved
+=== modified file 'src/obexpush.c'
+--- old/src/obexpush.c	2009-03-25 23:56:27 +0000
++++ new/src/obexpush.c	2009-03-31 14:19:49 +0000
+@@ -67,52 +67,79 @@
+ }
+ 
+ static void
++launch_file_viewer (const gchar *file_uri)
++{
++	GdkAppLaunchContext *ctx = NULL;
++	GTimeVal val;
++
++	g_get_current_time (&val);
++
++#if GTK_CHECK_VERSION(2,14,0)
++	ctx = gdk_app_launch_context_new ();
++	gdk_app_launch_context_set_screen (ctx, gdk_screen_get_default ());
++	gdk_app_launch_context_set_timestamp (ctx, val.tv_sec);
++#endif
++
++	if (!g_app_info_launch_default_for_uri (file_uri,
++						G_APP_LAUNCH_CONTEXT (ctx),
++						NULL)) {
++		g_warning ("Failed to launch the file viewer\n");
++	}
++
++	if (ctx)
++		g_object_unref (ctx);
++}
++
++static void
++open_download_folder (const gchar *file_uri)
++{
++	GdkAppLaunchContext *ctx = NULL;
++	GTimeVal val;
++	GFile *file;
++	GFile *parent;
++	gchar *parent_uri;
++
++	g_get_current_time (&val);
++
++#if GTK_CHECK_VERSION(2,14,0)
++	ctx = gdk_app_launch_context_new ();
++	gdk_app_launch_context_set_screen (ctx, gdk_screen_get_default ());
++	gdk_app_launch_context_set_timestamp (ctx, val.tv_sec);
++#endif
++
++	file = g_file_new_for_uri (file_uri);
++	parent = g_file_get_parent (file);
++	parent_uri = g_file_get_uri (parent);
++
++	g_object_unref (file);
++	g_object_unref (parent);
++
++	if (!g_app_info_launch_default_for_uri (parent_uri,
++						G_APP_LAUNCH_CONTEXT (ctx),
++						NULL)) {
++		g_warning ("Failed to launch the file manager\n");
++	}
++
++	g_free (parent_uri);
++	if (ctx)
++		g_object_unref (ctx);
++}
++
++static void
+ notification_launch_action_on_file_cb (NotifyNotification *notification,
+ 				       const char *action,
+ 				       const char *file_uri)
+ {
+-	GdkScreen *screen;
+-	GAppLaunchContext *ctx;
+-	GTimeVal val;
+-
+ 	g_assert (action != NULL);
+ 
+-	g_get_current_time (&val);
+-
+-#if GTK_CHECK_VERSION(2,14,0)
+-	ctx = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ());
+-	screen = gdk_screen_get_default ();
+-	gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (ctx), screen);
+-	gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (ctx), val.tv_sec);
+-#else
+-	ctx = NULL;
+-	screen = NULL;
+-#endif
+-
+ 	/* We launch the file viewer for the file */
+ 	if (g_str_equal (action, "display") != FALSE) {
+-		if (g_app_info_launch_default_for_uri (file_uri, ctx, NULL) == FALSE) {
+-			g_warning ("Failed to launch the file viewer\n");
+-		}
++		launch_file_viewer (file_uri);
+ 	}
+ 
+ 	/* we open the Downloads folder */
+ 	if (g_str_equal (action, "reveal") != FALSE) {
+-		GFile *file;
+-		GFile *parent;
+-		gchar *parent_uri;
+-
+-		file = g_file_new_for_uri (file_uri);
+-		parent = g_file_get_parent (file);
+-		parent_uri = g_file_get_uri (parent);
+-		g_object_unref (file);
+-		g_object_unref (parent);
+-
+-		if (!g_app_info_launch_default_for_uri (parent_uri, ctx, NULL)) {
+-			g_warning ("Failed to launch the file manager\n");
+-		}
+-
+-		g_free (parent_uri);
++		open_download_folder (file_uri);
+ 	}
+ 
+ 	notify_notification_close (notification, NULL);
+@@ -120,11 +147,39 @@
+ 	 * will call the close callback */
+ }
+ 
++static gboolean
++supports_actions ()
++{
++	static gboolean supports_actions = FALSE;
++	static gboolean have_checked = FALSE;
++
++	if (!have_checked) {
++		GList *caps = NULL;
++		GList *c;
++
++		have_checked = TRUE;
++
++		caps = notify_get_server_caps ();
++		if (caps != NULL) {
++			for (c = caps; c != NULL; c = c->next) {
++				if (strcmp ((char*)c->data, "actions") == 0) {
++					supports_actions = TRUE;
++					break;
++				}
++			}
++
++			g_list_foreach (caps, (GFunc) g_free, NULL);
++			g_list_free (caps);
++		}
++	}
++
++	return supports_actions;
++}
++
+ static void
+ show_notification (const char *filename)
+ {
+-	char *file_uri, *notification_text, *display, *mime_type;
+-	NotifyNotification *notification;
++	char *file_uri, *display, *mime_type;
+ 	GAppInfo *app;
+ 
+ 	file_uri = g_filename_to_uri (filename, NULL, NULL);
+@@ -134,37 +189,91 @@
+ 	}
+ 
+ 	display = g_filename_display_basename (filename);
+-	/* Translators: %s is the name of the filename received */
+-	notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display);
+-	g_free (display);
+-	notification = notify_notification_new_with_status_icon (_("You received a file"),
+-								 notification_text,
+-								 "dialog-information",
+-								 GTK_STATUS_ICON (statusicon));
+-
+-	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+-
+ 	mime_type = g_content_type_guess (filename, NULL, 0, NULL);
+ 	app = g_app_info_get_default_for_type (mime_type, FALSE);
+-	if (app != NULL) {
+-		/* FIXME duplicate the uri, otherwise libnotify crashes */
+-		char *uri;
++
++	if (supports_actions ()) {
++		NotifyNotification *notification;
++		gchar *notification_text;
++
++		/* Translators: %s is the name of the filename received */
++		notification_text = g_strdup_printf(_("You received “%s” via Bluetooth"), display);
++		notification = notify_notification_new_with_status_icon (_("You received a file"),
++									 notification_text,
++									 "dialog-information",
++									 GTK_STATUS_ICON (statusicon));
++
++		notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
++
++		if (app != NULL) {
++			/* FIXME duplicate the uri, otherwise libnotify crashes */
++			char *uri;
++			uri = g_strdup (file_uri);
++			notify_notification_add_action (notification, "display", _("Open File"),
++							(NotifyActionCallback) notification_launch_action_on_file_cb,
++							(gpointer) uri, (GFreeFunc) g_free);
++		}
++		notify_notification_add_action (notification, "reveal", _("Reveal File"),
++						(NotifyActionCallback) notification_launch_action_on_file_cb,
++						(gpointer) file_uri, (GFreeFunc) g_free);
++
++		g_signal_connect (G_OBJECT (notification), "closed", G_CALLBACK (on_close_notification), notification);
++
++		if (!notify_notification_show (notification, NULL)) {
++			g_warning ("failed to send notification\n");
++		}
++		g_free (notification_text);
++	} else {
++		GtkWidget *dialog;
++		GtkWidget *image;
++		gint response;
++		gchar *basename;
++
++		basename = g_path_get_basename (filename);
++
++		dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE,
++						 _("You have received the file “%s” over Bluetooth."), basename,
++						 NULL);
++		gtk_window_set_focus_on_map (GTK_WINDOW (dialog), FALSE);
++		gtk_window_set_icon_name (GTK_WINDOW (dialog), "gnome-obex-server");
++		if (app != NULL) {
++			image = gtk_image_new_from_gicon (g_app_info_get_icon (app), GTK_ICON_SIZE_DIALOG);
++			gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
++		}
++		gtk_window_set_title (GTK_WINDOW (dialog), _("File Received"));
++		gtk_dialog_add_buttons (GTK_DIALOG (dialog),
++					_("Open"),   GTK_RESPONSE_YES,
++					_("Reveal"), GTK_RESPONSE_APPLY,
++					_("OK"),     GTK_RESPONSE_OK,
++					NULL);
++		gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
++
++		gtk_widget_show_all (dialog);
++		response = gtk_dialog_run (GTK_DIALOG (dialog));
++		switch (response) {
++		case GTK_RESPONSE_YES:
++			/* "Open" */
++			launch_file_viewer (file_uri);
++			break;
++
++		case GTK_RESPONSE_APPLY:
++			/* "Reveal" */
++			open_download_folder (file_uri);
++			break;
++
++		case GTK_RESPONSE_OK:
++			/* "OK" dismisses the alert box without further action. */
++			break;
++		}
++
++		gtk_widget_hide (dialog);
++		hide_statusicon ();
++		g_free (basename);
++	}
++
++	g_free (display);
++	if (app != NULL)
+ 		g_object_unref (app);
+-		uri = g_strdup (file_uri);
+-		notify_notification_add_action (notification, "display", _("Open File"),
+-						(NotifyActionCallback) notification_launch_action_on_file_cb,
+-						(gpointer) uri, (GFreeFunc) g_free);
+-	}
+-	notify_notification_add_action (notification, "reveal", _("Reveal File"),
+-					(NotifyActionCallback) notification_launch_action_on_file_cb,
+-					(gpointer) file_uri, (GFreeFunc) g_free);
+-	
+-	g_signal_connect (G_OBJECT (notification), "closed", G_CALLBACK (on_close_notification), notification);
+-
+-	if (!notify_notification_show (notification, NULL)) {
+-		g_warning ("failed to send notification\n");
+-	}
+-	g_free (notification_text);
+ }
+ 
+ static void
+
--- gnome-user-share-2.25.92.orig/debian/patches/10_drop_apache.patch
+++ gnome-user-share-2.25.92/debian/patches/10_drop_apache.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-user-share-2.25.92/data/file-share-properties.ui gnome-user-share-2.25.92.new/data/file-share-properties.ui
+--- gnome-user-share-2.25.92/data/file-share-properties.ui	2009-02-02 06:38:30.000000000 -0500
++++ gnome-user-share-2.25.92.new/data/file-share-properties.ui	2009-04-22 13:20:29.000000000 -0400
+@@ -20,7 +20,7 @@
+             <property name="spacing">18</property>
+             <child>
+               <object class="GtkVBox" id="vbox3">
+-                <property name="visible">True</property>
++                <property name="visible">False</property>
+                 <property name="spacing">6</property>
+                 <child>
+                   <object class="GtkLabel" id="label6">
--- gnome-user-share-2.25.92.orig/debian/patches/12_dont_require_gtk_2_14.patch
+++ gnome-user-share-2.25.92/debian/patches/12_dont_require_gtk_2_14.patch
@@ -0,0 +1,72 @@
+diff -Nur -x '*.orig' -x '*~' gnome-user-share-2.25.92/data/file-share-properties.ui gnome-user-share-2.25.92.new/data/file-share-properties.ui
+--- gnome-user-share-2.25.92/data/file-share-properties.ui	2009-04-22 15:03:27.000000000 -0400
++++ gnome-user-share-2.25.92.new/data/file-share-properties.ui	2009-04-22 15:03:52.000000000 -0400
+@@ -1,6 +1,5 @@
+ <?xml version="1.0"?>
+ <interface>
+-  <requires lib="gtk+" version="2.14"/>
+   <!-- interface-naming-policy toplevel-contextual -->
+   <object class="GtkDialog" id="user_share_dialog">
+     <property name="border_width">5</property>
+@@ -336,7 +335,7 @@
+             <child>
+               <object class="GtkButton" id="help_button">
+                 <property name="label">gtk-help</property>
+-                <property name="visible">True</property>
++                <property name="visible">False</property>
+                 <property name="can_focus">True</property>
+                 <property name="receives_default">True</property>
+                 <property name="use_stock">True</property>
+diff -Nur -x '*.orig' -x '*~' gnome-user-share-2.25.92/src/file-share-properties.c gnome-user-share-2.25.92.new/src/file-share-properties.c
+--- gnome-user-share-2.25.92/src/file-share-properties.c	2009-01-27 10:20:27.000000000 -0500
++++ gnome-user-share-2.25.92.new/src/file-share-properties.c	2009-04-22 15:03:29.000000000 -0400
+@@ -455,6 +455,7 @@
+ static void
+ help_button_clicked (GtkButton *button, GtkWidget *window)
+ {
++/*
+ 	GError *error = NULL;
+ 
+ 	if (gtk_show_uri (gtk_widget_get_screen (window), "ghelp:gnome-user-share", gtk_get_current_event_time (), &error) == FALSE) {
+@@ -467,6 +468,7 @@
+ 
+ 		g_error_free (error);
+ 	}
++*/
+ }
+ 
+ int
+diff -Nur -x '*.orig' -x '*~' gnome-user-share-2.25.92/src/obexpush.c gnome-user-share-2.25.92.new/src/obexpush.c
+--- gnome-user-share-2.25.92/src/obexpush.c	2009-04-22 15:03:27.000000000 -0400
++++ gnome-user-share-2.25.92.new/src/obexpush.c	2009-04-22 15:03:29.000000000 -0400
+@@ -69,7 +69,7 @@
+ static void
+ launch_file_viewer (const gchar *file_uri)
+ {
+-	GdkAppLaunchContext *ctx = NULL;
++	GAppLaunchContext *ctx = NULL;
+ 	GTimeVal val;
+ 
+ 	g_get_current_time (&val);
+@@ -93,7 +93,7 @@
+ static void
+ open_download_folder (const gchar *file_uri)
+ {
+-	GdkAppLaunchContext *ctx = NULL;
++	GAppLaunchContext *ctx = NULL;
+ 	GTimeVal val;
+ 	GFile *file;
+ 	GFile *parent;
+@@ -236,10 +236,12 @@
+ 						 NULL);
+ 		gtk_window_set_focus_on_map (GTK_WINDOW (dialog), FALSE);
+ 		gtk_window_set_icon_name (GTK_WINDOW (dialog), "gnome-obex-server");
++#if GTK_CHECK_VERSION(2,14,0)
+ 		if (app != NULL) {
+ 			image = gtk_image_new_from_gicon (g_app_info_get_icon (app), GTK_ICON_SIZE_DIALOG);
+ 			gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
+ 		}
++#endif
+ 		gtk_window_set_title (GTK_WINDOW (dialog), _("File Received"));
+ 		gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ 					_("Open"),   GTK_RESPONSE_YES,
--- gnome-user-share-2.25.92.orig/debian/patches/14_fix_session_race.patch
+++ gnome-user-share-2.25.92/debian/patches/14_fix_session_race.patch
@@ -0,0 +1,164 @@
+diff -Nur -x '*.orig' -x '*~' gnome-user-share-2.25.92/src/user_share.c gnome-user-share-2.25.92.new/src/user_share.c
+--- gnome-user-share-2.25.92/src/user_share.c	2009-01-27 10:55:29.000000000 -0500
++++ gnome-user-share-2.25.92.new/src/user_share.c	2009-04-29 16:13:36.000000000 -0400
+@@ -81,71 +81,16 @@
+ }
+ 
+ static void
+-sessionchanged_cb (void)
++sessionchanged_cb (DBusGProxy     *proxy, 
++				   gboolean        active)
+ {
+-	DBusGConnection *dbus_connection;
+-	DBusGProxy *proxy_ck_manager;
+-	DBusGProxy *proxy_ck_session;
+-
+-	gchar *ck_session_path;
+-	gboolean is_active = FALSE;
+-	GError *error = NULL;
+-
+-	g_message ("Active session changed");
+-
+-	dbus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+-	if (!dbus_connection) {
+-	    g_warning ("Unable to connect to dbus");
+-	    dbus_g_connection_unref (dbus_connection);
+-	    return;
+-	}
+-    
+-	proxy_ck_manager = dbus_g_proxy_new_for_name (dbus_connection,
+-			   			      CK_NAME,
+-		    				      CK_MANAGER_PATH,
+-					              CK_MANAGER_INTERFACE);
+-	if (dbus_g_proxy_call (proxy_ck_manager, "GetCurrentSession",
+-			       &error, G_TYPE_INVALID,
+-			       DBUS_TYPE_G_OBJECT_PATH, &ck_session_path,
+-			       G_TYPE_INVALID) == FALSE) {
+-	    g_warning ("Couldn't request the name: %s", error->message);
+-	    dbus_g_connection_unref (dbus_connection);
+-	    g_object_unref (proxy_ck_manager);
+-	    g_error_free (error);
+-	    return;
+-	}
+-	
+-	proxy_ck_session = dbus_g_proxy_new_for_name (dbus_connection,
+-						      CK_NAME,
+-						      ck_session_path,
+-						      CK_SESSION_INTERFACE);
+-
+-	if (dbus_g_proxy_call (proxy_ck_session, "IsActive",
+-			       &error, G_TYPE_INVALID,
+-			       G_TYPE_BOOLEAN, &is_active, 
+-			       G_TYPE_INVALID) == FALSE) {
+-	    
+-	    g_warning ("Couldn't request the name: %s", error->message);
+-	    dbus_g_connection_unref (dbus_connection);
+-	    g_object_unref (proxy_ck_manager);
+-	    g_object_unref (proxy_ck_session);
+-	    g_error_free (error);
+-	    return;
+-	}
+-	
+-	if (is_active) {
+-		obex_services_start ();
+-	} else {
+-		obex_services_shutdown (); 
+-	}
++  g_debug ("sessionchanged_cb: %s", active ? "Active" : "Inactive");
+ 
+-	dbus_g_connection_unref (dbus_connection);
+-	g_free (ck_session_path);
+-	g_object_unref (proxy_ck_manager);
+-	g_object_unref (proxy_ck_session);
+-	if (error != NULL) {
+-	    g_error_free (error);
+-	}
++  if (active) {
++	  obex_services_start ();
++  } else {
++	  obex_services_shutdown (); 
++  }
+ }
+ 
+ static void
+@@ -153,10 +98,7 @@
+ {
+ 	DBusGConnection *dbus_connection;
+ 	DBusGProxy *proxy_ck_manager;
+-	DBusGProxy *proxy_ck_session;
+-	DBusGProxy *proxy_ck_seat;
+-	gchar *ck_session_path;
+-	gchar *ck_seat_path;
++	DBusGProxy *proxy_session;    
+ 	GError *error = NULL;
+ 
+ 	dbus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
+@@ -166,14 +108,16 @@
+ 	    dbus_g_connection_unref (dbus_connection);
+ 	    return;
+ 	}
+-    
+-	proxy_ck_manager = dbus_g_proxy_new_for_name (dbus_connection,
+-						      CK_NAME,
+-						      CK_MANAGER_PATH,
+-						      CK_MANAGER_INTERFACE);
++
++
++	proxy_ck_manager = proxy_session = dbus_g_proxy_new_for_name (dbus_connection,
++																  CK_NAME,
++																  CK_MANAGER_PATH,
++																  CK_MANAGER_INTERFACE);
++
+ 	if (dbus_g_proxy_call (proxy_ck_manager, "GetCurrentSession",
+ 			       &error, G_TYPE_INVALID,
+-			       DBUS_TYPE_G_OBJECT_PATH, &ck_session_path,
++			       DBUS_TYPE_G_PROXY, &proxy_session,
+ 			       G_TYPE_INVALID) == FALSE) {
+ 	    
+ 	    g_warning ("Couldn't request the name: %s", error->message);
+@@ -181,34 +125,17 @@
+ 	    return;
+ 	}
+ 	
+-	proxy_ck_session = dbus_g_proxy_new_for_name (dbus_connection,
+-						      CK_NAME,
+-						      ck_session_path,
+-						      CK_SESSION_INTERFACE);
+-	if (dbus_g_proxy_call (proxy_ck_session, "GetSeatId",
+-			       &error, G_TYPE_INVALID,
+-			       DBUS_TYPE_G_OBJECT_PATH, &ck_seat_path,
+-			       G_TYPE_INVALID) == FALSE) {
+-	    
+-	    g_warning ("Couldn't request the name: %s", error->message);
+-	    g_object_unref (proxy_ck_session); 
+-	    return;
+-	}
+-	
+-	proxy_ck_seat = dbus_g_proxy_new_for_name (dbus_connection,
+-						   CK_NAME,
+-						   ck_seat_path,
+-						   CK_SEAT_INTERFACE);
+-	dbus_g_proxy_add_signal (proxy_ck_seat, "ActiveSessionChanged",
+-				 G_TYPE_STRING, G_TYPE_INVALID);
+-	dbus_g_proxy_connect_signal (proxy_ck_seat, "ActiveSessionChanged",
+-				     G_CALLBACK (sessionchanged_cb), NULL, NULL);
+-	if (error != NULL) {
+-	    g_error_free (error);
+-	}
+-	g_object_unref (proxy_ck_manager);
+-	g_object_unref (proxy_ck_session);
+-	g_free (ck_seat_path);
++
++	dbus_g_proxy_set_interface (proxy_session, 
++								"org.freedesktop.ConsoleKit.Session");
++	dbus_g_proxy_add_signal (proxy_session, "ActiveChanged",
++							 G_TYPE_BOOLEAN, G_TYPE_INVALID);
++	dbus_g_proxy_connect_signal (proxy_session, "ActiveChanged", 
++								 G_CALLBACK (sessionchanged_cb),
++								 NULL,
++								 NULL);
++
++	g_object_unref (proxy_ck_manager); 
+ 	dbus_g_connection_unref (dbus_connection);
+ }
+ 
--- gnome-user-share-2.25.92.orig/help/gnome-user-share.pot
+++ gnome-user-share-2.25.92/help/gnome-user-share.pot
@@ -0,0 +1,240 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-03-03 11:15-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: C/legal.xml:2(para) 
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr ""
+
+#: C/legal.xml:12(para) 
+msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
+msgstr ""
+
+#: C/legal.xml:19(para) 
+msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
+msgstr ""
+
+#: C/legal.xml:35(para) 
+msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
+msgstr ""
+
+#: C/legal.xml:28(para) 
+msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-user-share.xml:81(None) 
+msgid "@@image: 'figures/file-sharing-preferences.png'; md5=7ae616b8043b36be1f4943ba06d8a5ed"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-user-share.xml:99(None) 
+msgid "@@image: 'figures/sharing-over-the-network.png'; md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-user-share.xml:143(None) 
+msgid "@@image: 'figures/sharing-over-bluetooth.png'; md5=0a950502b42b1e7fdb9a57d5017e919c"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-user-share.xml:168(None) 
+msgid "@@image: 'figures/receiving-over-bluetooth.png'; md5=f292daef06767f39e346b222d3c448be"
+msgstr ""
+
+#: C/gnome-user-share.xml:10(title) 
+msgid "Personal File Sharing Manual"
+msgstr ""
+
+#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date) 
+msgid "2009"
+msgstr ""
+
+#: C/gnome-user-share.xml:13(holder) 
+msgid "Red Hat, Inc."
+msgstr ""
+
+#: C/gnome-user-share.xml:19(firstname) 
+msgid "Matthias"
+msgstr ""
+
+#: C/gnome-user-share.xml:20(surname) 
+msgid "Clasen"
+msgstr ""
+
+#: C/gnome-user-share.xml:28(revnumber) 
+msgid "1.0"
+msgstr ""
+
+#: C/gnome-user-share.xml:31(para) 
+msgid "Matthias Clasen <email>mclasen@redhat.com</email>"
+msgstr ""
+
+#: C/gnome-user-share.xml:35(releaseinfo) 
+msgid "This manual describes version 2.26 of gnome-user-share."
+msgstr ""
+
+#: C/gnome-user-share.xml:37(title) 
+msgid "Feedback"
+msgstr ""
+
+#: C/gnome-user-share.xml:38(para) 
+msgid "To report a bug or make a suggestion regarding the gnome-user-share application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
+msgstr ""
+
+#: C/gnome-user-share.xml:41(para) 
+msgid "gnome-user-share is a session service that enables easy sharing of files between several computers."
+msgstr ""
+
+#: C/gnome-user-share.xml:45(primary) 
+msgid "gnome-user-share"
+msgstr ""
+
+#: C/gnome-user-share.xml:46(primary) 
+msgid "file sharing"
+msgstr ""
+
+#: C/gnome-user-share.xml:47(primary) 
+msgid "sharing"
+msgstr ""
+
+#: C/gnome-user-share.xml:50(title) 
+msgid "Introduction"
+msgstr ""
+
+#: C/gnome-user-share.xml:51(para) 
+msgid "gnome-user-share is a session service that exports the contents of the <filename>Public</filename> folder in your home directory, so that they can easily be accessed from other computers on the same local network. On the other computers, the shared folder will appear with a name like '<replaceable>user</replaceable>'s shared files' in the <application>nautilus</application> Network window, where <replaceable>user</replaceable> will be replaced by your user name."
+msgstr ""
+
+#: C/gnome-user-share.xml:54(para) 
+msgid "gnome-user-share uses a WebDAV server to share the <filename>Public</filename> folder, and advertises the share on the local network using mDNS."
+msgstr ""
+
+#: C/gnome-user-share.xml:57(para) 
+msgid "Additionally, gnome-user-share can make the shared files available via ObexFTP over Bluetooth, and receive files that are sent to your computer via Bluetooth via ObexPush."
+msgstr ""
+
+#: C/gnome-user-share.xml:63(title) 
+msgid "Getting started"
+msgstr ""
+
+#: C/gnome-user-share.xml:66(title) 
+msgid "Starting gnome-user-share"
+msgstr ""
+
+#: C/gnome-user-share.xml:68(para) 
+msgid "The gnome-user-share service is normally started by <application>gnome-session</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs."
+msgstr ""
+
+#: C/gnome-user-share.xml:72(para) 
+msgid "To configure various aspects of file sharing, use the File Sharing Preferences, which can be found in the <guimenu>System</guimenu> menu under <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice>."
+msgstr ""
+
+#: C/gnome-user-share.xml:77(title) 
+msgid "File Sharing Preferences"
+msgstr ""
+
+#: C/gnome-user-share.xml:89(title) 
+msgid "Enabling file sharing over the network"
+msgstr ""
+
+#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para) C/gnome-user-share.xml:159(para) 
+msgid "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the <guimenu>System</guimenu> menu."
+msgstr ""
+
+#: C/gnome-user-share.xml:95(title) 
+msgid "Share Files over the Network"
+msgstr ""
+
+#: C/gnome-user-share.xml:106(para) 
+msgid "Some firewall configurations on the local machine might cause problems with the advertisment, as well as the access to the shared files. Consult your system administrator for more details."
+msgstr ""
+
+#: C/gnome-user-share.xml:109(para) 
+msgid "Select <guilabel>Never</guilabel> to allow everybody to freely read or write files in the shared folder."
+msgstr ""
+
+#: C/gnome-user-share.xml:115(para) 
+msgid "Select <guilabel>Always</guilabel> to require the password to read or write files in the shared folder."
+msgstr ""
+
+#: C/gnome-user-share.xml:121(para) 
+msgid "Select <guilabel>When writing files</guilabel> to allow everybody to freely read files in the shared folder, but require the password when writing files."
+msgstr ""
+
+#: C/gnome-user-share.xml:128(para) 
+msgid "When you set a password, you have to give the password to all users that you want to have access to the shared files. Therefore, you should use a password that is different from other passwords you use."
+msgstr ""
+
+#: C/gnome-user-share.xml:104(para) 
+msgid "To enable file sharing via WebDAV, use the <guilabel>Share public files on network</guilabel> checkbox. When file sharing it enabled, the controls for password protection allow to set a password that needs to be specified before a user on another computer is granted access to the shared files. <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgstr ""
+
+#: C/gnome-user-share.xml:133(title) 
+msgid "Enabling file sharing over Bluetooth"
+msgstr ""
+
+#: C/gnome-user-share.xml:139(title) 
+msgid "Share Files over Bluetooth"
+msgstr ""
+
+#: C/gnome-user-share.xml:152(para) 
+msgid "When you allow unbonded remote devices to access your shared files, anybody with a Bluetooth-enabled cell phone in the vicinity of your computer can access and perhaps even modify your shared files."
+msgstr ""
+
+#: C/gnome-user-share.xml:148(para) 
+msgid "To enable file sharing via Bluetooth, use the <guilabel>Share public files over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to delete files in your shared folder, use the <guilabel>Allow remote devices to delete files</guilabel> checkbox. To allow remote Bluetooth devices to access your shared files even when they are not bonded with your computer, use the <guilabel>Require remote devices to pair with this computer</guilabel> checkbox. <placeholder-1/>"
+msgstr ""
+
+#: C/gnome-user-share.xml:158(title) 
+msgid "Receiving Files over Bluetooth"
+msgstr ""
+
+#: C/gnome-user-share.xml:164(title) 
+msgid "Receive Files over Bluetooth"
+msgstr ""
+
+#: C/gnome-user-share.xml:177(para) 
+msgid "Select <guilabel>Always</guilabel> to allow any remote device to send files."
+msgstr ""
+
+#: C/gnome-user-share.xml:184(para) 
+msgid "Bonded devices are the ones that were connected to your computer, and had to enter a PIN code to connect to or from."
+msgstr ""
+
+#: C/gnome-user-share.xml:182(para) 
+msgid "Select <guilabel>Only for Bonded devices</guilabel> to accept files only from bonded devices. <placeholder-1/>"
+msgstr ""
+
+#: C/gnome-user-share.xml:191(para) 
+msgid "Devices can be marked as trusted in the <application>bluetooth-properties</application>'s <guilabel>Known devices</guilabel> section."
+msgstr ""
+
+#: C/gnome-user-share.xml:189(para) 
+msgid "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept files only from bonded devices. <placeholder-1/>"
+msgstr ""
+
+#: C/gnome-user-share.xml:173(para) 
+msgid "To let remote Bluetooth devices send files to your computer, use the <guilabel>Receive files in Downloads folder over Bluetooth</guilabel> checkbox. Received files will be stored in the <filename>Downloads</filename> folder in your home directory. When receiving files is enabled, the <guilabel>Accept files</guilabel> selection allows you to determine which remote devices are allowed to send files. <placeholder-1/>"
+msgstr ""
+
+#: C/gnome-user-share.xml:196(para) 
+msgid "Use the <guilabel>Notify about received files</guilabel> checkbox to select whether you want to be notified whenever a file is received via Bluetooth."
+msgstr ""
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
+#: C/gnome-user-share.xml:0(None) 
+msgid "translator-credits"
+msgstr ""
+
