[Pkg-samba-maint] New upstream of cifs-utils & bzr-git/bzr-bp with bzip2

[Luk Claes]

On 07/19/2011 07:25 PM, Jelmer Vernooij wrote:
> On Fri, 2011-07-15 at 11:30 +0200, Jelmer Vernooij wrote:
>> On 12/07/11 19:02, Luk Claes wrote:
>>> The bug where the bzr-* tools cannot handle bz2 orig tarballs seems to
>>> still exist in Debian unstable...
>>>
>>> Can someone please do the new upstream dance and get the tools fixed, TIA?
>>>
>> I'll have a look at it this week.
> bzr-builddeb 2.7.5 has been uploaded to sid and should address this
> issue. Please let me know if this fixes it for you. 

Unfortunately now I seem to have another issue:

trunk$ bzr merge-upstream --version 2:5.0 ../cifs-utils-5.0.tar.bz2
bzr+ssh://bzr.debian.org/bzr/pkg-samba/cifs-utils/upstream/HEAD -r
tag:cifs-utils-5.0
Using distribution unstable
Using version string 2:5.0.
bzr: ERROR: Unable to find the tag for the previous upstream version,
4.9, in the branch: upstream-4.9

I fail to see why it seems to try to reach the branch upstream-4.9 as:

$ cat ~/.bzr-builddeb/default.conf
[BUILDDEB]
merge = True
upstream-branch =
bzr+ssh://bzr.debian.org/bzr/pkg-samba/cifs-utils/upstream/HEAD

or is it looking for the tag upstream-4.9 instead of cifs-utils-4.9?

Cheers

Luk