Rebase our patches on top of Icedove 38
Has duplicate Tails -
Blocks Tails -
Blocked by Tails -
#8 Updated by anonym 2015-03-12 15:14:53
- Feature Branch set to icedove:secure_account_creation-31.3.0-1_deb7u1
It seems I have rebased the patches on version 31.3.0-1_deb7u1 in the
secure_account_creation-31.3.0-1_deb7u1 branch. I can’t recall if I have tested that it actually works. The other branches in our Git repo that contains some version of the patches are:
secure_account_creation(based on version 8.0-1)
secure_account_creation-24(based on version 24.6.0-1~deb7u1)
#12 Updated by Anonymous 2016-02-04 17:44:17
- Status changed from Confirmed to In Progress
- % Done changed from 0 to 10
- Feature Branch changed from icedove:secure_account_creation-31.3.0-1_deb7u1 to icedove:tails_secure_account_creation-38.5.0
anonym has rebased the patches on icedove:secure_account_creation-38.5.0-1. However this branch actually seems to not have the latest packaging work, but only the latest upstream code.
I’ve also retested these patches on a clean checkout of the upstream code, version 38.5.0. I did that using Debian’s git repository branch upstream/38.5.0. They do apply cleanly.
From here, I am treating these patches as debian patches only. I have rebased them on a branch forked off of Debian’s master branch, which is the current packaging branch. There, I’ve added them to debian/patches and debian/patches/series. I’ll push this branch to our Icedove repository. This shall be icedove:tails_secure_account_creation-38.5.0. I will propose this as a patch against the Debian package for the time being.
#16 Updated by Anonymous 2016-02-24 11:22:24
> JFTR, “gbp pq” (and similar tools) allows one to maintain patches against upstream code “the Git way”, which is generally a nice way to work on the code and patches themselves, and still get them as quilt patches, that we need for the Debian packaging.
Indeed, but from what I understand this creates another branch (quite heavy on this code), and so I stick to the debian quilt way for now.
#17 Updated by Anonymous 2016-03-08 11:24:38
I’ve finally managed to push this to https://git-tails.immerda.ch/icedove/log/?h=tails_secure_account_creation-38.5.0
#18 Updated by anonym 2016-03-09 03:52:15
> I’ve finally managed to push this to https://git-tails.immerda.ch/icedove/log/?h=tails_secure_account_creation-38.5.0
Of course, I guess we should do it cleanly some how, with a
tails_secure_account_creation-38.6.0 branch based on Debian unstable, etc.