--- gnome-user-share-2.30.2.orig/debian/control.in +++ gnome-user-share-2.30.2/debian/control.in @@ -0,0 +1,41 @@ +Source: gnome-user-share +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastian Dröge +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs, + debhelper (>= 5), + gnome-pkg-tools, + quilt, + intltool (>= 0.35.0), + gnome-doc-utils, + rarian-compat, + libxt-dev, + pkg-config, + libdbus-1-dev (>= 1.1.1), + libglib2.0-dev (>= 2.15.2), + libgtk2.0-dev (>= 2.12.0), + libgconf2-dev, + libdbus-glib-1-dev, + libnotify4-dev, + libcanberra-gtk-dev, + libselinux1-dev, + libgnome-bluetooth-dev (>= 2.27.7.2), + libunique-dev, + libnautilus-extension-dev +Standards-Version: 3.9.0 +Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-user-share/ubuntu + +Package: gnome-user-share +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + obex-data-server [linux-any], + gnome-bluetooth [linux-any] +Suggests: apache2.2-bin, + libapache2-mod-dnssd (>= 0.6) +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.30.2.orig/debian/copyright +++ gnome-user-share-2.30.2/debian/copyright @@ -0,0 +1,43 @@ +This package was debianized by Jeff Waugh 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 + Bastien Nocera + +Copyright Holders: + Copyright © 2004-2008 Red Hat, Inc. + Copyright © 2004-2005 Shaun McCance + +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-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. + --- gnome-user-share-2.30.2.orig/debian/control +++ gnome-user-share-2.30.2/debian/control @@ -0,0 +1,46 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: gnome-user-share +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastian Dröge +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Luca Falavigna +Build-Depends: cdbs, + debhelper (>= 5), + gnome-pkg-tools, + quilt, + intltool (>= 0.35.0), + gnome-doc-utils, + rarian-compat, + libxt-dev, + pkg-config, + libdbus-1-dev (>= 1.1.1), + libglib2.0-dev (>= 2.15.2), + libgtk2.0-dev (>= 2.12.0), + libgconf2-dev, + libdbus-glib-1-dev, + libnotify4-dev, + libcanberra-gtk-dev, + libselinux1-dev, + libgnome-bluetooth-dev (>= 2.27.7.2), + libunique-dev, + libnautilus-extension-dev +Standards-Version: 3.9.0 +Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-user-share/ubuntu + +Package: gnome-user-share +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + obex-data-server [linux-any], + gnome-bluetooth [linux-any] +Suggests: apache2.2-bin, + libapache2-mod-dnssd (>= 0.6) +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.30.2.orig/debian/rules +++ gnome-user-share-2.30.2/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.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_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 + rm -rf debian/gnome-user-share/usr/lib/nautilus --- gnome-user-share-2.30.2.orig/debian/gconf-defaults +++ gnome-user-share-2.30.2/debian/gconf-defaults @@ -0,0 +1 @@ +/desktop/gnome/file_sharing/bluetooth_notify true --- gnome-user-share-2.30.2.orig/debian/compat +++ gnome-user-share-2.30.2/debian/compat @@ -0,0 +1 @@ +5 --- gnome-user-share-2.30.2.orig/debian/changelog +++ gnome-user-share-2.30.2/debian/changelog @@ -0,0 +1,629 @@ +gnome-user-share (2.30.2-0ubuntu1) natty; urgency=low + + * New upstream release + * debian/control: + - Use libnotify4-dev instead of libnotify-dev + + -- Robert Ancell Fri, 11 Mar 2011 15:39:09 +1100 + +gnome-user-share (2.30.1-1ubuntu2) natty; urgency=low + + * debian/control: Drop [!linux-any] from Build-Depends to fix FTBFS. + + -- Artur Rona Sun, 26 Dec 2010 18:32:34 +0100 + +gnome-user-share (2.30.1-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: + + Build-depend on rarian-compat rather than scrollkeeper. + + Add Vcs-Bzr link related to Ubuntu Desktop Team. + + Suggests the apache2.2-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, when obex push is enabled. + - 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: + + Ensure the WebDAV sharing toggle button clears if Apache could + not be started. + + 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. This is a stop-gap measure until + add a button in the UI for installing the required components + via AptDaemon. + - debian/patches/05_autostart_delay.patch: Add X-GNOME-Autostart-Delay + key to autostart file to delay starting by 15 seconds. + - debian/patches/90_relibtoolize.patch: Dropped, not needed anymore. + - debian/{preinst,rules}: Don't move autostart file from + /etc/xdg/autostart to /usr/share/gnome/autostart. + Upstream use the former. + - debian/rules: Don't install the Nautilus bar for Lucid. It's not + that useful to people who don't have bluetooth hardware and is not + easily disabled. In the future, this bar will hide when the + hardware is not available. + * debian/control: Use [!linux-any] instead [linux-any] to satisfy + Build-Depends. + + -- Artur Rona Sun, 26 Dec 2010 14:39:46 +0100 + +gnome-user-share (2.30.1-1) unstable; urgency=low + + * Drop type-handling usage. Closes: #587876. + * Bump standards version accordingly. + * New upstream translation and bugfix release. + * 03_NAUTILUS_IS_USER_SHARE.patch: dropped, merged upstream. + * 90_relibtoolize.patch: regenerated. + + -- Josselin Mouette Wed, 20 Oct 2010 00:06:37 +0200 + +gnome-user-share (2.30.1-0ubuntu1) natty; urgency=low + + * New upstream version + * debian/patches/07-fix-undefined-macro.patch: + - dropped, the fix is in the new version + + -- Sebastien Bacher Mon, 08 Nov 2010 15:12:19 +0100 + +gnome-user-share (2.30.0-1) unstable; urgency=low + + [ Emilio Pozuelo Monfort ] + * debian/watch: + - Only track stable releases. + + [ Luca Falavigna ] + * New upstream release. + * Refresh patches for new upstream release: + - 02_bluetooth_optional.patch + - 90_relibtoolize.patch + * debian/patches/03_makefile_error.patch: + - Removed, fixed upstream. + * debian/patches/03_NAUTILUS_IS_USER_SHARE.patch: + - Fix use of undefined macro NAUTILUS_IS_SHARE. + * debian/control.in: + - Build-depend on libnautilus-extension-dev. + - Bump Standards-Version to 3.8.4, no changes required. + * debian/rules: + - Do not consider libnautilus-share-extension a shared library. + + -- Luca Falavigna Sun, 04 Apr 2010 18:48:44 +0200 + +gnome-user-share (2.30.0-0ubuntu2) lucid; urgency=low + + * Don't install the Nautilus bar for Lucid. It's not that useful to people + who don't have bluetooth hardware and is not easily disabled. In the + future, this bar will hide when the hardware is not available (LP: #532101) + + -- Chris Coulson Thu, 15 Apr 2010 01:20:19 +0100 + +gnome-user-share (2.30.0-0ubuntu1) lucid; urgency=low + + * New upstream release: + - Updated translations + * debian/patches/06-fix-extension-type-name.patch: + - Applied upstream + + -- Robert Ancell Tue, 30 Mar 2010 15:14:29 +1100 + +gnome-user-share (2.29.91-0ubuntu2) lucid; urgency=low + + * debian/patches/06-fix-extension-type-name.patch: + - Fix backported from GIT to change the object name from NautilusShare + to NautilusUserShare in the nautilus extension, to not conflict + with nautilus-share's extension (LP: #530684) + * debian/patches/07-fix-undefined-macro.patch: + - Fix use of undefined macro + + -- Chris Coulson Tue, 02 Mar 2010 15:55:11 +0000 + +gnome-user-share (2.29.91-0ubuntu1) lucid; urgency=low + + * New upstream version + - Add a helper bar in nautilus to enable/disable sharing + - Don't use Bonded and trusted terms in the UI + - Many other fixes + * debian/control: + - Add build-depend on libnautilus-extension-dev + * Drop 02_bluetooth_optional.patch: this comes from Debian and enables + Bluetooth support to be configurable at build-time. However, 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. + * Drop 03_makefile_error.patch - fixed upstream. + * Drop 90_relibtoolize.patch - not needed anymore. + * Reapply 01_notification.patch again. This seems to have been dropped + off the last upload. + * 04_webdav_optional.patch: + - Update to apply cleanly to new version. + - Don't update GConf setting for WebDAV sharing from the daemon if + Apache can't be started. This just adds unnecessary complexity. + + -- Chris Coulson Thu, 25 Feb 2010 21:55:56 +0000 + +gnome-user-share (2.28.2-4ubuntu3) lucid; urgency=low + + * debian/control: + - Add Vcs-Bzr URL info + - Bump Standards-Version to 3.8.4. No other changes required. + - Set maintainer to Ubuntu Desktop Team. + * debian/patches/04_webdav_optional.patch: + - Ensure the WebDAV sharing toggle button clears if Apache could + not be started + - 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. This is a stop-gap measure until + I add a button in the UI for installing the required components + via AptDaemon. + * debian/patches/05_autostart_delay.patch: + - Add X-GNOME-Autostart-Delay key to autostart file to delay starting + by 15 seconds. + * debian/gconf-defaults: + - Enable notifications on receipt of files by default, when obex push + is enabled. + + -- Chris Coulson Thu, 18 Feb 2010 00:56:10 +0000 + +gnome-user-share (2.28.2-4ubuntu2) lucid; urgency=low + + * debian/control.in: + - suggests the apache2.2-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. + Other changes will be made before lucid to get those installed when the + option for webdav sharing is activated in the preference dialog. + (lp: #519953) + + -- Sebastien Bacher Wed, 17 Feb 2010 15:45:38 +0100 + +gnome-user-share (2.28.2-4ubuntu1) lucid; urgency=low + + * Merge with Debian unstable, remaining changes: + - debian/control: + + Build-depend on rarian-compat rather than scrollkeeper + - debian/patches/01_notification.patch: + + Display an alert box instead of a notification for files + recieved. + - debian/{rules,preinst}: + + Don't move autostart file from /etc/xdg/autostart to + /usr/share/gnome/autostart. Upstream use the former. + - Remove debian/dirs: we don't need to create /usr/share/gnome + + -- Chris Coulson Sat, 06 Feb 2010 23:53:16 +0000 + +gnome-user-share (2.28.2-4) unstable; urgency=low + + * debian/patches/02_bluetooth_optional.patch: + - Re-add HAVE_BLUETOOTH macro, erroneously removed (Closes: #563614). + * debian/patches/90_relibtoolize.patch: + - Regenerate to pick the above change. + + -- Luca Falavigna Mon, 18 Jan 2010 00:33:29 +0100 + +gnome-user-share (2.28.2-3) unstable; urgency=low + + * debian/control.in: + - adding back obex-data-server depends since g-u-s + actually needs it and not obexd-server itself. (there's + no GNOME package using obexd-server at the moment) + + -- Andrea Veri Fri, 15 Jan 2010 14:40:50 +0100 + +gnome-user-share (2.28.2-2) unstable; urgency=low + + * debian/patches/90_relibtoolize.patch: + - Regenerate it from scratch, previous attempt was unsuccessful and + caused build failures on some ports. + + -- Luca Falavigna Wed, 23 Dec 2009 00:10:27 +0100 + +gnome-user-share (2.28.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Depend on obexd-server, not obex-data-server. + + [ Luca Falavigna ] + * New upstream bugfix release. + * Refresh patches for new upstream release. + * debian/control: + - Add libunique-dev to Build-Depends. + + -- Luca Falavigna Tue, 22 Dec 2009 21:18:06 +0000 + +gnome-user-share (2.28.1-3) unstable; urgency=low + + * Oops, it’s not+linux-gnu, not not+linux. + + -- Josselin Mouette Sat, 14 Nov 2009 14:47:38 +0100 + +gnome-user-share (2.28.1-2) unstable; urgency=low + + * Switch to quilt to manage patches. + * 02_bluetooth_optional.patch: new patch. Make bluetooth support + optional so that it can build on kFreeBSD. + * Only require bluetooth stuff on Linux architectures. + * 03_makefile_error.patch: new patch. Fix error in Makefile.am leading + to automake being unable to run. + * 90_relibtoolize.patch: re-run the autotools on top of that. + + -- Josselin Mouette Sat, 14 Nov 2009 13:32:09 +0100 + +gnome-user-share (2.28.1-1) unstable; urgency=low + + * New upstream bugfix release. + * debian/control.in: + - Build-depend on libcanberra-gtk. + + -- Luca Falavigna Sun, 01 Nov 2009 14:58:58 +0100 + +gnome-user-share (2.28.0-1) unstable; urgency=low + + [ Andrea Veri ] + * New upstream release. + * debian/control.in: + - bumped standards-version to latest 3.8.3. No changes + needed. + - added a B-D on libgnome-bluetooth-dev as per configure.in + requirements. + * debian/copyright: + - added missing copyright holders. + + [ Luca Falavigna ] + * debian/copyright: + - Point to versioned GPL license in common-licenses. + + -- Luca Falavigna Sat, 10 Oct 2009 12:53:35 +0200 + +gnome-user-share (2.28.0-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #434548): + - Fix WebDAV share name being untranslated + - Updated translations + + -- Chris Coulson Tue, 22 Sep 2009 23:37:00 +0100 + +gnome-user-share (2.27.0-0ubuntu1) karmic; urgency=low + + * New upstream version (LP: #426008): + - Fix WebDAV sharing not working when service names are too long + - Fix login problems to WebDAV + - Don't error out if the Obex services are already started + - Fix Obex services not working any more when bluetoothd is exited + - UI fixes for rejected ObexPush transfers + * debian/control: + - Add build-depend on libgnome-bluetooth-dev (>= 2.27.7.2). + - Depend on gnome-bluetooth rather than bluez-gnome|gnome-bluetooth. + gnome-bluetooth is on the default install now and this reduces the + delta to Debian. + * Update debian/patches/01_notification.patch. + + -- Chris Coulson Tue, 08 Sep 2009 21:11:31 +0100 + +gnome-user-share (2.26.0-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + Build-depend on rarian-compat rather than scrollkeeper. + + Depend on bluez-gnome|gnome-bluetooth rather than just + gnome-bluetooth. + - debian/patches/01_notification.patch: + + Display an alert box instead of a notification for files + recieved. + - debian/{rules,preinst}: + + Don't move autostart file from /etc/xdg/autostart to + /usr/share/gnome/autostart. Upstream use the former. + - Remove debian/dirs: we don't need to create /usr/share/gnome. + + -- Chris Coulson Sat, 05 Sep 2009 01:27:39 +0100 + +gnome-user-share (2.26.0-2) unstable; urgency=low + + * Build-depend on scrollkeeper. Closes: #536318. + + -- Josselin Mouette Sat, 11 Jul 2009 11:27:45 +0200 + +gnome-user-share (2.26.0-1) unstable; urgency=low + + [ Loic Minier ] + * Don't rm_conffile /etc/xdg/autostart/gnome-user-share-session.desktop + during first installation. + + [ Josselin Mouette ] + * Wrap build-depends and depends. + * New upstream release. Closes: #530761. + * 01_apache-config.patch: updated for the new version, removed + obsolete chunk. + * Only depend on apache2.2-bin. Kudos to the Apache maintainers for + making this possible. + * Explicitly use the path to the worker variant of Apache. + * Require the package that contains mod_dnssd. + * Depend on gnome-bluetooth instead of bluez-gnome. + * Require obex-data-server 0.4 for the new API. + * Move autostart file to /usr/share/gnome/autostart. + * preinst: remove the conffile accordingly. + + -- Josselin Mouette Sat, 27 Jun 2009 11:12:12 +0200 + +gnome-user-share (2.26.0-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #372386): + - translations update + * debian/control.in: + - depends on bluez-gnome OR gnome-bluetooth => 2.27.0 + + -- Baptiste Mille-Mathias Sun, 12 Apr 2009 09:37:28 +0200 + +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 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 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 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 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 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 Thu, 10 Apr 2008 08:43:56 +0200 + +gnome-user-share (0.31-1) unstable; urgency=low + + * New upstream release. + + -- Sebastian Dröge 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 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 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 Sun, 06 Jan 2008 19:52:14 +0100 + +gnome-user-share (0.11-2) unstable; urgency=low + + * Upload to unstable + + -- Sebastian Dröge 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 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 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 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 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 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 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 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 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 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 Wed, 21 Dec 2005 19:18:04 +0100 + +gnome-user-share (0.8-1) unstable; urgency=low + + * New upstream release + + -- Sebastian Dröge 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 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 Wed, 9 Nov 2005 12:02:33 +0100 + +gnome-user-share (0.4-1) hoary; urgency=low + + * New upstream release + + -- Jeff Waugh 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 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 Sat, 27 Nov 2004 00:06:14 +1100 + +gnome-user-share (0.3-1) hoary; urgency=low + + * Initial Release + + -- Jeff Waugh Tue, 01 Jun 2004 16:14:59 +1000 + --- gnome-user-share-2.30.2.orig/debian/preinst +++ gnome-user-share-2.30.2/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-nl "0.31-3"; then + rm_conffile "/etc/xdg/autostart/gnome-user-share-session.desktop" + fi +esac + +#DEBHELPER# + +exit 0 --- gnome-user-share-2.30.2.orig/debian/watch +++ gnome-user-share-2.30.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://ftp.gnome.org/pub/gnome/sources/gnome-user-share/([\d\.]+)[02468]/ \ + gnome-user-share-([\d\.]+)\.tar\.gz --- gnome-user-share-2.30.2.orig/debian/patches/01_notification.patch +++ gnome-user-share-2.30.2/debian/patches/01_notification.patch @@ -0,0 +1,284 @@ +From: Ken VanDine +Description: Display an alert box instead of a notification for files received. +Bug: http://bugzilla.gnome.org/578226 +Bug-Ubuntu: https://launchpad.net/bugs/337352 +Forwarded: yes +Author: Cody Russell + +diff -Nur -x '*.orig' -x '*~' gnome-user-share-2.28.2/src/obexpush.c gnome-user-share-2.28.2.new/src/obexpush.c +--- gnome-user-share-2.28.2/src/obexpush.c 2009-12-11 13:05:50.000000000 +0000 ++++ gnome-user-share-2.28.2.new/src/obexpush.c 2010-02-06 23:16:41.910148240 +0000 +@@ -68,52 +68,79 @@ + } + + static void +-notification_launch_action_on_file_cb (NotifyNotification *notification, +- const char *action, +- const char *file_uri) ++launch_file_viewer (const gchar *file_uri) + { +- GdkScreen *screen; +- GAppLaunchContext *ctx; ++ GdkAppLaunchContext *ctx = NULL; + GTimeVal val; + +- g_assert (action != NULL); ++ 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 = 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; ++ 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) ++{ ++ g_assert (action != NULL); ++ + /* 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); +@@ -122,12 +149,73 @@ + } + + static void ++on_dialog_response (GtkDialog *dialog, ++ gint response_id, ++ gpointer user_data) ++{ ++ char *file_uri = (char *)user_data; ++ ++ switch (response_id) { ++ 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: ++ case GTK_RESPONSE_DELETE_EVENT: ++ /* "OK" dismisses the alert box without further action. */ ++ break; ++ default: ++ g_assert_not_reached (); ++ break; ++ } ++ ++ g_free (file_uri); ++ gtk_widget_destroy (GTK_WIDGET (dialog)); ++ hide_statusicon (); ++} ++ ++static gboolean ++supports_actions (void) ++{ ++ 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; + ca_context *ctx; + GAppInfo *app; ++ GtkWidget *dialog; ++ GtkWidget *image; + + file_uri = g_filename_to_uri (filename, NULL, NULL); + if (file_uri == NULL) { +@@ -135,36 +223,65 @@ + return; + } + +- 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 (_("You received a file"), +- notification_text, +- "dialog-information"); +- +- 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) { +- g_object_unref (app); +- notify_notification_add_action (notification, "display", _("Open File"), ++ g_free (mime_type); ++ ++ display = g_filename_display_basename (filename); ++ ++ if (supports_actions ()) { ++ /* Translators: %s is the name of the filename received */ ++ notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display); ++ notification = notify_notification_new (_("You received a file"), ++ notification_text, ++ "dialog-information"); ++ ++ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); ++ ++ if (app != NULL) { ++ notify_notification_add_action (notification, "display", _("Open File"), ++ (NotifyActionCallback) notification_launch_action_on_file_cb, ++ g_strdup (file_uri), (GFreeFunc) g_free); ++ } ++ notify_notification_add_action (notification, "reveal", _("Reveal File"), + (NotifyActionCallback) notification_launch_action_on_file_cb, + g_strdup (file_uri), (GFreeFunc) g_free); +- } +- notify_notification_add_action (notification, "reveal", _("Reveal File"), +- (NotifyActionCallback) notification_launch_action_on_file_cb, +- g_strdup (file_uri), (GFreeFunc) g_free); + +- g_free (file_uri); +- +- g_signal_connect (G_OBJECT (notification), "closed", G_CALLBACK (on_close_notification), notification); ++ 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 { ++ dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE, ++ _("You have received the file “%s” over Bluetooth."), display, ++ 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")); ++ if (app != NULL) { ++ gtk_dialog_add_button (GTK_DIALOG (dialog), ++ _("Open"), GTK_RESPONSE_YES); ++ } ++ gtk_dialog_add_buttons (GTK_DIALOG (dialog), ++ _("Reveal"), GTK_RESPONSE_APPLY, ++ _("OK"), GTK_RESPONSE_OK, ++ NULL); ++ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); ++ g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (on_dialog_response), g_strdup (file_uri)); + +- if (!notify_notification_show (notification, NULL)) { +- g_warning ("failed to send notification\n"); ++ gtk_widget_show_all (dialog); + } +- g_free (notification_text); ++ ++ if (app != NULL) ++ g_object_unref (app); ++ g_free (file_uri); ++ g_free (display); + + /* Now we do the audio notification */ + ctx = ca_gtk_context_get (); --- gnome-user-share-2.30.2.orig/debian/patches/05_autostart_delay.patch +++ gnome-user-share-2.30.2/debian/patches/05_autostart_delay.patch @@ -0,0 +1,12 @@ +From: Chris Coulson +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 +@@ -7,3 +7,4 @@ + Type=Application + Categories= + OnlyShowIn=GNOME; ++X-GNOME-Autostart-Delay=15 --- gnome-user-share-2.30.2.orig/debian/patches/04_webdav_optional.patch +++ gnome-user-share-2.30.2/debian/patches/04_webdav_optional.patch @@ -0,0 +1,233 @@ +From: Chris Coulson +Description: + - Ensure the WebDAV sharing toggle button clears if Apache could not be started. + - 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. This is a stop-gap measure until add a button in the UI for installing the required components via AptDaemon. + +Index: gnome-user-share-2.29.91/src/user_share-private.c +=================================================================== +--- gnome-user-share-2.29.91.orig/src/user_share-private.c 2010-02-28 14:04:45.845399147 +0000 ++++ gnome-user-share-2.29.91/src/user_share-private.c 2010-02-28 14:04:51.795415906 +0000 +@@ -25,6 +25,7 @@ + #include "config.h" + + #include ++#include + + #include "user_share-private.h" + +@@ -101,4 +102,29 @@ + return ACCEPT_BONDED; + } + ++static const char *known_httpd_locations [] = { ++ HTTPD_PROGRAM, ++ "/usr/sbin/httpd", ++ "/usr/sbin/httpd2", ++ "/usr/sbin/apache2", ++ NULL ++}; ++ ++char* ++get_httpd_program () ++{ ++ int i; + ++ for (i = 0; known_httpd_locations[i]; i++) { ++ if (known_httpd_locations[i][0] == '\0') { ++ /* empty string as first element, happens when ++ * configured --with-httpd=auto */ ++ continue; ++ } ++ if (g_file_test (known_httpd_locations[i], G_FILE_TEST_IS_EXECUTABLE) ++ && ! g_file_test (known_httpd_locations[i], G_FILE_TEST_IS_DIR)) { ++ return g_strdup (known_httpd_locations[i]); ++ } ++ } ++ return NULL; ++} +Index: gnome-user-share-2.29.91/src/user_share-private.h +=================================================================== +--- gnome-user-share-2.29.91.orig/src/user_share-private.h 2010-02-28 14:04:45.835393406 +0000 ++++ gnome-user-share-2.29.91/src/user_share-private.h 2010-02-28 14:04:51.795415906 +0000 +@@ -54,4 +54,6 @@ + const char *accept_string_from_setting (AcceptSetting setting); + AcceptSetting accept_setting_from_string (const char *str); + ++char *get_httpd_program (void); ++ + #endif /* _USER_SHARE_PRIVATE_H_ */ +Index: gnome-user-share-2.29.91/src/http.c +=================================================================== +--- gnome-user-share-2.29.91.orig/src/http.c 2010-02-28 14:04:45.865390795 +0000 ++++ gnome-user-share-2.29.91/src/http.c 2010-02-28 14:07:54.572892514 +0000 +@@ -217,33 +217,6 @@ + #endif + } + +-static const char *known_httpd_locations [] = { +- HTTPD_PROGRAM, +- "/usr/sbin/httpd", +- "/usr/sbin/httpd2", +- "/usr/sbin/apache2", +- NULL +-}; +- +-static char* +-get_httpd_program () +-{ +- int i; +- +- for (i = 0; known_httpd_locations[i]; i++) { +- if (known_httpd_locations[i][0] == '\0') { +- /* empty string as first element, happens when +- * configured --with-httpd=auto */ +- continue; +- } +- if (g_file_test (known_httpd_locations[i], G_FILE_TEST_IS_EXECUTABLE) +- && ! g_file_test (known_httpd_locations[i], G_FILE_TEST_IS_DIR)) { +- return g_strdup (known_httpd_locations[i]); +- } +- } +- return NULL; +-} +- + static const char *known_httpd_modules_locations [] = { + HTTPD_MODULES_PATH, + "/etc/httpd/modules", +Index: gnome-user-share-2.29.91/data/file-share-properties.ui +=================================================================== +--- gnome-user-share-2.29.91.orig/data/file-share-properties.ui 2010-02-28 14:04:45.825391017 +0000 ++++ gnome-user-share-2.29.91/data/file-share-properties.ui 2010-02-28 14:04:51.795415906 +0000 +@@ -42,7 +42,7 @@ + + + True +- 3 ++ 4 + 2 + 12 + 6 +@@ -53,8 +53,8 @@ + + 1 + 2 +- 1 +- 2 ++ 2 ++ 3 + GTK_FILL + + +@@ -67,8 +67,8 @@ + + 1 + 2 +- 2 +- 3 ++ 3 ++ 4 + + + +@@ -82,6 +82,8 @@ + True + + ++ 1 ++ 2 + 2 + GTK_FILL + +@@ -96,8 +98,8 @@ + password_entry + + +- 2 +- 3 ++ 3 ++ 4 + GTK_SHRINK | GTK_FILL + + +@@ -110,8 +112,19 @@ + password_combo + + +- 1 +- 2 ++ 2 ++ 3 ++ GTK_SHRINK | GTK_FILL ++ ++ ++ ++ ++ ++ False ++ True ++ ++ ++ 2 + GTK_SHRINK | GTK_FILL + + +Index: gnome-user-share-2.29.91/src/file-share-properties.c +=================================================================== +--- gnome-user-share-2.29.91.orig/src/file-share-properties.c 2010-02-28 14:09:46.435393548 +0000 ++++ gnome-user-share-2.29.91/src/file-share-properties.c 2010-02-28 14:16:12.902890884 +0000 +@@ -88,12 +88,16 @@ + GConfClient *client; + 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; +@@ -130,9 +134,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")); +@@ -142,8 +153,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 ("%s", _("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); --- gnome-user-share-2.30.2.orig/debian/patches/series +++ gnome-user-share-2.30.2/debian/patches/series @@ -0,0 +1,4 @@ +01_apache-config.patch +01_notification.patch +04_webdav_optional.patch +05_autostart_delay.patch --- gnome-user-share-2.30.2.orig/debian/patches/01_apache-config.patch +++ gnome-user-share-2.30.2/debian/patches/01_apache-config.patch @@ -0,0 +1,17 @@ +--- a/data/dav_user_2.2.conf.orig 2009-06-27 10:28:32.044136148 +0200 ++++ b/data/dav_user_2.2.conf 2009-06-27 10:30:11.067899425 +0200 +@@ -14,11 +14,14 @@ + LoadModule auth_digest_module ${HTTP_MODULES_PATH}/mod_auth_digest.so + LoadModule authz_groupfile_module ${HTTP_MODULES_PATH}/mod_authz_groupfile.so + LoadModule dnssd_module ${HTTP_MODULES_PATH}/mod_dnssd.so ++LoadModule mime_module ${HTTP_MODULES_PATH}/mod_mime.so + + DNSSDEnable on + DNSSDAutoRegisterVHosts Off + DNSSDAutoRegisterUserDir Off + ++TypesConfig /etc/mime.types ++ + + DocumentRoot ${XDG_PUBLICSHARE_DIR} +