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

Delete this message

Reply to this message
Autor: intrigeri
Data:  
Dla: The Tails public development discussion list
Temat: Re: [Tails-dev] [review'n'merge:1.1] feature/uefi (#5739)
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.

>    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 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 (see my recent email + ticket updating about the
liveusb-creator packaging).

> 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.

Cheers,
--
intrigeri
| GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
| OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc