Re: [Tails-dev] [review'n'merge:1.1] feature/uefi (#5739)

Borrar esta mensaxe

Responder a esta mensaxe
Autor: anonym
Data:  
Para: The Tails public development discussion list
Asunto: Re: [Tails-dev] [review'n'merge:1.1] feature/uefi (#5739)
13/05/14 13:58, intrigeri wrote:
> anonym wrote (13 May 2014 11:23:56 GMT) :
>> As the RM, I agree with all this. [...] I trust you'll deal with the
>> rest in time for the release.
>
> Thanks a lot.
>
>> I'd like to start merging now (for the "super-quick" resolution), but I
>> have issues building liveusb-creator, after it being adapted for Wheezy,
>> and with the new version scheme. What I did was:
>
>> 1. merge feature/uefi into master
>> 2. merge master into debian
>> 3. checkout debian
>> 4. add changelog entry for 3.11.6+tails1-2
>> 5. git-buildpackage, but I get:
>
>>        fatal: Not a valid object name upstream/3.11.6+tails1

>
> Sorry, I had not created this tag. Now fixed.


Thanks!

>>    and --git-no-pristine-tar doesn't help (and
>>    ../liveusb-creator_3.11.6.orig.tar.gz exists)

>
> FTR, we don't use pristine-tar for this package.


I just did what the building instructions said one should do when
there's an issue with upstrea/* tags.

>> I can work around this by
>
>>     cp ../liveusb-creator_3.11.6.orig.tar.gz \
>>        ../liveusb-creator_3.11.6+tails1-1.orig.tar.gz

>
>> but I'm not sure this is the way to go.
>
> That's not the way to go, since 3.11.6 is *not* the release we want to
> base our stuff on


Exactly what I thought. Thanks for confirming it!

> (see my recent email + ticket updating about the
> liveusb-creator packaging).


I could find #6087, but no obvious email.

>> Any ideas?
>
> If my fix (pushing the right upstream tag) is not enough, get the
> 3.11.6+tails1 orig tarball from our devel APT suite. Should be
> mostly equivalent.


The tag fixed that step, and to make the upload work I had to manually
add liveusb-creator_3.11.6+tails1-1.orig.tar.gz to the changes file.

Now the merge is complete! However, now devel doesn't build:

    The following packages have unmet dependencies:
     liveusb-creator : Depends: python (< 2.7) but 2.7.3-4+deb7u1 is to
be installed


Investigating...

Cheers!