Please merge claws-mail 3.7.8-1 (universe) from Debian unstable (main)

deb diff from claws-mail_3.7.6-4ubuntu1.dsc to claws-mail_3.7.8-1ubuntu1.dsc is too big

Thank you for your bug report, the diff has a debian-changes-3.7.8-1ubuntu1 which some po changes though which seems buggy, could you fix that? It would also be nice if someone would send the patch from bug #223840 to Debian or upstream as well, it seems that source could be easily synced

Hi, just had a quick look at your merge. I'm afraid there are a couple of issues with it:

1. You forgot to close this bug in the changelog, the normal approach is something like "Merge from Debian unstable (LP: #690102), remaining changes:"
2. You have picked up a quilt patch, by accident? (debian-changes-3.7.8-1ubuntu1).

@ Sebastian Bacher
bug #223840 still happen until now because debian don't have this patch. okay i'll send this patch if approved and reviewed

@ Stefano Rivera
Sorry for delay relay at irc, please apologize me.
I have added (LP#690102)

There's a blank line at the end of the changelog, and, and quilt patch inside a quilt patch:

diff -Nru claws-mail-3.7.8/debian/patches/50disable_can_change_accels_by_default claws-mail-3.7.8/debian/patches/50disable_can_change_accels_by_default
--- claws-mail-3.7.8/debian/patches/50disable_can_change_accels_by_default 1970-01-01 07:00:00.000000000 +0700
+++ claws-mail-3.7.8/debian/patches/50disable_can_change_accels_by_default 2010-12-14 20:14:43.000000000 +0700
@@ -0,0 +1,21 @@
+diff -Nru claws-mail-3.7.8/debian/patches/50gtk_can_change_accels.patch claws-mail-3.7.8/debian/patches/50gtk_can_change_accels.patch
+--- claws-mail-3.7.8/debian/patches/50gtk_can_change_accels.patch 1970-01-01 07:00:00.000000000 +0700
++++ claws-mail-3.7.8/debian/patches/50gtk_can_change_accels.patch 2010-12-14 16:52:26.000000000 +0700
+@@ -0,0 +1,17 @@
...
++--- claws-mail-3.7.8/src/prefs_common.c 2010-11-26 01:58:31.000000000 +0700
+++++ claws-mail-3.7.8-1ubuntu1/src/prefs_common.c 2010-12-14 16:49:14.156221869 +0700
++@@ -924,7 +924,7 @@ static PrefParam param[] = {

  * Merge from debian unstable. Remaining changes:
    - debian/pacthes/series
     removing buggy messages from M-o-M

builg log by pbuilder

This bug was fixed in the package claws-mail - 3.7.8-1ubuntu1

---------------
claws-mail (3.7.8-1ubuntu1) natty; urgency=low

  * Merge from debian unstable (Closes LP: #690102). Remaining changes:
    - debian/pacthes/series
      removing buggy messages from M-o-M

claws-mail (3.7.8-1) unstable; urgency=low

  * New upstream release (Closes: #599547)
  * debian/control
  - Added new dependencies required to enable manual build
  * debian/control, debian/rules
  - Explicit depend on libgnutls-dev instead of relying on being pulled
    by libetpan-dev, same case as bug #498445.
  - Remove unused openssl references (thanks Colin Leroy for notifying)
  * debian/copyright
  - Fix some spacing typo and rework paragraph format
  * debian/patches/13fix_manpage_hyphens.patch
  - Fix hyphens not escaped in manpage
 -- Mahyuddin Susanto <email address hidden> Tue, 14 Dec 2010 17:17:07 +0200

GRRR, I shouldn't have let this through, the changelog entry is wrong. I was paying too much attention to the body of the patch (which is correct)

where? if i'm not remove debian/pacthes/series, MOM can't merge from debian

arrggh.. you right. changelog must be
 + adding patch disable_can_change_accels_by_default

No, the correct thing to do is to repeat the changelog from before (as you had after I commented about the bug number), but it's too late to do anything about now. No point uploading a new version just for a changelog fix, the next person who touches this will just have to work out what happened.