Merge lp://qastaging/~ubuntu-branches/ubuntu/maverick/gvfs/maverick-201103281657 into lp://qastaging/ubuntu/maverick/gvfs
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/maverick/gvfs/maverick-201103281657 |
| Merge into: | lp://qastaging/ubuntu/maverick/gvfs |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/maverick/gvfs/maverick-201103281657 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/gvfs now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/gvfs/maverick-201103281657. A merge should be performed if necessary.
Unmerged revisions
- 137. By Martin Pitt
-
releasing version 1.6.4-0ubuntu1
- 136. By Mathieu Trudel-Lapierre
-
Adding NEWS items to changelog "upstream release entry":
* 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 - 135. By Mathieu Trudel-Lapierre
-
* debian/
patches/ git_backout_ sftp_commit_ c6be45c. patch:
- revert git commit c6be45c
- allows sftp calls to complete and not fail with a timeout. - 134. By Mathieu Trudel-Lapierre
-
* debian/
patches/ git_gconf_ init.patch:
- obsolete. - 133. By Mathieu Trudel-Lapierre
-
* debian/
patches/ debian- changes- 1.6.3-0ubuntu1:
- removed, introduced in previous upload by mistake - 132. By Mathieu Trudel-Lapierre
-
New upstream release 1.6.4.
- 131. By Mathieu Trudel-Lapierre
-
Revert all patches to ensure future merge-upstream tasks will succeed.
