Last commit made on 2010-09-10
Get this branch:
git clone -b ubuntu/maverick https://git.launchpad.net/ubuntu/+source/gnome-user-share
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

4470959... by Andrew Starr-Bochicchio on 2010-09-10

Import patches-unapplied version 2.30.0-0ubuntu3 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 9d62282c26c10cb44b79619430f0adcdba3b1138

New changelog entries:
  * No-change rebuild against libgnome-bluetooth8.

9d62282... by Chris Coulson on 2010-04-15

Import patches-unapplied version 2.30.0-0ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: f889f712573bed108a7f01a77dcd0c4c00a2c544

New changelog entries:
  * 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)

f889f71... by Robert Ancell on 2010-03-30

Import patches-unapplied version 2.30.0-0ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 9adff30bf752733b90fcc4f52025c16151cae0a4

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

9adff30... by Chris Coulson on 2010-03-02

Import patches-unapplied version 2.29.91-0ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: d9baa1ea38da545d1ee51989534acaccb4bb2305

New changelog entries:
  * 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

d9baa1e... by Chris Coulson on 2010-02-25

Import patches-unapplied version 2.29.91-0ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 3dd9b014d45db74c466bff05c7e466d0c62cdb57

New changelog entries:
  * 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.

3dd9b01... by Chris Coulson on 2010-02-18

Import patches-unapplied version 2.28.2-4ubuntu3 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: f5c26758e7032ff15efc4a80caebecdcb1409e6a

New changelog entries:
  * 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.

f5c2675... by Sebastien Bacher on 2010-02-17

Import patches-unapplied version 2.28.2-4ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 5144c4ae82b903a273a6edcdb5ddde46e6c3e95f

New changelog entries:
  * 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)

5144c4a... by Chris Coulson on 2010-02-06

Import patches-unapplied version 2.28.2-4ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 1771a2cf873e6694ee074ce8043c3fc9b2bd0795

New changelog entries:
  * 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
    - 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

1771a2c... by Luca Falavigna on 2010-01-17

Import patches-unapplied version 2.28.2-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 081b4a0110d74cd976eee4877e9b9581bf4b6468

New changelog entries:
  * 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.

081b4a0... by Andrea Veri on 2010-01-15

Import patches-unapplied version 2.28.2-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 12fdf2b30992ebef87420173071114bd089fe8d1

New changelog entries:
  * 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)