Bug#482680: Calibre 0.5.1 in my git tree

[John Goerzen <jgoerzen@complete.org>]

Martin Pitt wrote:
> Hello John,
> 
> John Goerzen [2009-03-16 14:43 -0500]:
>> I updated the 0.4.125+dfsg packages to Calibre 0.5.1.  You can get the
>> result with
> 
> Can you please send a debdiff? Calibre is maintained in bzr.

I'm not familiar with debdiff, but I can look into it later today.

In the meantime, I suspect one of these commands may do what you want:

git branch upstream origin/upstream # tell git about upstream

git diff debian/0.4.125+dfsg-1  # diff from previous deb version
git diff upstream               # diff from 0.5.1-1 upstream
git diff 87150                  # the changes post-0.5.1-1 merge
git log --stat                  # my changes with commit msgs
git log -p                      # my changes with individual diffs

Let me know if that helps.  If not, I'll investigate debdiff.

> 
>> (note - I am unsure if I got the non-DFSG-free components removed)
> 
> Just update debian/changelog and call debian/rules get-orig-source,
> that will DTRT.
> 
>> Do any of you intend to upload it to sid?
> 
> As Miriam already said, it's waiting in NEW.
> 
> Thanks!
> 
> Martin