[Bug 1542710] Re: [FFe] Merge latest version (3.6) with Debian

[Amr Ibrahim]

*** This bug is a duplicate of bug 1563840 ***
    https://bugs.launchpad.net/bugs/1563840

** Description changed:

  Please merge latest version (3.6) with Debian.
  
  The merge adds two fixes not available in the Ubuntu delta:
  
-   * Proxy test failed when HTTP:// is given in uppercase. Thanks
-     Tobias Olsson (LP: #1072580).
-   * Show licence message when fonts actually installed (closes: #672259).
+   * Proxy test failed when HTTP:// is given in uppercase. Thanks
+     Tobias Olsson (LP: #1072580).
+   * Show licence message when fonts actually installed (closes: #672259).
  -------------------------------------------------------------------------
+ 
+ Sorry I can't work on this merge since I lack packaging skills.
+ ---------------------------------------------------------------
  
  Ubuntu changelog:
  
  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 <adconrad at ubuntu.com>   Thu, 11 Sep 2014 00:08:50 -0600
+   * 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 <adconrad at ubuntu.com>   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 <logatronico at gmail.com>   Thu, 29 Nov 2012 21:35:42 -0500
+   * 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 <logatronico at gmail.com>   Thu, 29 Nov 2012 21:35:42 -0500
  --------------------------------------------------------------------------
  
  Debian changelog:
  
  msttcorefonts (3.6) unstable; urgency=medium
  
-   * Add Turkish translation, thanks Mert Dirik (closes: #757868).
-   * Update to policy 3.9.6, no changes.
+   * Add Turkish translation, thanks Mert Dirik (closes: #757868).
+   * Update to policy 3.9.6, no changes.
  
-  -- Thijs Kinkhorst <thijs at debian.org>  Thu, 16 Oct 2014 05:52:57 +0000
+  -- Thijs Kinkhorst <thijs at debian.org>  Thu, 16 Oct 2014 05:52:57 +0000
  
  msttcorefonts (3.5) unstable; urgency=low
  
-   * Mark Multi-Arch: foreign, thanks Scott Ritchie, Daniel Hartwig
-     (closes: #700684).
-   * Switch to debhelper 9. Update for policy 3.9.4 (no changes).
-   * 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.
-     Thanks Colin Watson (closes: #659724).
-   * Proxy test failed when HTTP:// is given in uppercase. Thanks
-     Tobias Olsson (LP: #1072580).
-   * Show licence message when fonts actually installed (closes: #672259).
+   * Mark Multi-Arch: foreign, thanks Scott Ritchie, Daniel Hartwig
+     (closes: #700684).
+   * Switch to debhelper 9. Update for policy 3.9.4 (no changes).
+   * 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.
+     Thanks Colin Watson (closes: #659724).
+   * Proxy test failed when HTTP:// is given in uppercase. Thanks
+     Tobias Olsson (LP: #1072580).
+   * Show licence message when fonts actually installed (closes: #672259).
  
-  -- Thijs Kinkhorst <thijs at debian.org>  Sat, 16 Feb 2013 11:55:44 +0100
+  -- Thijs Kinkhorst <thijs at debian.org>  Sat, 16 Feb 2013 11:55:44 +0100

-- 
You received this bug notification because you are a member of Ubuntu
Contributing Developers, which is subscribed to the bug report.
https://bugs.launchpad.net/bugs/1542710

Title:
  [FFe] Merge latest version (3.6) with Debian

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/msttcorefonts/+bug/1542710/+subscriptions