ubuntu/+source/gnome-user-share:applied/ubuntu/natty-devel

Last commit made on 2011-04-13
Get this branch:
git clone -b applied/ubuntu/natty-devel 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

Name:
applied/ubuntu/natty-devel
Repository:
lp:ubuntu/+source/gnome-user-share

Recent commits

25bd559... by Sebastien Bacher on 2011-04-13

Import patches-applied version 2.30.2-0ubuntu2 to applied/ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 8c0b002548d05040b4abcd20482d317edac35777
Unapplied parent: 7388e88cc7e2870884d1043abe9400ac3fc4a26f

New changelog entries:
  * No change rebuild after promotion to get the translations exported

7388e88... by Sebastien Bacher on 2011-04-13

Import patches-unapplied version 2.30.2-0ubuntu2 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 87661b875683ed5c530fab94823cfc65483c83f0

New changelog entries:
  * No change rebuild after promotion to get the translations exported

8c0b002... by Robert Ancell on 2011-03-11

Import patches-applied version 2.30.2-0ubuntu1 to applied/ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: a85324576f35f9a0843ad2bcb15195fc5e53a2da
Unapplied parent: 87661b875683ed5c530fab94823cfc65483c83f0

New changelog entries:
  * New upstream release
  * debian/control:
    - Use libnotify4-dev instead of libnotify-dev

87661b8... by Robert Ancell on 2011-03-11

Import patches-unapplied version 2.30.2-0ubuntu1 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: a94b0e86e3562e5c62fd93a3dc0e3dcf9f85fee6

New changelog entries:
  * New upstream release
  * debian/control:
    - Use libnotify4-dev instead of libnotify-dev

a853245... by Artur Rona on 2010-12-26

Import patches-applied version 2.30.1-1ubuntu2 to applied/ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 8d7f6973820b876795bfd0f5f40b3ae0af0b3e5f
Unapplied parent: a94b0e86e3562e5c62fd93a3dc0e3dcf9f85fee6

New changelog entries:
  * debian/control: Drop [!linux-any] from Build-Depends to fix FTBFS.

a94b0e8... by Artur Rona on 2010-12-26

Import patches-unapplied version 2.30.1-1ubuntu2 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: fecdeea33e9d2d48f84aebc71356054facc8cc4b

New changelog entries:
  * debian/control: Drop [!linux-any] from Build-Depends to fix FTBFS.

8d7f697... by Artur Rona on 2010-12-26

Import patches-applied version 2.30.1-1ubuntu1 to applied/ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: d8cead6392a9c7735505ff35c70197e45de001e3
Unapplied parent: fecdeea33e9d2d48f84aebc71356054facc8cc4b

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

fecdeea... by Artur Rona on 2010-12-26

Import patches-unapplied version 2.30.1-1ubuntu1 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 637cbf022284a904b3b98cbfccae3a3ae7d348db

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

d8cead6... by Josselin Mouette <email address hidden> on 2010-10-19

Import patches-applied version 2.30.1-1 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 4607e0e5ac11e8f1ae2517893b8e43aae35231fc
Unapplied parent: 637cbf022284a904b3b98cbfccae3a3ae7d348db

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

637cbf0... by Josselin Mouette <email address hidden> on 2010-10-19

Import patches-unapplied version 2.30.1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: cd0aa5eacfc347a491a131bc58a4ff4d60f203d4

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