Hi,
so I went and looked at each of the following commits (in reverse order
than what is shown here…)
On Tue, Aug 09, 2016 at 12:29:59PM +0000, Holger Levsen wrote:
> matrix:~/Projects/debian-edu/git/debian-edu-config$ git log --oneline jenkins-proposed..origin/schweer-foo
> 3810348 fix forgotten Makefile conflict issue.
unneeded, because I avoided making conflicts which needed later cleanup.
> 4503c9b Adjust cf.krb5client to ensure that cfengine runs are idempotent. (Closes: #779642) - Patch taken from master branch from Wolfgang.
> a55c29f Move code to cleanup /usr/share/pam-configs/krb5 diversion from postinst to preinst to ease upgrades from old wheezy installations. (Closes: #779641)
unneeded, those were already present in the jessie branch as 1e087a2 and
94ec61a (which ironically are referred to in your commit messages as the
commits you cherry-picked from. stupid git should complain louder if one
tries to cherry-pick from a commit which is already part of the current
branch.)
> 483b3fc Add changelog entries for the last firefox-esr related commits.
> d2c3c14 Move debian-edu.js -> etc/firefox-esr/debian-edu.js as this is the location for syspref now.
> ac970f8 Adjust cf.firefox-esr as the profile directory is no longer useful for the certificate override file.
> 0d7eec6 Adjust sbin/snakeoil-on-ice as only the /etc/skel location on the main server seems to be useful for the certificate override file.
> 45a0b74 Adjust testsuite/ltsp and testsuite/ltspwebserver as /etc/firefox-esr/cert_override.txt is no longer useful.
> cc69366 moved icweasel/firefox cleanup code to postinst just in case firefox-esr and d-e-c are installed concurrently.
> baf6e0e postinst: keep link removal; move all other iceweasel/firefox cleanups to postinst.
> 4ab81d0 apply patches from Wolfgang Schweer: Add code to cleanup iceweasel and firefox-esr related conffiles in postinst and preinst scripts.
those I all picked (in reverse order) and made apply cleanly, the result
is in the branch h01ger/jessie-proposed.
So I think all looks good now:
$ git log --oneline origin/jessie..origin/h01ger/jessie-proposed
1bff502 Add changelog entries for the last firefox-esr related commits.
6c7ce5d Move debian-edu.js -> etc/firefox-esr/debian-edu.js as this is the location for syspref now.
242f153 Adjust cf.firefox-esr as the profile directory is no longer useful for the certificate override file.
28a6401 Adjust sbin/snakeoil-on-ice as only the /etc/skel location on the main server seems to be useful for the certificate override file.
3710c32 Adjust testsuite/ltsp and testsuite/ltspwebserver as /etc/firefox-esr/cert_override.txt is no longer useful.
074d4dc moved icweasel/firefox cleanup code to postinst just in case firefox-esr and d-e-c are installed concurrently.
b507674 postinst: keep link removal; move all other iceweasel/firefox cleanups to postinst.
93df524 apply patches from Wolfgang Schweer: Add code to cleanup iceweasel and firefox-esr related conffiles in postinst and preinst scripts.
$ git diff origin/jessie..origin/h01ger/jessie-proposed debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 2df91a6..b71a967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,14 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
- replace iceweasel with firefox-esr in various files.
- use '/etc/firefox-esr' as place for firefox preference files.
- update Makefile.
+ - Add code to cleanup iceweasel and firefox-esr related conffiles in
+ postinst and preinst scripts.
+ - Adjust testsuite/ltsp and testsuite/webserver as
+ /etc/firefox-esr/cert_override.txt is no longer useful.
+ - Adjust sbin/snakeoil-on-ice as only the /etc/skel location on the main
+ server seems to be useful for the certificate override file.
+ - Move debian-edu.js -> etc/firefox-esr/debian-edu.js as this is the
+ location for syspref now.
[ Mike Gabriel ]
* Iceweasel -> Firefox transition: system-wide, non-configurable browser
$ git diff -M 1.818+deb8u1..origin/h01ger/jessie-proposed
[also looks good to me]
Feedback welcome.
--
cheers,
Holger
Attachment:
signature.asc
Description: Digital signature