Merge lp:~ubuntu-branches/ubuntu/precise/claws-mail/precise-201110260518 into lp:ubuntu/precise/claws-mail

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/claws-mail reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/claws-mail/precise-201110260518. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

45. By Barry Warsaw on 2011-10-25

* Merge with Debian testing. Remaining Ubuntu changes:
  - debian/patches/50disable_can_change_accels_by_default:
    the gtk_can_change_accels pref which allows to change keyboard shortcuts
    from Gtk+ menus default to false for consistence with the GNOME default
    and other UME apps. (LP: #223840)
  - debian/claws-mail.desktop: Correctly register x-scheme-handler/mailto
* debian/control
- Remove dependency on obsolete libgnomeprint (thanks for the
  patch goes to Michael Biebl) (Closes: #644562)
* debian/copyright
- Add missing standalone license paragraph (thanks lintian!)
* New upstream release
- Includes fixes for forwarded bugs:
  'nntp auth is broken' (Closes: #625732)
  'POP-SSL defunct after upgrade of libgnutls26' (Closes: #638823)
* debian/rules, debian/claws-mail.desktop
- Remove desktop file, just use upstream's one (Closes: #610342)
- Add build-arch and build-indep targets to make lintian happy
- Use -k to keep upstream changelog name and avoid duplication
* debian/control
- Use linux-any instead of negated list (Closes: #634613)
- Development moved to git.debian.org: added Vcs-* headers
* debian/patches/14compose_read.patch, debian/patches/series
- Added option to read composed mail from file (Closes: #544868)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-10-25 17:57:11 +0000
+++ .pc/applied-patches	2011-10-26 05:24:24 +0000
@@ -1,6 +1,11 @@
 11mark_trashed_as_read.patch
 12fix_manpage_header.patch
 13fix_manpage_hyphens.patch
+<<<<<<< TREE
 50disable_can_change_accels_by_default
 14compose_read.patch
 debian-changes-3.7.10-2ubuntu1
+=======
+50disable_can_change_accels_by_default
+14compose_read.patch
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-10-25 17:57:11 +0000
+++ debian/patches/series	2011-10-26 05:24:24 +0000
@@ -1,6 +1,11 @@
 11mark_trashed_as_read.patch
 12fix_manpage_header.patch
 13fix_manpage_hyphens.patch
+<<<<<<< TREE
 50disable_can_change_accels_by_default
 14compose_read.patch
 debian-changes-3.7.10-2ubuntu1
+=======
+50disable_can_change_accels_by_default
+14compose_read.patch
+>>>>>>> MERGE-SOURCE