diff options
| -rw-r--r-- | debian/itzks-systems-common.install | 2 | ||||
| -rwxr-xr-x | debian/itzks-systems-common.postinst | 7 | ||||
| -rwxr-xr-x | debian/itzks-systems-common.postrm | 7 | ||||
| -rwxr-xr-x | debian/itzks-systems-common.preinst | 9 | ||||
| -rw-r--r-- | etc/firefox-esr/itzks_papersize.js (renamed from etc/iceweasel/pref/itzks_papersize.js) | 0 |
5 files changed, 24 insertions, 1 deletions
diff --git a/debian/itzks-systems-common.install b/debian/itzks-systems-common.install index e5a0aac..099488f 100644 --- a/debian/itzks-systems-common.install +++ b/debian/itzks-systems-common.install @@ -2,7 +2,7 @@ etc/debian-edu/* etc/debian-edu/ etc/network/* etc/network/ etc/apt/* etc/apt/ etc/cron.d/itzks-systems-common -etc/iceweasel/* etc/iceweasel/ +etc/firefox-esr/* etc/firefox-esr/ etc/standardskriver.cfg etc/ etc/xdg/autostart/standardskriver.desktop etc/xdg/autostart/ bin/passwd usr/bin/ diff --git a/debian/itzks-systems-common.postinst b/debian/itzks-systems-common.postinst index b2753c3..42cf539 100755 --- a/debian/itzks-systems-common.postinst +++ b/debian/itzks-systems-common.postinst @@ -44,6 +44,13 @@ case "$1" in update-icon-cache.gtk2 /usr/share/icons/hicolor fi + # move itzks_papersize.js from /etc/iceweasel/pref to /etc/firefox-esr/ + if dpkg --compare-versions "$2" le "2016.07.15.1"; then + if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then + dpkg-maintscript-helper mv_conffile /etc/iceweasel/pref/itzks_papersize.js /etc/firefox-esr/itzks_papersize.js + fi + fi + # deploy Wine desktop fixes if Wine is installed if which update-desktop-database 1>/dev/null && which wine 1>/dev/null; then if [ ! -e /usr/share/applications/wine.desktop ]; then diff --git a/debian/itzks-systems-common.postrm b/debian/itzks-systems-common.postrm index 5b2439a..ebd3996 100755 --- a/debian/itzks-systems-common.postrm +++ b/debian/itzks-systems-common.postrm @@ -35,6 +35,13 @@ case "$1" in update-icon-cache.gtk2 /usr/share/icons/hicolor fi + # move itzks_papersize.js from /etc/iceweasel/pref to /etc/firefox-esr/ + if dpkg --compare-versions "$2" le "2016.07.15.1" && [ -e /etc/firefox-esr ]; then + if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then + dpkg-maintscript-helper mv_conffile /etc/iceweasel/pref/itzks_papersize.js /etc/firefox-esr/itzks_papersize.js + fi + fi + ;; upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; diff --git a/debian/itzks-systems-common.preinst b/debian/itzks-systems-common.preinst index 0e0f9e4..cb5f0b7 100755 --- a/debian/itzks-systems-common.preinst +++ b/debian/itzks-systems-common.preinst @@ -22,6 +22,15 @@ case "$1" in if ! dpkg-divert --list | grep passwd.gnu 1>/dev/null 2>/dev/null; then dpkg-divert --add --rename --package itzks-systems-common --divert /usr/bin/passwd.gnu /usr/bin/passwd fi + + # move itzks_papersize.js from /etc/iceweasel/pref to /etc/firefox-esr/ + if dpkg --compare-versions "$2" le "2016.07.15.1"; then + mkdir -p /etc/firefox-esr + if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then + dpkg-maintscript-helper mv_conffile /etc/iceweasel/pref/itzks_papersize.js /etc/firefox-esr/itzks_papersize.js + fi + fi + ;; abort-upgrade) ;; diff --git a/etc/iceweasel/pref/itzks_papersize.js b/etc/firefox-esr/itzks_papersize.js index 090eec7..090eec7 100644 --- a/etc/iceweasel/pref/itzks_papersize.js +++ b/etc/firefox-esr/itzks_papersize.js |