Re: [Tails-dev] Please review'n'merge feature/torbrowser-24.2.0esr-1+tails1

2013-12-29 Thread bertagaz
On Mon, Dec 16, 2013 at 01:42:34PM +0100, intrigeri wrote:
> Hi,
> 
> this is a follow-up, with a better fix, to the quick fix introduced by
> bugfix/use-our-own-sqlite.
> 
> The details are on the ticket:
> https://labs.riseup.net/code/issues/6496
> 
> When merging this branch, please drop the packages listed on the
> ticket from our APT repo. Then, we can 1. drop the corresponding
> temporary APT pinning rules since they won't be needed anymore; 2.
> take care of #6497 (I'm on it).
> 
> Assigned to bertagaz for review, candidate for 0.22.1.

Done, branch merged in devel (git and APT repo), packages removed from the
APT repo, in the devel suite.

bert.
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev


Re: [Tails-dev] Please review'n'merge feature/torbrowser-24.2.0esr-1+tails1

2013-12-29 Thread intrigeri
Hi,

berta...@ptitcanardnoir.org wrote (29 Dec 2013 23:34:43 GMT) :
>> Assigned to bertagaz for review, candidate for 0.22.1.

> Done, branch merged in devel (git and APT repo), packages removed from the
> APT repo, in the devel suite.

Great!

That's a candidate for 0.22.1, so please merge into stable too (and do
the APT thing too). If you prefer, I can do it.

Cheers,
-- 
  intrigeri
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev


Re: [Tails-dev] Please review'n'merge feature/torbrowser-24.2.0esr-1+tails1

2013-12-29 Thread bertagaz
On Mon, Dec 30, 2013 at 12:53:30AM +0100, intrigeri wrote:
> Hi,
> 
> berta...@ptitcanardnoir.org wrote (29 Dec 2013 23:34:43 GMT) :
> >> Assigned to bertagaz for review, candidate for 0.22.1.
> 
> > Done, branch merged in devel (git and APT repo), packages removed from the
> > APT repo, in the devel suite.
> 
> Great!
> 
> That's a candidate for 0.22.1, so please merge into stable too (and do
> the APT thing too). If you prefer, I can do it.

Done.
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev


Re: [Tails-dev] Please review'n'merge feature/torbrowser-24.2.0esr-1+tails1

2013-12-30 Thread intrigeri
berta...@ptitcanardnoir.org wrote (30 Dec 2013 00:06:04 GMT) :
>> That's a candidate for 0.22.1, so please merge into stable too (and do
>> the APT thing too). If you prefer, I can do it.

> Done.

Thanks. Actually, I was wrong about "drop the corresponding temporary
APT pinning rules since they won't be needed anymore", since this
breaks the build: we don't automatically install needed packages from
the backports repository. Therefore, I have reintroduced commit
f40d3b5 into feature/torbrowser-24.2.0esr-1+tails1, and merged it into
stable and devel.

I have also completed the merge into experimental (which I had failed
to do previously, apparently) by removing the set of packages this
branch was about (libnss3 libnss3-1d libnspr4 libnspr4-0d libsqlite3-0
sqlite3) from our experimental APT suite.

To end with, I have merged devel into the two major pending branches
that are under test these days (feature/{spoof-mac,uefi}), else
there's no way our nightly builds of these branches succeed with the
current state of our APT repository. If everything goes well, sunny
weather should be back on our Jenkins dashboard within a few hours :)

Cheers,
-- 
  intrigeri
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev