Wed Sep 5 00:02:30 UTC 2012

6 files changed, 207 insertions, 91 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index add2fa659..49e837e02 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,24 +1,31 @@
-# $Id: PKGBUILD 163827 2012-07-20 23:47:38Z tomegun $
+# $Id: PKGBUILD 165634 2012-08-27 20:15:48Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=filesystem
-pkgver=2012.7
-pkgrel=1
+pkgver=2012.8
+pkgrel=1.2
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
 url='https://parabolagnulinux.org'
 groups=('base')
 install='filesystem.install'
+makedepends=('asciidoc')
 depends=('iana-etc' 'bash' 'coreutils')
 backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
         'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
         'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
 source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
-        'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
+        'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
+	'locale.sh')
+
+build() {
+	cd ${srcdir}
+	a2x -d manpage -f manpage parabola.7.txt
+}
 
 package() {
 	cd ${pkgdir}
@@ -47,6 +54,7 @@ package() {
 	done
 	touch etc/arch-release
 	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
+	install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh
 
 	# setup /var
 	for d in cache/man local opt log/old lib/misc empty; do
@@ -69,6 +77,10 @@ package() {
 		install -d -m755 usr/share/man/man${d}
 	done
 
+	#
+	# install parabola(7) manpage
+	#
+	install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7
 
 	#
 	# setup /usr/local hierarchy
@@ -95,4 +107,6 @@ md5sums=('45940618da782cc391c59f88ab3333c3'
          '22518e922891f9359f971f4f5b4e793c'
          'f95416882cef800edef08382a1176b7d'
          'f3b6ae7db8adffaaa4bffc6099dcbd50'
-         'a8a962370cd0128465d514e6a1f74130')
+         'a8a962370cd0128465d514e6a1f74130'
+         '3674fcb22044d2946934e7826aa0c632'
+         '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh
new file mode 100644
index 000000000..5fd4174d5
--- /dev/null
+++ b/libre/filesystem/locale.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
+      LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
+
+if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
+  . "$XDG_CONFIG_HOME/locale.conf"
+elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
+  . "$HOME/.config/locale.conf"
+elif [ -r /etc/locale.conf ]; then
+  . /etc/locale.conf
+elif [ -r /etc/rc.conf ]; then
+  LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE")
+fi
+
+export LANG="${LANG:-C}"
+[ -n "$LC_CTYPE" ]          && export LC_CTYPE
+[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
+[ -n "$LC_TIME" ]           && export LC_TIME
+[ -n "$LC_COLLATE" ]        && export LC_COLLATE
+[ -n "$LC_MONETARY" ]       && export LC_MONETARY
+[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
+[ -n "$LC_PAPER" ]          && export LC_PAPER
+[ -n "$LC_NAME" ]           && export LC_NAME
+[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION
diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem/parabola.7.txt
new file mode 100644
index 000000000..f7da03147
--- /dev/null
+++ b/libre/filesystem/parabola.7.txt
@@ -0,0 +1,81 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+parabola(7)
+============
+
+NAME
+----
+parabola - basic configuration
+
+SYNOPSIS
+--------
+Overview of the basic configuration of Parabola GNU/Linux-libre.
+
+DESCRIPTION
+-----------
+Parabola exposes the user to the system without hiding any details. This manpage gives a
+brief overview of the configuration files that should be set up on a fresh install.
+
+INITSCRIPTS[[I]]
+----------------
+The initscripts are configured in rc.conf. Here you configure what daemons to start on boot, what storage
+technologies should be enabled and, optionally, a basic network setup.
+
+HOSTNAME[[H]]
+-------------
+The hostname of the machine should be set in /etc/hostname. Additionally, either /etc/hosts should be
+configured accordingly, or nss-myhostname should be used. This is needed so the hostname can always
+be resolved to the current machine, which is required by some programs.
+
+LOCALIZATION[[L]]
+-----------------
+Various locales may be enabled in /etc/locale.gen, and generated by locale-gen. The system-wide locale to be used
+can be configured in /etc/locale.conf. These settings can be overridden on a par-user basis by keeping a
+user-spcefic locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists.
+
+VIRTUAL CONSOLE[[V]]
+--------------------
+The virtual console is configured in /etc/vconsole.conf. It allows you to set a font and a keyboard layout, among
+other things. Note that these settings only apply to the console, and not if you use X.
+
+TIME[[T]]
+---------
+The local timezone is configured by *symlinking* /etc/localtime to the correct zoneinfo file under
+/usr/share/zoneinfo/. E.g.,
+
+    /etc/localtime -> /usr/share/zoneinfo/Europe/Paris
+
+The real-time clock, which keeps track of time when the computer is off, can be configured to either
+be in UTC or in localtime in /etc/adjtime. The default is UTC.
+
+FILESYSTEMS[[F]]
+----------------
+Filesystems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab.
+
+INITRAMFS[[R]]
+--------------
+The initramfs is generated by mkinitcpio, and can be configured in /etc/mkinitcpio.conf.
+
+PACKAGE MANAGER[[P]]
+--------------------
+The package manager, pacman, is configured in /etc/pacman.conf.
+
+BOOTLOADER[[B]]
+---------------
+GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.cfg
+
+MODULES[[M]]
+------------
+Most modules should be loaded on-demand. Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/,
+and modules to be blacklisted from auto-loading can be configured in /etc/modprobe.d/.
+
+SEE ALSO
+--------
+
+rc.conf(5), hostname(5), hosts(5), nsswitch.conf(5), locale.conf(5), vconsole.conf(5), timezone(3), hwclock(8), fstab(5), crypttab(5),
+mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5)
+
+AUTHORS
+-------
+Written by Tom Gundersen. Rebranded for Parabola by Nicolás Reynolds and André Silva.
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 706b2d0d7..9d5226562 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 161863 2012-06-15 23:14:52Z eric $
+# $Id: PKGBUILD 165910 2012-09-03 19:19:26Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.7
+pkgver=1.8.8
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -18,20 +18,20 @@ depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-t
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
         remove-non-free-suggestions.patch)
-sha1sums=('3cdadae3b3bcec2da048257b72a5d7c11a9621f1'
+sha1sums=('9dfbf5ff8bd91060bdea93d74c37a8a828a2edfe'
           '0d68c567c3d37932a49709c58c37c3f138fd19cb')
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/liferea-${pkgver}"
   patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
   make
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/liferea-${pkgver}"
   make DESTDIR="${pkgdir}" install
   
   install -d "${pkgdir}/usr/share/gconf/schemas"
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 4a0507271..240c3d4e8 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
@@ -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/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 8c332db12..c4e72cfea 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -6,8 +6,8 @@
 
 # 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/&/&@'; }
 
@@ -30,11 +30,11 @@ options=('!emptydirs')
 conflicts=('xulrunner')
 provides=("xulrunner=${_debver}")
 replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('8e4f3987d37c8e73b168948d0771b872'
-         '8689c150a4d3a0a688ad2db6044feac6'
+md5sums=('aa5a7f08f55a2b02a71c86f30ef75a25'
+         'b93090724434e3801375730744e79950'
          'f2f4f4a573f549e8b494e33b3ad226bc'
          '27271ce647a83906ef7a24605e840d61'
-         '88350bc611361a1ff635f5c960c6d6ee')
+         'c52fac65c1e06290a5108b75c31ace79')
 
 build() {
   export QUILT_PATCHES=debian/patches