Merge lp:~noskcaj/gnome-user-share/3.8 into lp:~ubuntu-desktop/gnome-user-share/ubuntu

[Jackson Doak]

Merge 3.8.0-2 from debian, newer versions require bluez5, but this fixes some bugs and gives apache2.4 support

[lp:~noskcaj/gnome-user-share/3.8]

18. By Jackson Doak on 2015-08-02

* New upstream release.
* Refresh 02_bluetooth_optional.patch.
* Bump Standards-Version to 3.9.4. No further changes.

[Daniel Holbach (dholbach)]

Debian seems to have 3.14.2-1 now. Do you have a link to the 3.8.0-2 source package? Do you know what the state is of having bluez5 in main?

review: Needs Information

[Jackson Doak (noskcaj)]

the link to the 3.8.3 source is https://download.gnome.org/sources/gnome-user-share/3.8/gnome-user-share-3.8.3.tar.xz , i got the debian source from pkg-gnome svn. bluez5 will be in ubuntu later this cycle hopefully, but we can't be sure.

Unmerged revisions

18. By Jackson Doak on 2015-08-02

* New upstream release.
* Refresh 02_bluetooth_optional.patch.
* Bump Standards-Version to 3.9.4. No further changes.

17. By Jackson Doak on 2015-08-02

* Merge with old debian release. Remaining changes:
* debian/control:
  - Suggests the apache2-bin and libapache2-mod-dnssd binaries rather than
    depends on those, we want obex push to work out of the box but we don't
    really need webdav and the apache binaries on the default installation.
* debian/dirs: Dropped, we don't need to create /usr/share/gnome.
* debian/gconf-defaults: Enable notifications on receipt of files by default
* debian/patches/01_notification.patch: Display an alert box instead
  of a notification for files received.
* debian/patches/02_bluetooth_optional.patch: Dropped, it's enables
  Bluetooth support to be configurable at build-time. We don't
  actually use it, it adds a lot of #ifdef's to the code, and requires
  some effort to port it to the new version.
* debian/patches/04_webdav_optional.patch:
  - De-senstize the WebDAV UI components if the suggested packages are
    not available for WebDAV sharing. Display a notice explaining why sharing
    cannot be enabled.
* debian/patches/05_autostart_delay.patch:
  - set X-GNOME-Autostart-Delay key to delay starting by 15 seconds.
* debian/patches/06_nodisplay_autostart.patch:
  - Don't show in "Startup Applications"
* debian/patches/07_onlyshowin_unity.patch:
  - Add Unity to OnlyShowIn
* debian/rules:
  - don't move autostart file from etc to usr
  - don't install the Nautilus bar. It's not that useful to people who don't
    have bluetooth hardware and is not easily disabled.
* debian/control.in:
  + Remove obsolete build dependency on scrollkeeper.
  + Switch apache2.2-bin dependency to apache2-bin for the Apache 2.4
    transition. Closes: #669729.
  + Bump minimum dependency on libapache2-mod-dnssd to 0.6-3.1~
    to get Apache 2.4 support.
* debian/patches/10_apache_2.4.patch:
  + Don't load mod_unixd.so as it is statically linked.
    Thanks Arno Töll for the insights.
* 11_apache_noauth.patch: fix the configuration with
  require_password=never. Thanks Arno Töll.
* New upstream release.
  + debian/control.in:
    - Update build dependencies.
  + debian/patches/02_bluetooth_optional.patch:
    - Updated.
  + debian/rules:
    - Pass --disable-bluetooth to configure on !linux.
* debian/rules: disable scrollkeeper
* New upstream release
* debian/patches/02_bluetooth_optional.patch
  + Updated
* Drop Build-Depends on libunique-3.0-dev.
* Bump Build-Depends on libglib2.0-dev to (>= 2.28.0).
* Update debian/copyright, drop outdated section about md5.[ch].
* Update Vcs-* URLs.
* Bump Standards-Version to 3.9.3.

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-03 13:51:13 +0000
+++ debian/changelog	2015-08-02 08:27:18 +0000
@@ -1,3 +1,74 @@
+gnome-user-share (3.8.3-1ubuntu1) wily; urgency=medium
+
+  * Merge with old debian release. Remaining changes:
+  * debian/control:
+    - Suggests the apache2-bin and libapache2-mod-dnssd binaries rather than
+      depends on those, we want obex push to work out of the box but we don't
+      really need webdav and the apache binaries on the default installation.
+  * debian/dirs: Dropped, we don't need to create /usr/share/gnome.
+  * debian/gconf-defaults: Enable notifications on receipt of files by default
+  * debian/patches/01_notification.patch: Display an alert box instead
+    of a notification for files received.
+  * debian/patches/02_bluetooth_optional.patch: Dropped, it's enables
+    Bluetooth support to be configurable at build-time. We don't
+    actually use it, it adds a lot of #ifdef's to the code, and requires
+    some effort to port it to the new version.
+  * debian/patches/04_webdav_optional.patch:
+    - De-senstize the WebDAV UI components if the suggested packages are
+      not available for WebDAV sharing. Display a notice explaining why sharing
+      cannot be enabled.
+  * debian/patches/05_autostart_delay.patch:
+    - set X-GNOME-Autostart-Delay key to delay starting by 15 seconds.
+  * debian/patches/06_nodisplay_autostart.patch:
+    - Don't show in "Startup Applications"
+  * debian/patches/07_onlyshowin_unity.patch:
+    - Add Unity to OnlyShowIn
+  * debian/rules: 
+    - don't move autostart file from etc to usr
+    - don't install the Nautilus bar. It's not that useful to people who don't
+      have bluetooth hardware and is not easily disabled.
+
+ -- Jackson Doak <[e-mail]>  Sun, 02 Aug 2015 16:45:58 +1000
+
+gnome-user-share (3.8.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh 02_bluetooth_optional.patch.
+  * Bump Standards-Version to 3.9.4. No further changes.
+
+ -- Michael Biebl <[e-mail]>  Fri, 23 Aug 2013 23:35:21 +0200
+
+gnome-user-share (3.8.0-2) unstable; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/control.in:
+    + Remove obsolete build dependency on scrollkeeper.
+    + Switch apache2.2-bin dependency to apache2-bin for the Apache 2.4
+      transition. Closes: #669729.
+    + Bump minimum dependency on libapache2-mod-dnssd to 0.6-3.1~
+      to get Apache 2.4 support.
+  * debian/patches/10_apache_2.4.patch:
+    + Don't load mod_unixd.so as it is statically linked.
+      Thanks Arno Töll for the insights.
+
+  [ Josselin Mouette ]
+  * 11_apache_noauth.patch: fix the configuration with 
+    require_password=never. Thanks Arno Töll.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Fri, 07 Jun 2013 01:16:38 +0200
+
+gnome-user-share (3.8.0-1) experimental; urgency=low
+
+  * New upstream release.
+    + debian/control.in:
+      - Update build dependencies.
+    + debian/patches/02_bluetooth_optional.patch:
+      - Updated.
+    + debian/rules:
+      - Pass --disable-bluetooth to configure on !linux.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sun, 31 Mar 2013 18:29:51 +0200
+
 gnome-user-share (3.0.4-0ubuntu1) quantal; urgency=low
 
   * New upstream bugfix release
@@ -15,6 +86,25 @@
 
  -- Robert Ancell <[e-mail]>  Sat, 25 Aug 2012 16:59:00 +1200
 
+gnome-user-share (3.0.2-1) unstable; urgency=low
+
+  [ Sebastien Bacher ]
+  * debian/rules: disable scrollkeeper
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * debian/patches/02_bluetooth_optional.patch
+    + Updated
+
+  [ Michael Biebl ]
+  * Drop Build-Depends on libunique-3.0-dev.
+  * Bump Build-Depends on libglib2.0-dev to (>= 2.28.0).
+  * Update debian/copyright, drop outdated section about md5.[ch].
+  * Update Vcs-* URLs.
+  * Bump Standards-Version to 3.9.3.
+
+ -- Michael Biebl <[e-mail]>  Tue, 29 May 2012 19:09:09 +0200
+
 gnome-user-share (3.0.2-0ubuntu3) quantal; urgency=low
 
   * Rebuild with the new libgnome-bluetooth

=== modified file 'debian/control'
--- debian/control	2013-03-03 13:51:13 +0000
+++ debian/control	2015-08-02 08:27:18 +0000
@@ -5,9 +5,9 @@
 Source: gnome-user-share
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Desktop Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Jeremy Bicha <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Jeremy Bicha <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: cdbs,
                debhelper (>= 8),
                dh-autoreconf,
@@ -17,16 +17,17 @@
                libxt-dev,
                pkg-config,
                libdbus-1-dev (>= 1.1.1),
-               libglib2.0-dev (>= 2.15.2),
+               libdbus-glib-1-dev,
+               libglib2.0-dev (>= 2.28.0),
                libgtk-3-dev,
-               libdbus-glib-1-dev,
                libnotify-dev (>= 0.7),
                libcanberra-gtk3-dev,
                libselinux1-dev [linux-any],
                libgnome-bluetooth-dev (>= 2.91.5) [linux-any],
                libnautilus-extension-dev (>= 2.91.7)
-Standards-Version: 3.9.3
-Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-user-share/ubuntu
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-user-share
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-user-share
 
 Package: gnome-user-share
 Architecture: any
@@ -34,8 +35,8 @@
          ${misc:Depends},
          obex-data-server [linux-any],
          gnome-bluetooth [linux-any]
-Suggests: apache2.2-bin,
-          libapache2-mod-dnssd (>= 0.6)
+Suggests: apache2-bin (>= 2.4),
+          libapache2-mod-dnssd (>= 0.6-3.1~),
 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

=== modified file 'debian/control.in'
--- debian/control.in	2013-03-03 13:51:13 +0000
+++ debian/control.in	2015-08-02 08:27:18 +0000
@@ -1,7 +1,7 @@
 Source: gnome-user-share
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Desktop Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
@@ -13,16 +13,17 @@
                libxt-dev,
                pkg-config,
                libdbus-1-dev (>= 1.1.1),
-               libglib2.0-dev (>= 2.15.2),
+               libdbus-glib-1-dev,
+               libglib2.0-dev (>= 2.28.0),
                libgtk-3-dev,
-               libdbus-glib-1-dev,
                libnotify-dev (>= 0.7),
                libcanberra-gtk3-dev,
                libselinux1-dev [linux-any],
                libgnome-bluetooth-dev (>= 2.91.5) [linux-any],
                libnautilus-extension-dev (>= 2.91.7)
-Standards-Version: 3.9.3
-Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-user-share/ubuntu
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-user-share
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-user-share
 
 Package: gnome-user-share
 Architecture: any
@@ -30,8 +31,8 @@
          ${misc:Depends},
          obex-data-server [linux-any],
          gnome-bluetooth [linux-any]
-Suggests: apache2.2-bin,
-          libapache2-mod-dnssd (>= 0.6)
+Suggests: apache2-bin (>= 2.4),
+          libapache2-mod-dnssd (>= 0.6-3.1~),
 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

=== modified file 'debian/copyright'
--- debian/copyright	2011-03-11 04:39:02 +0000
+++ debian/copyright	2015-08-02 08:27:18 +0000
@@ -30,14 +30,3 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-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.
-

=== modified file 'debian/patches/01_notification.patch'
--- debian/patches/01_notification.patch	2012-08-25 04:58:51 +0000
+++ debian/patches/01_notification.patch	2015-08-02 08:27:18 +0000
@@ -184,7 +184,7 @@
  
  	file_uri = g_filename_to_uri (filename, NULL, NULL);
  	if (file_uri == NULL) {
-@@ -128,36 +219,65 @@
+@@ -128,37 +219,66 @@
  		return;
  	}
  
@@ -197,6 +197,7 @@
 -								 "dialog-information");
 -
 -	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+-	notify_notification_set_hint_string (notification, "desktop-entry", "gnome-user-share-properties");
 -
  	mime_type = g_content_type_guess (filename, NULL, 0, NULL);
  	app = g_app_info_get_default_for_type (mime_type, FALSE);
@@ -215,6 +216,7 @@
 +									 "dialog-information");
 +
 +		notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
++		notify_notification_set_hint_string (notification, "desktop-entry", "gnome-user-share-properties");
 +
 +		if (app != NULL) {
 +			notify_notification_add_action (notification, "display", _("Open File"),

=== added file 'debian/patches/02_bluetooth_optional.patch'
--- debian/patches/02_bluetooth_optional.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_bluetooth_optional.patch	2015-08-02 08:27:18 +0000
@@ -0,0 +1,318 @@
+From cc71d396069c036643eec8038377d233e2f8f303 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <[e-mail]>
+Date: Sun, 31 Mar 2013 17:56:49 +0200
+Subject: [PATCH] Make bluetooth support optional
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As gnome-bluetooth doesn’t build on non-Linux architectures, bluetooth
+support in gnome-user-share needs to be optional to allow it to build on
+non-linux.
+
+Based on a patch by Josselin Mouette.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=601890
+---
+ configure.ac          |   13 +++++++++++--
+ src/Makefile.am       |   18 ++++++++++++++----
+ src/share-extension.c |   15 ++++++++++++++-
+ src/user_share.c      |   31 ++++++++++++++++++++++++++++++-
+ 4 files changed, 69 insertions(+), 8 deletions(-)
+
+Index: gnome-user-share-3.8.3/configure.ac
+===================================================================
+--- gnome-user-share-3.8.3.orig/configure.ac	2013-08-23 23:28:14.302349546 +0200
++++ gnome-user-share-3.8.3/configure.ac	2013-08-23 23:28:14.290349391 +0200
+@@ -54,10 +54,19 @@
+ 
+ AC_SUBST(HTTPD)
+ 
+-PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.28 gio-2.0 >= 2.26 gtk+-3.0 dbus-1 >= 1.1.1 dbus-glib-1 libnotify libcanberra-gtk3 gnome-bluetooth-1.0 >= 2.91.5)
++PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.28 gio-2.0 >= 2.26 gtk+-3.0 dbus-1 >= 1.1.1 dbus-glib-1 libnotify libcanberra-gtk3)
+ AC_SUBST(USER_SHARE_CFLAGS)
+ AC_SUBST(USER_SHARE_LIBS)
+ 
++AC_ARG_ENABLE(bluetooth, AS_HELP_STRING([--disable-bluetooth],[compile without bluetooth support]),,enable_bluetooth=yes)
++if test "x$enable_bluetooth" = "xyes"; then
++  PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 2.91.5)
++  AC_DEFINE(HAVE_BLUETOOTH, 1, [Set to true if gnome-bluetooth support is available])
++else
++  AC_MSG_WARN([Bluetooth support is disabled.])
++fi
++AM_CONDITIONAL(USE_BLUETOOTH, [test "$enable_bluetooth" = "yes"])
++
+ AC_CHECK_LIB(socket, socket)
+ 
+ have_socket=no
+@@ -124,7 +133,7 @@
+ 	    [ac_with_nautilusdir=""])
+ 
+ PKG_CHECK_MODULES(EXTENSION,
+-		   libnautilus-extension >= 2.91.7 gnome-bluetooth-1.0)
++		   libnautilus-extension >= 2.91.7)
+ if test "${ac_with_nautilusdir}" = ""; then
+ 	ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
+ fi
+Index: gnome-user-share-3.8.3/src/Makefile.am
+===================================================================
+--- gnome-user-share-3.8.3.orig/src/Makefile.am	2013-08-23 23:28:14.302349546 +0200
++++ gnome-user-share-3.8.3/src/Makefile.am	2013-08-23 23:28:14.294349441 +0200
+@@ -27,6 +27,7 @@
+ 	-I$(top_builddir) 				\
+ 	$(EXTENSION_CFLAGS)				\
+ 	$(USER_SHARE_CFLAGS)				\
++	$(BLUETOOTH_CFLAGS)				\
+ 	$(X_CFLAGS)
+ 
+ gnome_user_share_SOURCES =	\
+@@ -36,10 +37,6 @@
+ 	user_share-private.c	\
+ 	http.c			\
+ 	http.h			\
+-	obexftp.c		\
+-	obexftp.h		\
+-	obexpush.c		\
+-	obexpush.h		\
+ 	$(MARSHALFILES)
+ 
+ gnome_user_share_LDADD =	\
+@@ -48,6 +45,15 @@
+ 	$(SELINUX_LIBS)	\
+ 	$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
+ 
++if USE_BLUETOOTH
++gnome_user_share_SOURCES += \
++	obexftp.c		\
++	obexftp.h		\
++	obexpush.c		\
++	obexpush.h
++gnome_user_share_LDADD += $(BLUETOOTH_LIBS)
++endif
++
+ nautilus_extensiondir = $(NAUTILUSDIR)
+ nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la
+ 
+@@ -60,6 +66,10 @@
+ libnautilus_share_extension_la_LIBADD = libuser-share-common.la $(EXTENSION_LIBS)
+ libnautilus_share_extension_la_LDFLAGS = -avoid-version -module -no-undefined
+ 
++if USE_BLUETOOTH
++libnautilus_share_extension_la_LIBADD += $(BLUETOOTH_LIBS)
++endif
++
+ EXTRA_DIST = marshal.list
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+Index: gnome-user-share-3.8.3/src/share-extension.c
+===================================================================
+--- gnome-user-share-3.8.3.orig/src/share-extension.c	2013-08-23 23:28:14.302349546 +0200
++++ gnome-user-share-3.8.3/src/share-extension.c	2013-08-23 23:28:14.294349441 +0200
+@@ -28,10 +28,13 @@
+ #include <glib/gi18n-lib.h>
+ #include <gio/gdesktopappinfo.h>
+ #include <gtk/gtk.h>
+-#include <bluetooth-client.h>
+ #include <libnautilus-extension/nautilus-menu-provider.h>
+ #include <libnautilus-extension/nautilus-location-widget-provider.h>
+ 
++#ifdef HAVE_BLUETOOTH
++#include <bluetooth-client.h>
++#endif /* HAVE_BLUETOOTH */
++
+ #include "nautilus-share-bar.h"
+ #include "user_share-common.h"
+ 
+@@ -89,6 +92,7 @@
+                 launch_prefs_on_window ();
+ }
+ 
++#ifdef HAVE_BLUETOOTH
+ static void
+ downloads_bar_set_from_bluetooth_status (GtkWidget *bar)
+ {
+@@ -109,6 +113,7 @@
+ {
+ 	downloads_bar_set_from_bluetooth_status (bar);
+ }
++#endif /* HAVE_BLUETOOTH */
+ 
+ static GtkWidget *
+ nautilus_user_share_get_location_widget (NautilusLocationWidgetProvider *iface,
+@@ -151,8 +156,13 @@
+ 	if (is_dir[0] != FALSE && is_dir[1] != FALSE) {
+ 		bar = nautilus_share_bar_new (_("May be used to share or receive files"));
+ 	} else if (is_dir[0] != FALSE) {
++#ifdef HAVE_BLUETOOTH
+ 		bar = nautilus_share_bar_new (_("May be shared over the network or Bluetooth"));
++#else
++		bar = nautilus_share_bar_new (_("May be shared over the network"));
++#endif /* HAVE_BLUETOOTH */
+ 	} else {
++#ifdef HAVE_BLUETOOTH
+ 		BluetoothClient *client;
+ 
+ 		bar = nautilus_share_bar_new (_("May be used to receive files over Bluetooth"));
+@@ -162,6 +172,9 @@
+ 		g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
+ 				  G_CALLBACK (default_adapter_powered_cb), bar);
+ 		downloads_bar_set_from_bluetooth_status (bar);
++#else
++		return NULL;
++#endif /* HAVE_BLUETOOTH */
+ 	}
+ 
+ 	g_signal_connect (bar, "response",
+Index: gnome-user-share-3.8.3/src/user_share.c
+===================================================================
+--- gnome-user-share-3.8.3.orig/src/user_share.c	2013-08-23 23:28:14.302349546 +0200
++++ gnome-user-share-3.8.3/src/user_share.c	2013-08-23 23:29:50.479583807 +0200
+@@ -27,7 +27,6 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+-#include <bluetooth-client.h>
+ #include <gio/gio.h>
+ #include <X11/Xlib.h>
+ 
+@@ -35,8 +34,13 @@
+ #include "user_share-private.h"
+ #include "user_share-common.h"
+ #include "http.h"
++
++#ifdef HAVE_BLUETOOTH
++#include <bluetooth-client.h>
++
+ #include "obexftp.h"
+ #include "obexpush.h"
++#endif /* HAVE_BLUETOOTH */
+ 
+ #include <stdarg.h>
+ #include <string.h>
+@@ -53,6 +57,8 @@
+ static GSettings *settings = NULL;
+ 
+ static guint disabled_timeout_tag = 0;
++
++#ifdef HAVE_BLUETOOTH
+ static GDBusProxy *session_proxy = NULL;
+ static gboolean has_console = TRUE;
+ 
+@@ -182,6 +188,7 @@
+ 	g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
+ 			  G_CALLBACK (default_adapter_changed), NULL);
+ }
++#endif /* HAVE_BLUETOOTH */
+ 
+ static void
+ migrate_old_configuration (void)
+@@ -213,9 +220,13 @@
+ {
+ 	http_down ();
+ 
++#ifdef HAVE_BLUETOOTH
+ 	if (g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_ENABLED) == FALSE &&
+ 	    g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_OBEXPUSH_ENABLED) == FALSE)
+ 		_exit (0);
++#else
++	_exit (0);
++#endif /* HAVE_BLUETOOTH */
+ 	return FALSE;
+ }
+ 
+@@ -243,6 +254,7 @@
+ 	}
+ }
+ 
++#ifdef HAVE_BLUETOOTH
+ static void
+ file_sharing_bluetooth_allow_write_changed (void)
+ {
+@@ -309,6 +321,7 @@
+ {
+ 	obexpush_set_notify (g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY));
+ }
++#endif /* HAVE_BLUETOOTH */
+ 
+ static void
+ setttings_changed (GSettings *settings,
+@@ -321,6 +334,7 @@
+ 	else if (g_strcmp0 (FILE_SHARING_REQUIRE_PASSWORD, path) == 0)
+ 		require_password_changed ();
+ 
++#ifdef HAVE_BLUETOOTH
+ 	else if (g_strcmp0 (FILE_SHARING_BLUETOOTH_ENABLED, path) == 0)
+ 		file_sharing_bluetooth_enabled_changed ();
+ 
+@@ -338,14 +352,17 @@
+ 
+ 	else if (g_strcmp0 (FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY, path) == 0)
+ 		file_sharing_bluetooth_obexpush_notify_changed ();
++#endif /* HAVE_BLUETOOTH */
+ }
+ 
+ static void
+ cleanup_handler (int sig)
+ {
+ 	http_down ();
++#ifdef HAVE_BLUETOOTH
+ 	obexftp_down ();
+ 	obexpush_down ();
++#endif /* HAVE_BLUETOOTH */
+ 	_exit (2);
+ }
+ 
+@@ -353,7 +370,9 @@
+ x_io_error_handler (Display *xdisplay)
+ {
+ 	http_down ();
++#ifdef HAVE_BLUETOOTH
+ 	obexftp_down ();
++#endif /* HAVE_BLUETOOTH */
+ 	_exit (2);
+ }
+ 
+@@ -408,10 +427,14 @@
+ 
+ 	migrate_old_configuration ();
+ 
++#ifdef HAVE_BLUETOOTH
+ 	settings = g_settings_new (GNOME_USER_SHARE_SCHEMAS);
+ 	if (g_settings_get_boolean (settings, FILE_SHARING_ENABLED) == FALSE &&
+ 	    g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_ENABLED) == FALSE &&
+ 	    g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_OBEXPUSH_ENABLED) == FALSE)
++#else
++	if (g_settings_get_boolean (settings, FILE_SHARING_ENABLED) == FALSE)
++#endif /* HAVE_BLUETOOTH */
+ 		return 1;
+ 
+ 	x_fd = ConnectionNumber (xdisplay);
+@@ -419,22 +442,28 @@
+ 
+ 	if (http_init () == FALSE)
+ 		return 1;
++#ifdef HAVE_BLUETOOTH
+ 	if (obexftp_init () == FALSE)
+ 		return 1;
+ 	if (obexpush_init () == FALSE)
+ 		return 1;
++#endif /* HAVE_BLUETOOTH */
+ 
+ 	g_signal_connect (settings, "changed", G_CALLBACK(setttings_changed), NULL);
+ 
++#ifdef HAVE_BLUETOOTH
+ 	bluez_init ();
+ 	session_init ();
++#endif /* HAVE_BLUETOOTH */
+ 
+ 	/* Initial setting */
+ 	file_sharing_enabled_changed ();
++#ifdef HAVE_BLUETOOTH
+ 	file_sharing_bluetooth_enabled_changed ();
+ 	file_sharing_bluetooth_obexpush_accept_files_changed ();
+ 	file_sharing_bluetooth_obexpush_notify_changed ();
+ 	file_sharing_bluetooth_obexpush_enabled_changed ();
++#endif /* HAVE_BLUETOOTH */
+ 
+ 	gtk_main ();
+ 	g_object_unref (settings);

=== modified file 'debian/patches/04_webdav_optional.patch'
--- debian/patches/04_webdav_optional.patch	2012-08-25 04:58:51 +0000
+++ debian/patches/04_webdav_optional.patch	2015-08-02 08:27:18 +0000
@@ -94,140 +94,4 @@
  static const char *known_httpd_modules_locations [] = {
  	HTTPD_MODULES_PATH,
  	"/etc/httpd/modules",
-Index: gnome-user-share-3.0.3/data/file-share-properties.ui
-===================================================================
---- gnome-user-share-3.0.3.orig/data/file-share-properties.ui	2012-08-24 23:25:14.000000000 +1200
-+++ gnome-user-share-3.0.3/data/file-share-properties.ui	2012-08-25 16:54:53.053074352 +1200
-@@ -43,7 +43,7 @@
-                     <child>
-                       <object class="GtkTable" id="table2">
-                         <property name="visible">True</property>
--                        <property name="n_rows">3</property>
-+                        <property name="n_rows">4</property>
-                         <property name="n_columns">2</property>
-                         <property name="column_spacing">12</property>
-                         <property name="row_spacing">6</property>
-@@ -54,8 +54,8 @@
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
--                            <property name="top_attach">1</property>
--                            <property name="bottom_attach">2</property>
-+                            <property name="top_attach">2</property>
-+                            <property name="bottom_attach">3</property>
-                             <property name="y_options">GTK_FILL</property>
-                           </packing>
-                         </child>
-@@ -68,8 +68,8 @@
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
--                            <property name="top_attach">2</property>
--                            <property name="bottom_attach">3</property>
-+                            <property name="top_attach">3</property>
-+                            <property name="bottom_attach">4</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-@@ -83,6 +83,8 @@
-                             <property name="draw_indicator">True</property>
-                           </object>
-                           <packing>
-+                            <property name="top_attach">1</property>
-+                            <property name="bottom_attach">2</property>
-                             <property name="right_attach">2</property>
-                             <property name="x_options">GTK_FILL</property>
-                             <property name="y_options"></property>
-@@ -97,8 +99,8 @@
-                             <property name="mnemonic_widget">password_entry</property>
-                           </object>
-                           <packing>
--                            <property name="top_attach">2</property>
--                            <property name="bottom_attach">3</property>
-+                            <property name="top_attach">3</property>
-+                            <property name="bottom_attach">4</property>
-                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                             <property name="y_options"></property>
-                           </packing>
-@@ -111,8 +113,19 @@
-                             <property name="mnemonic_widget">password_combo</property>
-                           </object>
-                           <packing>
--                            <property name="top_attach">1</property>
--                            <property name="bottom_attach">2</property>
-+                            <property name="top_attach">2</property>
-+                            <property name="bottom_attach">3</property>
-+                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-+                            <property name="y_options"></property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkLabel" id="webdav_info">
-+                            <property name="visible">False</property>
-+                            <property name="wrap">True</property>
-+                          </object>
-+                          <packing>
-+                            <property name="right_attach">2</property>
-                             <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                             <property name="y_options"></property>
-                           </packing>
-Index: gnome-user-share-3.0.3/src/file-share-properties.c
-===================================================================
---- gnome-user-share-3.0.3.orig/src/file-share-properties.c	2012-08-25 03:25:59.000000000 +1200
-+++ gnome-user-share-3.0.3/src/file-share-properties.c	2012-08-25 16:54:53.053074352 +1200
-@@ -85,12 +85,16 @@
- {
-     gboolean enabled, bluetooth_enabled, bluetooth_write_enabled, require_pairing_enabled;
-     gboolean bluetooth_obexpush_enabled, bluetooth_obexpush_notify;
-+	gboolean have_share;
-     char *str;
-     PasswordSetting password_setting;
-     AcceptSetting accept_setting;
-     GtkWidget *check;
-     GtkWidget *password_combo;
-     GtkWidget *password_entry;
-+	GtkWidget *password_combo_label;
-+	GtkWidget *password_entry_label;
-+	GtkWidget *webdav_info;
-     GtkWidget *bluetooth_check;
-     GtkWidget *allow_write_bluetooth_check;
-     GtkWidget *require_pairing_check;
-@@ -119,9 +123,16 @@
-     accept_setting = accept_setting_from_string (str);
-     g_free (str);
- 
-+	str = get_httpd_program ();
-+	have_share = (str ? TRUE : FALSE);
-+	g_free (str);
-+
-     check = GTK_WIDGET (gtk_builder_get_object (builder, "enable_check"));
-     password_combo = GTK_WIDGET (gtk_builder_get_object (builder, "password_combo"));
-     password_entry = GTK_WIDGET (gtk_builder_get_object (builder, "password_entry"));
-+	password_combo_label = GTK_WIDGET (gtk_builder_get_object (builder, "label5"));
-+	password_entry_label = GTK_WIDGET (gtk_builder_get_object (builder, "label4"));
-+	webdav_info = GTK_WIDGET (gtk_builder_get_object (builder, "webdav_info"));
-     bluetooth_check = GTK_WIDGET (gtk_builder_get_object (builder, "enable_bluetooth_check"));
-     allow_write_bluetooth_check = GTK_WIDGET (gtk_builder_get_object (builder, "allow_write_bluetooth_check"));
-     require_pairing_check = GTK_WIDGET (gtk_builder_get_object (builder, "require_pairing_check"));
-@@ -131,8 +142,19 @@
- 
-     /* Network */
-     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), enabled);
--    gtk_widget_set_sensitive (password_combo, enabled);
--    gtk_widget_set_sensitive (password_entry, enabled && password_setting != PASSWORD_NEVER);
-+	gtk_widget_set_sensitive (check, have_share);
-+	gtk_widget_set_sensitive (password_combo_label, have_share);
-+	gtk_widget_set_sensitive (password_entry_label, have_share);
-+	if (have_share) {
-+		gtk_widget_hide (webdav_info);	
-+	} else {
-+		str = g_strdup_printf ("<i>%s</i>", _("This feature cannot be enabled because the required packages are not installed on your system"));
-+		gtk_label_set_markup (GTK_LABEL (webdav_info), str);
-+		gtk_widget_show (webdav_info);
-+		g_free (str);
-+	}
-+    gtk_widget_set_sensitive (password_combo, enabled && have_share);
-+    gtk_widget_set_sensitive (password_entry, enabled && password_setting != PASSWORD_NEVER && have_share);
- 
-     gtk_combo_box_set_active (GTK_COMBO_BOX (password_combo),
- 			      password_setting);
+

=== modified file 'debian/patches/05_autostart_delay.patch'
--- debian/patches/05_autostart_delay.patch	2011-03-11 04:39:02 +0000
+++ debian/patches/05_autostart_delay.patch	2015-08-02 08:27:18 +0000
@@ -1,10 +1,28 @@
 From: Chris Coulson <[e-mail]>
 Description: Add X-GNOME-Autostart-Delay key to autostart file to delay starting by 15 seconds.
 
-Index: gnome-user-share-2.28.2/data/gnome-user-share.desktop.in.in
-===================================================================
---- gnome-user-share-2.28.2.orig/data/gnome-user-share.desktop.in.in	2010-02-18 00:55:06.700536092 +0000
-+++ gnome-user-share-2.28.2/data/gnome-user-share.desktop.in.in	2010-02-18 00:55:53.930513505 +0000
+Index: gnome-user-share-2.28.2/data/gnome-user-share-obexftp.desktop.in.in
+===================================================================
+--- gnome-user-share-2.28.2.orig/data/gnome-user-share-obexftp.desktop.in.in	2010-02-18 00:55:06.700536092 +0000
++++ gnome-user-share-2.28.2/data/gnome-user-share-obexftp.desktop.in.in	2010-02-18 00:55:53.930513505 +0000
+@@ -7,3 +7,4 @@
+ Type=Application
+ Categories=
+ OnlyShowIn=GNOME;
++X-GNOME-Autostart-Delay=15
+Index: gnome-user-share-2.28.2/data/gnome-user-share-obexpush.desktop.in.in
+===================================================================
+--- gnome-user-share-2.28.2.orig/data/gnome-user-share-obexpush.desktop.in.in	2010-02-18 00:55:06.700536092 +0000
++++ gnome-user-share-2.28.2/data/gnome-user-share-obexpush.desktop.in.in	2010-02-18 00:55:53.930513505 +0000
+@@ -7,3 +7,4 @@
+ Type=Application
+ Categories=
+ OnlyShowIn=GNOME;
++X-GNOME-Autostart-Delay=15
+Index: gnome-user-share-2.28.2/data/gnome-user-share-webdav.desktop.in.in
+===================================================================
+--- gnome-user-share-2.28.2.orig/data/gnome-user-share-webdav.desktop.in.in	2010-02-18 00:55:06.700536092 +0000
++++ gnome-user-share-2.28.2/data/gnome-user-share-webdav.desktop.in.in	2010-02-18 00:55:53.930513505 +0000
 @@ -7,3 +7,4 @@
  Type=Application
  Categories=

=== modified file 'debian/patches/06_nodisplay_autostart.patch'
--- debian/patches/06_nodisplay_autostart.patch	2011-07-01 11:37:27 +0000
+++ debian/patches/06_nodisplay_autostart.patch	2015-08-02 08:27:18 +0000
@@ -3,11 +3,29 @@
 Bug-Ubuntu: https://launchpad.net/bugs/803917
 Forwarded: not-needed
 
-Index: gnome-user-share-3.0.0/data/gnome-user-share.desktop.in.in
-===================================================================
---- gnome-user-share-3.0.0.orig/data/gnome-user-share.desktop.in.in	2011-07-01 11:32:13.353773779 +0100
-+++ gnome-user-share-3.0.0/data/gnome-user-share.desktop.in.in	2011-07-01 11:32:35.057774009 +0100
-@@ -8,3 +8,4 @@
+---
+ data/gnome-user-share-obexftp.desktop.in.in  |    1 +
+ data/gnome-user-share-obexpush.desktop.in.in |    1 +
+ data/gnome-user-share-webdav.desktop.in.in   |    1 +
+ 3 files changed, 3 insertions(+)
+
+--- a/data/gnome-user-share-obexftp.desktop.in.in
++++ b/data/gnome-user-share-obexftp.desktop.in.in
+@@ -10,3 +10,4 @@ Type=Application
+ Categories=
+ OnlyShowIn=GNOME;
+ X-GNOME-Autostart-Delay=15
++NoDisplay=true
+--- a/data/gnome-user-share-obexpush.desktop.in.in
++++ b/data/gnome-user-share-obexpush.desktop.in.in
+@@ -10,3 +10,4 @@ Type=Application
+ Categories=
+ OnlyShowIn=GNOME;
+ X-GNOME-Autostart-Delay=15
++NoDisplay=true
+--- a/data/gnome-user-share-webdav.desktop.in.in
++++ b/data/gnome-user-share-webdav.desktop.in.in
+@@ -10,3 +10,4 @@ Type=Application
  Categories=
  OnlyShowIn=GNOME;
  X-GNOME-Autostart-Delay=15

=== modified file 'debian/patches/07_onlyshowin_unity.patch'
--- debian/patches/07_onlyshowin_unity.patch	2011-07-01 11:37:27 +0000
+++ debian/patches/07_onlyshowin_unity.patch	2015-08-02 08:27:18 +0000
@@ -3,24 +3,35 @@
 Bug-Ubuntu: https://launchpad.net/bugs/803519
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=653811
 
-Index: gnome-user-share-3.0.0/data/gnome-user-share-properties.desktop.in
-===================================================================
---- gnome-user-share-3.0.0.orig/data/gnome-user-share-properties.desktop.in	2011-07-01 12:22:32.833805737 +0100
-+++ gnome-user-share-3.0.0/data/gnome-user-share-properties.desktop.in	2011-07-01 12:22:42.525805840 +0100
-@@ -7,7 +7,7 @@
- Terminal=false
- Type=Application
- Categories=GNOME;Settings;X-GNOME-NetworkSettings;
--OnlyShowIn=GNOME;
-+OnlyShowIn=GNOME;Unity;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-user-share
- X-GNOME-Bugzilla-Component=general
-Index: gnome-user-share-3.0.0/data/gnome-user-share.desktop.in.in
-===================================================================
---- gnome-user-share-3.0.0.orig/data/gnome-user-share.desktop.in.in	2011-07-01 12:22:32.801805737 +0100
-+++ gnome-user-share-3.0.0/data/gnome-user-share.desktop.in.in	2011-07-01 12:22:38.413805796 +0100
-@@ -6,6 +6,6 @@
+---
+ data/gnome-user-share-obexftp.desktop.in.in  |    2 +-
+ data/gnome-user-share-obexpush.desktop.in.in |    2 +-
+ data/gnome-user-share-webdav.desktop.in.in   |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/data/gnome-user-share-obexftp.desktop.in.in
++++ b/data/gnome-user-share-obexftp.desktop.in.in
+@@ -8,6 +8,6 @@ Exec=@installdir@/gnome-user-share
+ Terminal=false
+ Type=Application
+ Categories=
+-OnlyShowIn=GNOME;
++OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Delay=15
+ NoDisplay=true
+--- a/data/gnome-user-share-obexpush.desktop.in.in
++++ b/data/gnome-user-share-obexpush.desktop.in.in
+@@ -8,6 +8,6 @@ Exec=@installdir@/gnome-user-share
+ Terminal=false
+ Type=Application
+ Categories=
+-OnlyShowIn=GNOME;
++OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Delay=15
+ NoDisplay=true
+--- a/data/gnome-user-share-webdav.desktop.in.in
++++ b/data/gnome-user-share-webdav.desktop.in.in
+@@ -8,6 +8,6 @@ Exec=@installdir@/gnome-user-share
  Terminal=false
  Type=Application
  Categories=

=== added file 'debian/patches/10_apache_2.4.patch'
--- debian/patches/10_apache_2.4.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/10_apache_2.4.patch	2015-08-02 08:27:18 +0000
@@ -0,0 +1,14 @@
+Author: Emilio Pozuelo Monfort <[e-mail]>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=669729
+
+--- a/data/dav_user_2.4.conf
++++ b/data/dav_user_2.4.conf
+@@ -8,7 +8,7 @@
+ 
+ LimitXMLRequestBody 100000
+ 
+-LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
++#LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
+ LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
+ LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
+ LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so

=== added file 'debian/patches/11_apache_noauth.patch'
--- debian/patches/11_apache_noauth.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/11_apache_noauth.patch	2015-08-02 08:27:18 +0000
@@ -0,0 +1,41 @@
+Index: gnome-user-share-3.8.0/data/dav_user_2.4.conf
+===================================================================
+--- gnome-user-share-3.8.0.orig/data/dav_user_2.4.conf	2013-06-02 17:55:50.539019664 +0200
++++ gnome-user-share-3.8.0/data/dav_user_2.4.conf	2013-06-02 17:59:00.863950116 +0200
+@@ -30,20 +30,28 @@ DNSSDAutoRegisterUserDir Off
+   <Location />
+     DAV On
+ 
+-    AuthType Digest
+-    AuthName "${GUS_LOGIN_LABEL}"
+-    AuthDigestDomain /
+-
+-    AuthDigestProvider file
+-    AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
+-    AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
+-
+     <IfDefine RequirePasswordAlways>
++      AuthType Digest
++      AuthName "${GUS_LOGIN_LABEL}"
++      AuthDigestDomain /
++
++      AuthDigestProvider file
++      AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
++      AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
++
+       Require user guest
+       Require group guest
+     </IfDefine>
+ 
+     <IfDefine RequirePasswordOnWrite>
++      AuthType Digest
++      AuthName "${GUS_LOGIN_LABEL}"
++      AuthDigestDomain /
++
++      AuthDigestProvider file
++      AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
++      AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
++
+       <LimitExcept GET OPTIONS PROPFIND>
+         Require user guest
+         Require group guest

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-01 11:37:27 +0000
+++ debian/patches/series	2015-08-02 08:27:18 +0000
@@ -4,3 +4,5 @@
 05_autostart_delay.patch
 06_nodisplay_autostart.patch
 07_onlyshowin_unity.patch
+10_apache_2.4.patch
+11_apache_noauth.patch

=== modified file 'debian/rules'
--- debian/rules	2011-06-07 10:38:56 +0000
+++ debian/rules	2015-08-02 08:27:18 +0000
@@ -8,12 +8,12 @@
 
 LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 DEB_DH_MAKESHLIBS_ARGS += --exclude=libnautilus-share-extension.so
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
+DEB_CONFIGURE_EXTRA_FLAGS += \
 	--with-httpd=/usr/lib/apache2/mpm-worker/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
+	rmdir -p --ignore-fail-on-non-empty debian/gnome-user-share/etc/xdg
 	find debian/gnome-user-share -name "*.la" -delete
 	rm -rf debian/gnome-user-share/usr/lib/nautilus
-