diff -pruN 3.8/debian/changelog 3.8ubuntu2/debian/changelog --- 3.8/debian/changelog 2020-04-26 12:13:08.000000000 +0000 +++ 3.8ubuntu2/debian/changelog 2020-04-27 11:12:02.000000000 +0000 @@ -1,3 +1,23 @@ +msttcorefonts (3.8ubuntu2) groovy; urgency=medium + + * Add +x to make the script executable. + thanks ricotz! + + -- Gianfranco Costamagna Mon, 27 Apr 2020 13:12:02 +0200 + +msttcorefonts (3.8ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Ubuntu preinst and postrm scripts have deltas. + - Source the debconf confmodule before doing anything else in the preinst. + - Move #DEBHELPER# substitution before preinst code that might exit. + - Add missing pre-depends for use of debconf in preinst. + - Migrate to use an update-notifier hook, so that package data can be + handled asynchronously and not cause install failures on network + problems. + + -- Gianfranco Costamagna Sun, 26 Apr 2020 18:51:04 +0200 + msttcorefonts (3.8) unstable; urgency=medium [ Thijs Kinkhorst ] @@ -13,6 +33,34 @@ msttcorefonts (3.8) unstable; urgency=me -- Thijs Kinkhorst Sun, 26 Apr 2020 12:13:08 +0000 +msttcorefonts (3.7ubuntu6) eoan; urgency=medium + + * Revert the last upload in favour of the fix in update-notifier. + + -- Adam Conrad Mon, 29 Apr 2019 14:01:26 -0600 + +msttcorefonts (3.7ubuntu5) eoan; urgency=medium + + * Download fonts from GitHub instead of SourceForge, + thanks Peter Bhat Harkins (LP: #1713615) + + -- Graham Inggs Mon, 29 Apr 2019 18:11:32 +0000 + +msttcorefonts (3.7ubuntu4) disco; urgency=medium + + * Merge from Debian unstable, remaining changes: + - Ubuntu preinst and postrm scripts have deltas. + - Source the debconf confmodule before doing anything else in the preinst. + - Move #DEBHELPER# substitution before preinst code that might exit. + - Add missing pre-depends for use of debconf in preinst. + - Migrate to use an update-notifier hook, so that package data can be + handled asynchronously and not cause install failures on network + problems. + * Dropped changes, included in Debian: + - Convert to dh(1). + + -- Steve Langasek Tue, 27 Nov 2018 18:16:34 -0800 + msttcorefonts (3.7) unstable; urgency=medium * Print message that fonts are moved upon package removal @@ -27,6 +75,28 @@ msttcorefonts (3.7) unstable; urgency=me -- Thijs Kinkhorst Thu, 11 Jan 2018 11:28:55 +0000 +msttcorefonts (3.6ubuntu2) artful; urgency=medium + + * Remove useless stuff from previous upload. + + -- Gianfranco Costamagna Tue, 29 Aug 2017 23:20:04 +0200 + +msttcorefonts (3.6ubuntu1) artful; urgency=medium + + * Merge from Debian Sid. Remaining changes: + - Ubuntu preinst and postrm scripts have deltas. + - Source the debconf confmodule before doing anything else in the preinst. + - Move #DEBHELPER# substitution before preinst code that might exit. + - Migrate to use an update-notifier hook, so that package data can be + handled asynchronously and not cause install failures on network + problems. + - Add missing pre-depends for use of debconf in preinst. + - Convert to dh(1). + - Skip race between update-notifier and update-ms-fonts trying to delete + the same files from the same locations. + + -- Simon Quigley Wed, 26 Jul 2017 22:02:46 -0500 + msttcorefonts (3.6) unstable; urgency=medium * Add Turkish translation, thanks Mert Dirik (closes: #757868). @@ -50,6 +120,32 @@ msttcorefonts (3.5) unstable; urgency=lo -- Thijs Kinkhorst Sat, 16 Feb 2013 11:55:44 +0100 +msttcorefonts (3.4+nmu1ubuntu2) utopic; urgency=medium + + * update-ms-fonts: Skip race between update-notifier and update-ms-fonts + trying to delete the same files from the same locations (LP: #1354709) + + -- Adam Conrad Thu, 11 Sep 2014 00:08:50 -0600 + +msttcorefonts (3.4+nmu1ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Ubuntu preinst and postrm scripts have deltas. + - debian/control: Add Multi-Arch: foreign. + - Use maintscript support in dh_installdeb rather than writing out + dpkg-maintscript-helper commands by hand. We now simply Pre-Depend on a + new enough version of dpkg rather than using 'dpkg-maintscript-helper + supports' guards, leading to more predictable behaviour on upgrades. + - Source the debconf confmodule before doing anything else in the preinst. + - Move #DEBHELPER# substitution before preinst code that might exit. + - Migrate to use an update-notifier hook, so that package data can be + handled asynchronously and not cause install failures on network + problems. + - Add missing pre-depends for use of debconf in preinst. + - Convert to dh(1). + + -- Logan Rosen Thu, 29 Nov 2012 21:35:42 -0500 + msttcorefonts (3.4+nmu1) unstable; urgency=low * Non-maintainer upload. @@ -58,6 +154,35 @@ msttcorefonts (3.4+nmu1) unstable; urgen -- Christian Perrier Sat, 14 Apr 2012 08:55:17 +0200 +msttcorefonts (3.4ubuntu3) precise; urgency=low + + * Migrate to use an update-notifier hook, so that package data can be + handled asynchronously and not cause install failures on network + problems. LP: #876298. + * Add missing pre-depends for use of debconf in preinst. + * Convert to dh(1). + + -- Steve Langasek Sun, 08 Apr 2012 22:36:25 -0700 + +msttcorefonts (3.4ubuntu2) precise; urgency=low + + * Use maintscript support in dh_installdeb rather than writing out + dpkg-maintscript-helper commands by hand. We now simply Pre-Depend on a + new enough version of dpkg rather than using 'dpkg-maintscript-helper + supports' guards, leading to more predictable behaviour on upgrades. + * Source the debconf confmodule before doing anything else in the preinst. + * Move #DEBHELPER# substitution before preinst code that might exit. + + -- Colin Watson Mon, 13 Feb 2012 13:05:47 +0000 + +msttcorefonts (3.4ubuntu1) precise; urgency=low + + * Merge from Debian testing with help of MOM. Remaining changes: + - Ubuntu preinst and postrm scripts have deltas + * debian/control: Add Multi-Arch: foreign (LP: #905055) + + -- Scott Ritchie Thu, 19 Jan 2012 00:47:02 -0800 + msttcorefonts (3.4) unstable; urgency=low * Drop defoma support. Thanks Christian Perrier and Paul Wise @@ -67,6 +192,35 @@ msttcorefonts (3.4) unstable; urgency=lo -- Thijs Kinkhorst Sat, 19 Nov 2011 21:43:49 +0100 +msttcorefonts (3.3ubuntu4) oneiric; urgency=low + + * Create /usr/share/fonts/truetype/msttcorefonts in the postinst + instead of packaging it to work around a bad interaction with + fontconfig's postinst: see Ubuntu bug 819097. (LP: #670629) + + -- Geoffrey Thomas Sun, 31 Jul 2011 22:43:26 -0400 + +msttcorefonts (3.3ubuntu3) natty; urgency=low + + * change EULA display so that on refusal fonts are removed + * do not fails the install if the EULA is not accepted, but instead + do not download the fonts + + -- Michael Vogt Thu, 25 Nov 2010 19:38:34 +0100 + +msttcorefonts (3.3ubuntu2) natty; urgency=low + + * update-ms-fonts: make wget use the proxy defined for apt (LP: #56880) + + -- Marc Deslauriers Fri, 19 Nov 2010 16:44:56 -0500 + +msttcorefonts (3.3ubuntu1) natty; urgency=low + + * display the EULA for the fonts when installing the + package (LP: #670629) + + -- Michael Vogt Thu, 04 Nov 2010 21:52:26 +0100 + msttcorefonts (3.3) unstable; urgency=low * Add Slovak debconf translation, thanks Slavko Pozdravom @@ -595,4 +749,3 @@ msttcorefonts (0.1.0) unstable; urgency= * Initial Release; installer for MS TrueType core fonts for the Web -- Eric Sharkey Sun, 17 Sep 2000 13:34:12 -0400 - diff -pruN 3.8/debian/clean 3.8ubuntu2/debian/clean --- 3.8/debian/clean 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/clean 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/postinst diff -pruN 3.8/debian/config 3.8ubuntu2/debian/config --- 3.8/debian/config 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/config 2020-04-26 14:52:55.000000000 +0000 @@ -68,11 +68,10 @@ for f in $SHA256SUMS ; do done if [ -n "$NEEDUPDATE" ] ; then + rm -f /var/lib/update-notifier/package-data-downloads/ttf-mscorefonts-installer \ + /var/lib/update-notifier/package-data-downloads/ttf-mscorefonts-installer.* + db_input low msttcorefonts/dldir || true - if [ -n "$http_proxy" ] ; then - db_set msttcorefonts/http_proxy $http_proxy - fi - db_input medium msttcorefonts/http_proxy || true db_go db_get msttcorefonts/dldir @@ -98,11 +97,6 @@ if [ -n "$NEEDUPDATE" ] ; then break fi done - if [ -z "$RET" ]; then - db_input low msttcorefonts/savedir || true - db_go - db_get msttcorefonts/savedir - fi db_get msttcorefonts/dldir diff -pruN 3.8/debian/control 3.8ubuntu2/debian/control --- 3.8/debian/control 2020-04-26 12:13:08.000000000 +0000 +++ 3.8ubuntu2/debian/control 2020-04-26 16:47:40.000000000 +0000 @@ -9,8 +9,8 @@ Vcs-Browser: https://salsa.debian.org/de Package: ttf-mscorefonts-installer Architecture: all -Pre-Depends: ${misc:Pre-Depends} -Depends: wget, ca-certificates, cabextract, xfonts-utils, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends}, debconf (>= 0.5) | debconf-2.0 +Depends: wget, ca-certificates, cabextract, xfonts-utils, update-notifier-common (>= 0.119ubuntu2), ${misc:Depends} Recommends: fonts-liberation Provides: msttcorefonts Multi-Arch: foreign diff -pruN 3.8/debian/install 3.8ubuntu2/debian/install --- 3.8/debian/install 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/install 2020-04-26 14:52:55.000000000 +0000 @@ -1 +1,2 @@ -cabfiles.sha256sums /var/lib/msttcorefonts +update-ms-fonts /usr/lib/msttcorefonts +usr/share/package-data-downloads diff -pruN 3.8/debian/maintscript 3.8ubuntu2/debian/maintscript --- 3.8/debian/maintscript 1970-01-01 00:00:00.000000000 +0000 +++ 3.8ubuntu2/debian/maintscript 2018-11-28 00:48:02.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 diff -pruN 3.8/debian/po/be.po 3.8ubuntu2/debian/po/be.po --- 3.8/debian/po/be.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/be.po 2020-04-26 14:52:56.000000000 +0000 @@ -142,3 +142,38 @@ msgstr "" #: ../templates:5001 msgid "Leave this option blank if you don't use a proxy server." msgstr "Пакіньце поле пустым, калі не карыстаецеся проксі-серверам." + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" diff -pruN 3.8/debian/po/cs.po 3.8ubuntu2/debian/po/cs.po --- 3.8/debian/po/cs.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/cs.po 2020-04-26 14:52:56.000000000 +0000 @@ -149,6 +149,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Pokud nepoužíváte proxy server, ponechte toto pole prázdné." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts používá defoma" diff -pruN 3.8/debian/po/da.po 3.8ubuntu2/debian/po/da.po --- 3.8/debian/po/da.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/da.po 2020-04-26 14:52:56.000000000 +0000 @@ -143,3 +143,38 @@ msgstr "" #: ../templates:5001 msgid "Leave this option blank if you don't use a proxy server." msgstr "Lad dette felt være tomt hvis du ikke bruger en proxy." + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" diff -pruN 3.8/debian/po/de.po 3.8ubuntu2/debian/po/de.po --- 3.8/debian/po/de.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/de.po 2020-04-26 14:52:55.000000000 +0000 @@ -158,6 +158,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Lassen Sie diese Option leer, falls Sie keinen Proxy-Server benutzen." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts benutzt defoma" diff -pruN 3.8/debian/po/es.po 3.8ubuntu2/debian/po/es.po --- 3.8/debian/po/es.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/es.po 2020-04-26 14:52:56.000000000 +0000 @@ -174,6 +174,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Si no va usar un servidor proxy, deje en blanco esta opción." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts usa «defoma»" diff -pruN 3.8/debian/po/eu.po 3.8ubuntu2/debian/po/eu.po --- 3.8/debian/po/eu.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/eu.po 2020-04-26 14:52:55.000000000 +0000 @@ -144,6 +144,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Aukera hau hutsik dezakezu proxy zerbitzaririk erabili nahi ez baduzu." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts defoma erabiltzen du" diff -pruN 3.8/debian/po/fi.po 3.8ubuntu2/debian/po/fi.po --- 3.8/debian/po/fi.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/fi.po 2020-04-26 14:52:56.000000000 +0000 @@ -138,6 +138,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Jätä kenttä tyhjäksi, jos et käytä välityspalvelinta." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts käyttää defomaa" diff -pruN 3.8/debian/po/fr.po 3.8ubuntu2/debian/po/fr.po --- 3.8/debian/po/fr.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/fr.po 2020-04-26 14:52:56.000000000 +0000 @@ -157,6 +157,41 @@ msgid "Leave this option blank if you do msgstr "" "Vous pouvez laisser ce champ vide si vous n'utilisez pas de mandataire." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "Msttcorefonts utilise defoma" diff -pruN 3.8/debian/po/gl.po 3.8ubuntu2/debian/po/gl.po --- 3.8/debian/po/gl.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/gl.po 2020-04-26 14:52:56.000000000 +0000 @@ -146,3 +146,38 @@ msgstr "" #: ../templates:5001 msgid "Leave this option blank if you don't use a proxy server." msgstr "Deixe esta opción en branco se non emprega un servidor proxy." + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" diff -pruN 3.8/debian/po/it.po 3.8ubuntu2/debian/po/it.po --- 3.8/debian/po/it.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/it.po 2020-04-26 14:52:56.000000000 +0000 @@ -143,6 +143,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Se non si usa un proxy, lasciare questo campo vuoto." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts usa defoma" diff -pruN 3.8/debian/po/ja.po 3.8ubuntu2/debian/po/ja.po --- 3.8/debian/po/ja.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/ja.po 2020-04-26 14:52:56.000000000 +0000 @@ -152,6 +152,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "プロキシを使わないという人はここで何も入力しないでください。" +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts では defoma を利用します" diff -pruN 3.8/debian/po/lt.po 3.8ubuntu2/debian/po/lt.po --- 3.8/debian/po/lt.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/lt.po 2020-04-26 14:52:56.000000000 +0000 @@ -147,6 +147,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "" +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts naudoja DEFOMA" diff -pruN 3.8/debian/po/nl.po 3.8ubuntu2/debian/po/nl.po --- 3.8/debian/po/nl.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/nl.po 2020-04-26 14:52:55.000000000 +0000 @@ -152,3 +152,38 @@ msgstr "" #: ../templates:5001 msgid "Leave this option blank if you don't use a proxy server." msgstr "Als u geen proxyserver wilt gebruiken, laat dit dan leeg." + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" diff -pruN 3.8/debian/po/pl.po 3.8ubuntu2/debian/po/pl.po --- 3.8/debian/po/pl.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/pl.po 2020-04-26 14:52:55.000000000 +0000 @@ -147,6 +147,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Jeeli nie potrzebujesz serwera proxy, zostaw to pole puste." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "uycie programu Defoma przez msttcorefonts" diff -pruN 3.8/debian/po/pt_BR.po 3.8ubuntu2/debian/po/pt_BR.po --- 3.8/debian/po/pt_BR.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/pt_BR.po 2020-04-26 14:52:56.000000000 +0000 @@ -148,6 +148,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Mantenha esta opção em branco caso você não utilize um servidor proxy." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "O msttcorefonts utiliza o defoma" diff -pruN 3.8/debian/po/pt.po 3.8ubuntu2/debian/po/pt.po --- 3.8/debian/po/pt.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/pt.po 2020-04-26 14:52:56.000000000 +0000 @@ -148,6 +148,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Deixa esta opção em branco se não quiser utilizar um servidor proxy." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "Os tipos de letra msttcorefonts usam defoma" diff -pruN 3.8/debian/po/ro.po 3.8ubuntu2/debian/po/ro.po --- 3.8/debian/po/ro.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/ro.po 2020-04-26 14:52:55.000000000 +0000 @@ -150,6 +150,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Lăsați acest câmp gol dacă nu folosiți un server proxy." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts folosește defoma" diff -pruN 3.8/debian/po/ru.po 3.8ubuntu2/debian/po/ru.po --- 3.8/debian/po/ru.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/ru.po 2020-04-26 14:52:56.000000000 +0000 @@ -146,6 +146,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Оставьте пустым, если вы не используете прокси-сервер." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "Пакет msttcorefonts использует defoma" diff -pruN 3.8/debian/po/sk.po 3.8ubuntu2/debian/po/sk.po --- 3.8/debian/po/sk.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/sk.po 2020-04-26 14:52:56.000000000 +0000 @@ -141,3 +141,38 @@ msgstr "" #: ../templates:5001 msgid "Leave this option blank if you don't use a proxy server." msgstr "Ak nepoužívate proxy server, nechajte toto pole prázdne." + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" diff -pruN 3.8/debian/po/sv.po 3.8ubuntu2/debian/po/sv.po --- 3.8/debian/po/sv.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/sv.po 2020-04-26 14:52:56.000000000 +0000 @@ -149,6 +149,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Lmna det hr alternativet blankt om du inte anvnder en proxyserver." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts anvnder defoma" diff -pruN 3.8/debian/po/templates.pot 3.8ubuntu2/debian/po/templates.pot --- 3.8/debian/po/templates.pot 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/templates.pot 2020-04-26 14:52:55.000000000 +0000 @@ -117,3 +117,38 @@ msgstr "" #: ../templates:5001 msgid "Leave this option blank if you don't use a proxy server." msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" diff -pruN 3.8/debian/po/tr.po 3.8ubuntu2/debian/po/tr.po --- 3.8/debian/po/tr.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/tr.po 2020-04-26 14:52:56.000000000 +0000 @@ -11,11 +11,11 @@ msgstr "" "PO-Revision-Date: 2014-08-12 00:05+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian L10n Turkish \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -"Language: tr\n" #. Type: string #. Description @@ -143,3 +143,38 @@ msgstr "" #: ../templates:5001 msgid "Leave this option blank if you don't use a proxy server." msgstr "Vekil sunucusu kullanmıyorsanız burayı boş bırakın." + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" diff -pruN 3.8/debian/po/vi.po 3.8ubuntu2/debian/po/vi.po --- 3.8/debian/po/vi.po 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/po/vi.po 2020-04-26 14:52:55.000000000 +0000 @@ -144,6 +144,41 @@ msgstr "" msgid "Leave this option blank if you don't use a proxy server." msgstr "Bỏ rỗng nếu bạn không sử dụng máy phục vụ ủy nhiệm." +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Do you accept the EULA license terms?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"In order to install this package, you must accept the license terms, the " +"\"TrueType core fonts for the Web EULA \". Not accepting will cancel the " +"installation." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "Declined \"TrueType core fonts for the Web EULA \"" +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "" +"If you do not agree to the \"TrueType core fonts for the Web EULA \" license " +"terms you cannot install this software." +msgstr "" + +#. Type: error +#. Description +#: ../templates:6001 +msgid "The installation of this package will be canceled." +msgstr "" + #~ msgid "msttcorefonts uses defoma" #~ msgstr "msttcorefonts dùng defoma" diff -pruN 3.8/debian/postinst 3.8ubuntu2/debian/postinst --- 3.8/debian/postinst 1970-01-01 00:00:00.000000000 +0000 +++ 3.8ubuntu2/debian/postinst 2018-11-28 02:03:10.000000000 +0000 @@ -0,0 +1,48 @@ +#!/bin/sh +set -e + +. /usr/share/debconf/confmodule + +db_get msttcorefonts/dldir +LOCALCOPY=$RET + +# FIXME: we don't have a way to use an alternate download source here. +db_get msttcorefonts/dlurl +URLOVERRIDE=$RET + +stamp_file=/var/lib/update-notifier/package-data-downloads/ttf-mscorefonts-installer + +if dpkg --compare-versions "$2" lt-nl 3.4ubuntu3 \ + && [ -f /var/lib/msttcorefonts/ms-fonts ] +then + # don't force a redownload with the new hook + touch $stamp_file +fi + +# if the license was not accepted, ensure the fonts are removed +# and add README with helpful information + FONTDIR=/usr/share/fonts/truetype/msttcorefonts + mkdir -p $FONTDIR + license=mscorefonts-eula + db_get msttcorefonts/accepted-$license + if [ "$RET" != "true" ]; then + echo "user did not accept the $license license" >&2 + rm -f $FONTDIR/*.ttf + cat > $FONTDIR/README <&2 '' + echo >&2 "$@" + echo >&2 "try 'dpkg-reconfigure debconf' to select a frontend other than noninteractive" + echo >&2 '' +} + +db_get msttcorefonts/accepted-$license +if [ "$RET" = "true" ]; then + echo "$license license has already been accepted" >&2 + exit 0 +else + # show license again + db_fset msttcorefonts/present-$license seen false +fi + +# facilitate backup capability per debconf-devel(7) +STATE=1 +while true; do + case "$STATE" in + 0) # ensure going back from license presentment is harmless + STATE=1 + continue + ;; + 1) # present license + db_fset msttcorefonts/present-$license seen false + if ! db_input critical msttcorefonts/present-$license ; then + errmsg "$license license could not be presented" + exit 0 + fi + db_fset msttcorefonts/accepted-$license seen false + if ! db_input critical msttcorefonts/accepted-$license ; then + errmsg "$license agree question could not be asked" + exit 0 + fi + ;; + 2) # determine users' choice + db_get msttcorefonts/accepted-$license + if [ "$RET" = "true" ]; then + # license accepted + exit 0 + fi + # error on decline license (give user chance to back up) + db_input critical msttcorefonts/error-$license + ;; + 3) # user has confirmed declining license + echo "user did not accept the $license license" >&2 + exit 0 + ;; + *) # unknown state + echo "$license license state unknown: $STATE" >&2 + exit 2 + ;; + esac + if db_go; then + STATE=$(($STATE + 1)) + else + STATE=$(($STATE - 1)) + fi +done + +# proper exit (0 or 1) above +errmsg "$license license could not be presented / was not accepted" +exit 2 diff -pruN 3.8/debian/prerm 3.8ubuntu2/debian/prerm --- 3.8/debian/prerm 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/prerm 2020-04-26 14:52:55.000000000 +0000 @@ -2,10 +2,13 @@ set -e +rm -f /var/lib/update-notifier/package-data-downloads/ttf-mscorefonts-installer.* + #DEBHELPER# if [ "$1" = "remove" ] && [ -e /var/lib/msttcorefonts/ms-fonts ]; then echo "Removing the downloaded fonts..." + rm -f /var/lib/update-notifier/package-data-downloads/ttf-mscorefonts-installer cd /usr/share/fonts/truetype/msttcorefonts && \ rm -f `cat /var/lib/msttcorefonts/ms-fonts` rm -f '/usr/share/doc/msttcorefonts/READ_ME!.gz' diff -pruN 3.8/debian/rules 3.8ubuntu2/debian/rules --- 3.8/debian/rules 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/rules 2020-04-26 14:52:55.000000000 +0000 @@ -1,7 +1,16 @@ #!/usr/bin/make -f +URLROOT = http://downloads.sourceforge.net/corefonts/ + %: dh $@ -override_dh_auto_build: - cat debian/postinst.in update-ms-fonts >> debian/postinst +override_dh_auto_install: + mkdir -p debian/tmp/usr/share/package-data-downloads + while read sum file; do \ + echo "Url: $(URLROOT)$$file"; \ + echo "Sha256: $$sum"; \ + echo ; \ + done < cabfiles.sha256sums > debian/tmp/usr/share/package-data-downloads/ttf-mscorefonts-installer + echo "Script: /usr/lib/msttcorefonts/update-ms-fonts" >> debian/tmp/usr/share/package-data-downloads/ttf-mscorefonts-installer + echo "Should-Download: msttcorefonts/accepted-mscorefonts-eula" >> debian/tmp/usr/share/package-data-downloads/ttf-mscorefonts-installer diff -pruN 3.8/debian/templates 3.8ubuntu2/debian/templates --- 3.8/debian/templates 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/templates 2020-04-26 14:52:55.000000000 +0000 @@ -22,13 +22,6 @@ _Description: Font files not found expected by this script. Please re-enter the directory containing the Microsoft font files or enter "none" to abort. -Template: msttcorefonts/savedir -Type: string -_Description: Where should these files be archived (optional): - If you would like to keep a permanent archive of the compressed Windows - self extracting files, enter the directory where you'd like them stored. - If you leave this blank, the files will be deleted after installation. - Template: msttcorefonts/dlurl Type: string _Description: Mirror to download from: @@ -38,12 +31,122 @@ _Description: Mirror to download from: to the directory containing the relevant files here. If not, just leave the field blank. -Template: msttcorefonts/http_proxy -Type: string -_Description: HTTP proxy to use: - If you need to use a proxy server, please enter it here (example: - http://192.168.0.1:8080). This will cause the font files to be - downloaded using your proxy. +Template: msttcorefonts/present-mscorefonts-eula +Type: note +Description: TrueType core fonts for the Web EULA + END-USER LICENSE AGREEMENT FOR + MICROSOFT SOFTWARE + . + IMPORTANT-READ CAREFULLY: This Microsoft End-User License Agreement + ("EULA") is a legal agreement between you (either an individual or a + single entity) and Microsoft Corporation for the Microsoft software + accompanying this EULA, which includes computer software and may + include associated media, printed materials, and "on-line" or + electronic documentation ("SOFTWARE PRODUCT" or "SOFTWARE"). By + exercising your rights to make and use copies of the SOFTWARE + PRODUCT, you agree to be bound by the terms of this EULA. If you do + not agree to the terms of this EULA, you may not use the SOFTWARE + PRODUCT. + . + SOFTWARE PRODUCT LICENSE + The SOFTWARE PRODUCT is protected by copyright laws and international + copyright treaties, as well as other intellectual property laws and + treaties. The SOFTWARE PRODUCT is licensed, not sold. + . + 1. GRANT OF LICENSE. This EULA grants you the following rights: + . + • Installation and Use. You may install and use an unlimited number + of copies of the SOFTWARE PRODUCT. + • Reproduction and Distribution. You may reproduce and distribute + an unlimited number of copies of the SOFTWARE PRODUCT; provided + that each copy shall be a true and complete copy, including all + copyright and trademark notices, and shall be accompanied by a + copy of this EULA. Copies of the SOFTWARE PRODUCT may not be + distributed for profit either on a standalone basis or included + as part of your own product. + . + 2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. + . + • Limitations on Reverse Engineering, Decompilation, and + Disassembly. You may not reverse engineer, decompile, or + disassemble the SOFTWARE PRODUCT, except and only to the extent + that such activity is expressly permitted by applicable law + notwithstanding this limitation. + • Restrictions on Alteration. You may not rename, edit or create + any derivative works from the SOFTWARE PRODUCT, other than + subsetting when embedding them in documents. + • Software Transfer. You may permanently transfer all of your + rights under this EULA, provided the recipient agrees to the + terms of this EULA. + • Termination. Without prejudice to any other rights, Microsoft may + terminate this EULA if you fail to comply with the terms and + conditions of this EULA. In such event, you must destroy all + copies of the SOFTWARE PRODUCT and all of its component parts. + . + 3. COPYRIGHT. All title and copyrights in and to the SOFTWARE PRODUCT + (including but not limited to any images, text, and "applets" + incorporated into the SOFTWARE PRODUCT), the accompanying printed + materials, and any copies of the SOFTWARE PRODUCT are owned by + Microsoft or its suppliers. The SOFTWARE PRODUCT is protected by + copyright laws and international treaty provisions. Therefore, you + must treat the SOFTWARE PRODUCT like any other copyrighted material. . - Leave this option blank if you don't use a proxy server. + 4. U.S. GOVERNMENT RESTRICTED RIGHTS. The SOFTWARE PRODUCT and + documentation are provided with RESTRICTED RIGHTS. Use, duplication, + or disclosure by the Government is subject to restrictions as set + forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and + Computer Software clause at DFARS 252.227-7013 or subparagraphs (c) + (1) and (2) of the Commercial Computer Software - Restricted Rights + at 48 CFR 52.227-19, as applicable. Manufacturer is Microsoft + Corporation/One Microsoft Way/Redmond, WA 98052-6399. + . + LIMITED WARRANTY + . + NO WARRANTIES. Microsoft expressly disclaims any warranty for the + SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation + is provided "as is" without warranty of any kind, either express or + implied, including, without limitation, the implied warranties or + merchantability, fitness for a particular purpose, or + noninfringement. The entire risk arising out of use or performance of + the SOFTWARE PRODUCT remains with you. + . + NO LIABILITY FOR CONSEQUENTIAL DAMAGES. In no event shall Microsoft + or its suppliers be liable for any damages whatsoever (including, + without limitation, damages for loss of business profits, business + interruption, loss of business information, or any other pecuniary + loss) arising out of the use of or inability to use this Microsoft + product, even if Microsoft has been advised of the possibility of + such damages. Because some states/jurisdictions do not allow the + exclusion or limitation of liability for consequential or incidental + damages, the above limitation may not apply to you. + . + MISCELLANEOUS + . + If you acquired this product in the United States, this EULA is + governed by the laws of the State of Washington. + . + If this product was acquired outside the United States, then local + laws may apply. + . + Should you have any questions concerning this EULA, or if you desire + to contact Microsoft for any reason, please contact the Microsoft + subsidiary serving your country, or write: Microsoft Sales + Information Center/One Microsoft Way/Redmond, WA 98052-6399. + . + Reference: http://www.microsoft.com/typography/fontpack/eula.htm +Template: msttcorefonts/accepted-mscorefonts-eula +Type: boolean +Default: false +_Description: Do you accept the EULA license terms? + In order to install this package, you must accept the license terms, the + "TrueType core fonts for the Web EULA ". Not accepting will cancel the + installation. + +Template: msttcorefonts/error-mscorefonts-eula +Type: error +_Description: Declined "TrueType core fonts for the Web EULA " + If you do not agree to the "TrueType core fonts for the Web EULA " license + terms you cannot install this software. + . + The installation of this package will be canceled. diff -pruN 3.8/debian/ttf-mscorefonts-installer.lintian-overrides 3.8ubuntu2/debian/ttf-mscorefonts-installer.lintian-overrides --- 3.8/debian/ttf-mscorefonts-installer.lintian-overrides 2020-04-26 12:11:25.000000000 +0000 +++ 3.8ubuntu2/debian/ttf-mscorefonts-installer.lintian-overrides 2020-04-26 14:52:55.000000000 +0000 @@ -1 +1,2 @@ ttf-mscorefonts-installer: package-contains-empty-directory usr/share/fonts/truetype/ +ttf-mscorefonts-installer: debconf-is-not-a-registry usr/lib/msttcorefonts/update-ms-fonts diff -pruN 3.8/update-ms-fonts 3.8ubuntu2/update-ms-fonts --- 3.8/update-ms-fonts 2020-04-26 12:13:08.000000000 +0000 +++ 3.8ubuntu2/update-ms-fonts 2020-04-26 16:51:04.000000000 +0000 @@ -1,36 +1,21 @@ #!/bin/sh -# Download and install the Microsoft Core Fonts for the Web -# -# (C) 2000,2001 Eric Sharkey. -# You may freely distribute this file under the terms of the GNU General -# Public License, version 2 or later. -#abort if anything goes wrong -#set -e +set -e + +. /usr/share/debconf/confmodule + FONTDIR=/usr/share/fonts/truetype/msttcorefonts -#if [ `id -u` != 0 ] ; then -# echo "update-ms-fonts can only be run as root." -# exit -1 -#fi -# #for opt in "$@"; do # case "$opt" in # -q) QUIET_MODE=1 ;; -# -c) CHECK_ONLY=1 ;; -# -s*) SAVEDIR=${opt#-s} ;; # -u*) URLOVERRIDE=${opt#-u} ;; # *) LOCALCOPY=$opt ;; # esac #done -if [ "`echo $LOCALCOPY | tr '[:upper:]' '[:lower:]'`" = "none" ] ; then - exit 0 -fi EXITCODE=0 -export http_proxy - mstt_exit_with_error() { echo "$1" >&2 echo "The fonts are NOT installed." >&2 @@ -38,26 +23,33 @@ mstt_exit_with_error() { exit 1 } -# Base URL for Microsoft fonts -# Can be more than one to try, but here we just use SF.net's redirection, -# which will work in most cases. The others serve as fallbacks to retry. -URLROOTS="https://downloads.sourceforge.net/corefonts/ - https://jaist.dl.sourceforge.net/sourceforge/corefonts/ - https://nchc.dl.sourceforge.net/sourceforge/corefonts/ - https://ufpr.dl.sourceforge.net/sourceforge/corefonts/ - https://internode.dl.sourceforge.net/sourceforge/corefonts/ - https://netcologne.dl.sourceforge.net/sourceforge/corefonts/ - https://vorboss.dl.sourceforge.net/sourceforge/corefonts/ - https://netix.dl.sourceforge.net/sourceforge/corefonts/" +db_get msttcorefonts/accepted-mscorefonts-eula || true +if [ "$RET" != "true" ]; then + mstt_exit_with_error "user did not accept the $license license" +fi + +if [ -z "$QUIET_MODE" ] ; then + cat < msfonts.info 48d9bc613917709d3b0e0f4a6d4fe33a5c544c5035dffe9e90bc11e50e822071 Andale_Mono.ttf andale32.exe andalemo.ttf dad7c04acb26e23dfe4780e79375ca193ddaf68409317e81577a30674668830e Arial_Black.ttf arialb32.exe ariblk.ttf @@ -91,122 +83,44 @@ c8f5065ba91680f596af3b0378e2c3e713b95a52 10d099c88521b1b9e380b7690cbe47b54bb19396ca515358cfdc15ac249e2f5d Webdings.ttf webdin32.exe webdings.ttf EOF -for ttf in `awk '{print $2}' msfonts.info` ; do - if [ ! -e $FONTDIR/$ttf ] || \ - [ `sha256sum $FONTDIR/$ttf | awk '{print $1}'` != `awk "/$ttf/ {print \\$1 }" msfonts.info` ] - then - THISFILE=`grep $ttf msfonts.info | awk '{print $3}'` - if ! echo $FONTFILES | grep -q $THISFILE ; then - FONTFILES="$FONTFILES $THISFILE" - fi - fi +for ff in "$@"; do + cabextract $ff 1>&2 || EXITCODE=1 + #rm $ff done -FFDONE="" -FFFAILED="" -if [ -n "$CHECK_ONLY" ] ; then - if [ -n "$FONTFILES" ] ; then - EXITCODE=1 +#Add some level of predictability by folding everything to lower case +for x in *; do + y=`echo $x | tr '[A-Z]' '[a-z]'` + if [ "$x" != "$y" ]; then + mv "$x" "$y" fi -elif [ -n "$FONTFILES" ] ; then - - if [ -z "$QUIET_MODE" ] ; then - cat <&2 - FFDONE="$FFDONE $ff" - else - FFFAILED="$FFFAILED $ff" - EXITCODE=1 - fi - if [ -n "$SAVEDIR" ] ; then - cp $ff "$SAVEDIR" - fi - rm $ff - done +:> /var/lib/msttcorefonts/ms-fonts - FONTFILES=$FFDONE - FFDONE="" - #Add some level of predictability by folding everything to lower case - for x in *; do - y=`echo $x | tr '[A-Z]' '[a-z]'` - if [ "$x" != "$y" ]; then - mv "$x" "$y" - fi - done - - chmod 644 * - - # Give sane names. These are nearly the same names MS uses for the - # Macintosh versions - - mkdir -p /usr/share/doc/ttf-mscorefonts-installer $FONTDIR - if [ -e licen.txt ] ; then - mv licen.txt '/usr/share/doc/ttf-mscorefonts-installer/READ_ME!' - gzip -f -9 '/usr/share/doc/ttf-mscorefonts-installer/READ_ME!' +awk "{ print \$4 \" \" \$2 }" msfonts.info | while read ttf longname +do + if ! mv $ttf $FONTDIR/$longname; then + FFFAILED="$FFFAILED $ttf" + EXITCODE=1 + continue fi - for ff in $FONTFILES; do - for ttf in `grep $ff msfonts.info | awk '{print $4}'`; do - longname=`awk "/$ttf/ { print \\$2 }" msfonts.info` - mv -Z $ttf $FONTDIR/$longname - ln -sf $longname $FONTDIR/$ttf - done - done - - # Make a note of what we installed so we can uninstall it later - awk '{print $2}' msfonts.info > /var/lib/msttcorefonts/ms-fonts - awk '{print $4}' msfonts.info >> /var/lib/msttcorefonts/ms-fonts - - dpkg-trigger --no-await /usr/share/fonts -fi + ln -sf $longname $FONTDIR/$ttf + # Make a note of what we installed so we can uninstall it later + echo $longname >> /var/lib/msttcorefonts/ms-fonts + echo $ttf >> /var/lib/msttcorefonts/ms-fonts +done cd / rm -rf $SCRATCHDIR @@ -223,6 +137,4 @@ if [ -z "$QUIETMODE" ] ; then fi fi -#DEBHELPER# - exit $EXITCODE