lp:~ubuntu-branches/ubuntu/maverick/gnome-user-share/maverick-201009101912

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/maverick/gnome-user-share

No reviews requested

Diff: 0 lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

24. By Andrew Starr-Bochicchio on 2010-09-10

No-change rebuild against libgnome-bluetooth8.

23. By Chris Coulson on 2010-04-15

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)

22. By Robert Ancell on 2010-03-30

* New upstream release:
  - Updated translations
* debian/patches/06-fix-extension-type-name.patch:
  - Applied upstream

21. By Chris Coulson on 2010-03-02

* 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

20. By Chris Coulson on 2010-02-25

* 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.

19. By Chris Coulson on 2010-02-18

* 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.

18. By Sebastien Bacher on 2010-02-17

* 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)

17. By Chris Coulson on 2010-02-06

* 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

16. By Chris Coulson on 2009-09-22

* New upstream release (LP: #434548):
  - Fix WebDAV share name being untranslated
  - Updated translations

15. By Chris Coulson on 2009-09-08

* 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.