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

[Jelmer Vernooij]

On Wed, 2011-07-20 at 16:52 +0200, Luk Claes wrote:
> 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?
cifs-utils-4.9 is the tag from the upstream branch. 

upstream-4.9 is the tag bzr-builddeb is looking for, which is the
pristine revision as was imported from the upstream tarball (with
pristine-tar data). They will often have the same contents but are
occasionally different (e.g. some tarballs have extra generated
configure data). You can see this nicely if you look at the revision
graph using e.g. "bzr qlog".

The upstream-4.9 tag would normally be created by bzr-builddeb but as
the last release wasn't imported with bzr-builddeb it wasn't created.
I've now set it manually for 4.9.

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20110720/9feb4844/attachment.pgp>