Merge branch 'master' of ssh://gparabola/srv/git/abslibre

2 files changed, 75 insertions, 82 deletions

diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 4a0507271..240c3d4e8 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -41,10 +41,10 @@ index 0e8ccf5..fa46c08 100644
          brandBundle.getFormattedString("homePageImport", [appName]);

        var oldHomePage = document.getElementById("oldHomePage");

 diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul

-index 4bcc1d9..c4db956 100644

+index f030756..23e37ff 100644

 --- a/browser/components/migration/content/migration.xul

 +++ b/browser/components/migration/content/migration.xul

-@@ -74,7 +74,7 @@

+@@ -42,7 +42,7 @@

  #elifdef XP_UNIX

        <radio id="chrome"    label="&importFromChrome.label;"    accesskey="&importFromChrome.accesskey;"/>

  #endif

@@ -54,7 +54,7 @@ index 4bcc1d9..c4db956 100644
      </radiogroup>

      <label id="noSources" hidden="true">&noMigrationSources.label;</label>

 diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest

-index 527771f..782b38f 100644

+index d7fec75..d531b83 100644

 --- a/browser/components/migration/src/BrowserProfileMigrators.manifest

 +++ b/browser/components/migration/src/BrowserProfileMigrators.manifest

 @@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737

@@ -63,11 +63,11 @@ index 527771f..782b38f 100644
  component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js

 -contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}

 +contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}

+ #ifdef HAS_IE_MIGRATOR

  component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js

  contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}

- component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js

 diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js

-index 8f14f49..8dc175d 100644

+index a6598fe..8f83da8 100644

 --- a/browser/components/migration/src/FirefoxProfileMigrator.js

 +++ b/browser/components/migration/src/FirefoxProfileMigrator.js

 @@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {

@@ -80,7 +80,7 @@ index 8f14f49..8dc175d 100644
  

  const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);

 diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm

-index 9460e6d..8db6827 100644

+index 0669aa8..19552e3 100644

 --- a/browser/components/migration/src/MigrationUtils.jsm

 +++ b/browser/components/migration/src/MigrationUtils.jsm

 @@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({

@@ -126,10 +126,10 @@ index 744f117..59e5a4c 100644
    classDescription: "Profile Migrator",

    contractID: "@mozilla.org/toolkit/profile-migrator;1",

 diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd

-index 0b4b776..ce26fbd 100644

+index 21cf405..f3c1a6b 100644

 --- a/browser/locales/en-US/chrome/browser/migration/migration.dtd

 +++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd

-@@ -13,8 +13,6 @@

+@@ -17,8 +17,6 @@

  <!ENTITY importFromSafari.accesskey     "S">

  <!ENTITY importFromChrome.label         "Chrome">

  <!ENTITY importFromChrome.accesskey     "C">

@@ -139,10 +139,10 @@ index 0b4b776..ce26fbd 100644
  <!ENTITY noMigrationSources.label       "No programs that contain bookmarks, history or password data could be found.">

  

 diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties

-index f522a66..be26460 100644

+index ab82d85..915f6b8 100644

 --- a/browser/locales/en-US/chrome/browser/migration/migration.properties

 +++ b/browser/locales/en-US/chrome/browser/migration/migration.properties

-@@ -4,7 +4,6 @@ profileName_format=%S %S

+@@ -8,7 +8,6 @@ profileName_format=%S %S

  sourceNameIE=Internet Explorer

  sourceNameSafari=Safari

  sourceNameChrome=Google Chrome

@@ -150,7 +150,7 @@ index f522a66..be26460 100644
  

  importedBookmarksFolder=From %S

  

-@@ -18,29 +17,29 @@ importedSafariReadingList=Reading List (From Safari)

+@@ -22,22 +21,22 @@ importedSafariReadingList=Reading List (From Safari)

  2_ie=Cookies

  2_safari=Cookies

  2_chrome=Cookies

@@ -177,79 +177,72 @@ index f522a66..be26460 100644
  

  32_ie=Favorites

  32_safari=Bookmarks

- 32_chrome=Bookmarks

--32_firefox=Bookmarks

-+32_self=Bookmarks

- 

+@@ -46,4 +45,4 @@ importedSafariReadingList=Reading List (From Safari)

  64_ie=Other Data

  64_safari=Other Data

  64_chrome=Other Data

 -64_firefox=Bookmarks Backups

 +64_self=Bookmarks Backups

-diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js

-index 957d4d8..1af3629 100644

---- a/toolkit/content/aboutSupport.js

-+++ b/toolkit/content/aboutSupport.js

-@@ -616,13 +616,13 @@ function populateResetBox() {

-                          .getService(Ci.nsIToolkitProfileService);

+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

+index 697b217..b6e1709 100644

+--- a/toolkit/content/jar.mn

++++ b/toolkit/content/jar.mn

+@@ -38,7 +38,7 @@ toolkit.jar:

+ +  content/global/mozilla.xhtml               (mozilla.xhtml)

+ *+ content/global/nsDragAndDrop.js            (nsDragAndDrop.js)

+    content/global/resetProfile.css            (resetProfile.css)

+-*  content/global/resetProfile.js             (resetProfile.js)

++   content/global/resetProfile.js             (resetProfile.js)

+ *  content/global/resetProfile.xul            (resetProfile.xul)

+ *  content/global/resetProfileProgress.xul    (resetProfileProgress.xul)

+ *  content/global/treeUtils.js                (treeUtils.js)

+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js

+index dcb4065..09c1146 100644

+--- a/toolkit/content/resetProfile.js

++++ b/toolkit/content/resetProfile.js

+@@ -36,13 +36,13 @@ function resetSupported() {

+                        getService(Ci.nsIToolkitProfileService);

    let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);

  

 -#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

 -#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

 -

-   // Only show the reset box for the default profile if the self-migrator used for reset exists.

+   // Reset is only supported for the default profile if the self-migrator used for reset exists.

    try {

-     if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) ||

--        !("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc))

-+        !("@mozilla.org/toolkit/profile-migrator;1" in Cc))

-+      return;

-+    let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);

-+    if (!("canMigrate" in pm) || !pm.canMigrate("self"))

-       return;

-     document.getElementById("reset-box").style.visibility = "visible";

+-    return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&

+-             ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);

++    if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&

++        "@mozilla.org/toolkit/profile-migrator;1" in Cc) {

++      let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);

++      return ("canMigrate" in pm) && pm.canMigrate("self");

++    }

    } catch (e) {

-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js

-index 84de6cd..3126da6 100644

---- a/toolkit/content/resetProfile.js

-+++ b/toolkit/content/resetProfile.js

-@@ -6,6 +6,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");

+     // Catch exception when there is no selected profile.

+     Cu.reportError(e);

+@@ -53,9 +53,6 @@ function resetSupported() {

+ function getMigratedData() {

+   Components.utils.import("resource:///modules/MigrationUtils.jsm");

  

- // based on onImportItemsPageShow from migration.js

- function onResetProfileLoad() {

-+<<<<<<< HEAD

- #expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

- #expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

- 

-@@ -16,16 +17,22 @@ function onResetProfileLoad() {

-     "8_" + MOZ_APP_NAME,  // Form History

-     "2_" + MOZ_APP_NAME,  // Cookies

-   ];

-+=======

-+  Components.utils.import("resource:///modules/MigrationUtils.jsm");

-+  const MAX_MIGRATED_TYPES = 16;

-+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic

- 

-   var migratedItems = document.getElementById("migratedItems");

--  var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +

--                                             "/locale/migration/migration.properties");

- 

-   // Loop over possible data to migrate to give the user a list of what will be preserved.

-   for (var itemStringName of MIGRATED_TYPES) {

+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

+-

+   // From migration.properties

+   const MIGRATED_TYPES = [

+     4,  // History and Bookmarks

+@@ -68,7 +65,7 @@ function getMigratedData() {

+   let dataTypes = [];

+   for (let itemID of MIGRATED_TYPES) {

      try {

-       var checkbox = document.createElement("label");

-+<<<<<<< HEAD

-       checkbox.setAttribute("value", bundle.GetStringFromName(itemStringName));

-+=======

-+      checkbox.setAttribute("value", MigrationUtils.getLocalizedString(itemID + "_self"));

-+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic

-       migratedItems.appendChild(checkbox);

+-      let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);

++      let typeName = MigrationUtils.getLocalizedString(itemID + "_self");

+       dataTypes.push(typeName);

      } catch (x) {

        // Catch exceptions when the string for a data type doesn't exist.

 diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl

-index e941336..5b264af 100644

+index f35c227..7062886 100644

 --- a/toolkit/profile/nsIProfileMigrator.idl

 +++ b/toolkit/profile/nsIProfileMigrator.idl

-@@ -69,7 +69,7 @@ interface nsIProfileStartup : nsISupports

+@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports

   * @client   Toolkit (Startup code)

   * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")

   */

@@ -258,7 +251,7 @@ index e941336..5b264af 100644
  interface nsIProfileMigrator : nsISupports 

  {

    /**

-@@ -92,6 +92,14 @@ interface nsIProfileMigrator : nsISupports

+@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports

     * @note The startup code ignores COM exceptions thrown from this method.

     */

    void migrate(in nsIProfileStartup aStartup, in ACString aKey);

@@ -274,15 +267,15 @@ index e941336..5b264af 100644
  

  %{C++

 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp

-index d2db0e2..45a4b0d 100644

+index e5d3042..6de3390 100644

 --- a/toolkit/xre/nsAppRunner.cpp

 +++ b/toolkit/xre/nsAppRunner.cpp

-@@ -3642,7 +3642,7 @@ XREMain::XRE_mainRun()

-       if (gDoProfileReset) {

-         // Automatically migrate from the current application if we just

-         // reset the profile.

--        aKey = MOZ_APP_NAME;

-+        aKey = "self";

+@@ -3650,7 +3650,7 @@ XREMain::XRE_mainRun()

+         if (gDoProfileReset) {

+           // Automatically migrate from the current application if we just

+           // reset the profile.

+-          aKey = MOZ_APP_NAME;

++          aKey = "self";

+         }

          pm->Migrate(&mDirProvider, aKey);

-         // Set the new profile as the default after migration.

-         rv = SetCurrentProfileAsDefault(mProfileSvc, mProfD);

+       }

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 259413591..59435e71a 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,15 +14,15 @@ _pgo=false
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=14.0.1
-_debrel=2
+_debver=15.0
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -52,8 +52,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         vendor.js
         shared-libs.patch
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('8e4f3987d37c8e73b168948d0771b872'
-         '8689c150a4d3a0a688ad2db6044feac6'
+md5sums=('aa5a7f08f55a2b02a71c86f30ef75a25'
+         'b93090724434e3801375730744e79950'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
@@ -61,7 +61,7 @@ md5sums=('8e4f3987d37c8e73b168948d0771b872'
          'e529742c0a425648087bc3ce537fe4c5'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93'
-         '88350bc611361a1ff635f5c960c6d6ee')
+         'c52fac65c1e06290a5108b75c31ace79')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
@@ -129,7 +129,7 @@ package() {
   cd "${srcdir}/${DEBIAN_BUILD}"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
+  install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"
 
   # I don't even know why we're hitting the objdir, and ConnOS didn't.
   _brandingdir=debian/branding