Sun Oct 21 09:47:14 PDT 2012

2 files changed, 14 insertions, 14 deletions

diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 240c3d4e8..a5fe02165 100644
--- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -139,7 +139,7 @@ index 21cf405..f3c1a6b 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 ab82d85..915f6b8 100644

+index 260bc29..52b32cc 100644

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

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

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

@@ -150,7 +150,7 @@ index ab82d85..915f6b8 100644
  

  importedBookmarksFolder=From %S

  

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

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

  2_ie=Cookies

  2_safari=Cookies

  2_chrome=Cookies

@@ -177,25 +177,25 @@ index ab82d85..915f6b8 100644
  

  32_ie=Favorites

  32_safari=Bookmarks

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

+@@ -48,4 +47,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/jar.mn b/toolkit/content/jar.mn

-index 697b217..b6e1709 100644

+index 339ffda..6999b26 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/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)

+    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

@@ -267,10 +267,10 @@ index f35c227..7062886 100644
  

  %{C++

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

-index e5d3042..6de3390 100644

+index 60348b5..c240c4f 100644

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

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

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

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

          if (gDoProfileReset) {

            // Automatically migrate from the current application if we just

            // reset the profile.

diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 4c93e1c48..0d5f817e6 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=15.0.1
+_debver=16.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -30,11 +30,11 @@ options=('!emptydirs')
 conflicts=('xulrunner')
 provides=("xulrunner=${_debver}")
 replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('0936242388cd4c75930c1d2487e15216'
-         'ce37c76476b8edf40780d00cf79d0d62'
+md5sums=('33e50f7ddfa7274e5a3bd393c37fb3b3'
+         'ddfcf225ea0e3d7b4b377f4a63d5e8c4'
          'f2f4f4a573f549e8b494e33b3ad226bc'
          '27271ce647a83906ef7a24605e840d61'
-         'c52fac65c1e06290a5108b75c31ace79')
+         '0a31239f1008038df5057982fe745dec')
 
 build() {
   export QUILT_PATCHES=debian/patches