lp:~ubuntu-branches/ubuntu/natty/gvfs/natty-201108221812

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/natty/gvfs

Ubuntu branches: Pending requested 2011-08-22

Diff: 491 lines (+449/-6) (has conflicts)

7 files modified

debian/gvfs-backends.debhelper.log (+0/-1)
debian/gvfs-bin.debhelper.log (+0/-1)
debian/gvfs-fuse.debhelper.log (+0/-1)
debian/gvfs.debhelper.log (+0/-1)
debian/libgvfscommon-dev.debhelper.log (+0/-1)
debian/libgvfscommon0.debhelper.log (+0/-1)
debian/patches/90_git_leaks_fixes.patch (+449/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

156. By Sebastien Bacher on 2011-04-15

releasing version 1.8.0-0ubuntu2

155. By Robert Ancell on 2011-04-06

releasing version 1.8.0-0ubuntu1

154. By Sebastien Bacher on 2011-03-22

Correctly update using merge-upstream otherwise the diff will be reverted
in the diff.gz.

153. By Robert Ancell on 2011-03-22

* New upstream release
* debian/control:
  - Set version on libfuse-dev build-depends

152. By Robert Ancell on 2011-02-07

New upstream release.

151. By Robert Ancell on 2011-01-18

* New upstream release.
* debian/control:
  - Bump build-depends on libimobiledevice-dev
  - Add build-depends on libplist-dev

150. By Sebastien Bacher on 2010-12-02

* New upstream release.
* debian/patches/03_no_gconf.patch:
  - dropped, it's in the new version
* debian/control.in:
  - don't build-depends on libgconf2-dev
* debian/gvfs.install:
  - install the gsettings schemas and gconf version script

149. By Robert Ancell on 2010-11-26

* New upstream release.
* debian/control:
  - Build-depend on dh-autoreconf
  - Use standards version 3.9.1
* debian/rules:
  - Use autoreconf.mk
  - Build with --disable-gconf (it doesn't build with recent glib)
* debian/patches/03_no_gconf.patch:
  - Don't build the gconf module, it fails to build on recent glib

148. By Daniel T Chen on 2010-10-25

Apply patch from GNOME bug #627567 at
http://bugzilla-attachments.gnome.org/attachment.cgi?id=172274
to circumvent the possibility of data loss (LP: #658069).

147. By Mathieu Trudel-Lapierre on 2010-09-29

* New upstream release 1.6.4, major changes:
  - Lots of translation updates
  - afc: Add support for photo thumbnails on iOS4
  - daemons: Move GConf initialization from backend constructor
  - sftp: Use poll() to cope with openssh-5.6 changes
* debian/patches/debian-changes-1.6.3-0ubuntu1:
  - removed, introduced in previous upload by mistake
* debian/patches/git_gconf_init.patch:
  - obsolete.
* debian/patches/git_backout_sftp_commit_c6be45c.patch:
  - revert git commit c6be45c
  - allows sftp calls to complete and not fail with a timeout.