Bug#569668: status: with r2174 no SMTP Body

[Alexandre Rossi <alexandre.rossi@gmail.com>]

> My attempt to add a newer version from upstream to packaging git repo
> failed horrible.
>
> I copied files from upstream SVN to the git packaging repo.
> [...]
> How to add a new upstream version to the packaging repo?

If you want to add an official release, the following should do the trick :
$ cd davmail/davmail.git
$ uscan[ --force-download] # if you want to redownload the orig tar
$ git-import-orig ../davmail_<version>.orig.tar.gz # import and commit
new updtream version, and merge

If you want to test a svn snpashot, the easiest way (IMHO) is to
produce a patch and apply it to the git tree. With our recent exemple
:
$ cd davmail/davmail.svn
$ svn update
$ svn diff -r2174 src/java > ../patch
$ cd ../davmail.git
$ export QUILT_PATCHES=debian/patches/
$ quilt import -P newer-upstream ../patch
$ debuild -us -uc
(this does not however fix the SMTP problem)

Cheers,

Alex