diff -Nru adblock-plus-2.4.1+dfsg/addChecksum.py adblock-plus-2.6+dfsg/addChecksum.py
--- adblock-plus-2.4.1+dfsg/addChecksum.py 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/addChecksum.py 2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@
# coding: utf-8
# This file is part of Adblock Plus ,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
#
# Adblock Plus is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/bootstrap.js.tmpl adblock-plus-2.6+dfsg/buildtools/bootstrap.js.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/bootstrap.js.tmpl 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/bootstrap.js.tmpl 2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
/*
* This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
*
* Adblock Plus is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3 as
@@ -20,7 +20,7 @@
const Cr = Components.results;
const Cu = Components.utils;
-let {Services, atob, btoa, File} = Cu.import("resource://gre/modules/Services.jsm", null);
+let {Services, atob, btoa, File, TextDecoder, TextEncoder} = Cu.import("resource://gre/modules/Services.jsm", null);
{%- if hasXMLHttpRequest %}
let XMLHttpRequest = Components.Constructor("@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest");
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/build.py adblock-plus-2.6+dfsg/buildtools/build.py
--- adblock-plus-2.4.1+dfsg/buildtools/build.py 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/build.py 2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
# coding: utf-8
# This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
#
# Adblock Plus is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/chainedconfigparser.py adblock-plus-2.6+dfsg/buildtools/chainedconfigparser.py
--- adblock-plus-2.4.1+dfsg/buildtools/chainedconfigparser.py 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/chainedconfigparser.py 2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
# coding: utf-8
# This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
#
# Adblock Plus is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/chromeDevenvPoller__.js.tmpl adblock-plus-2.6+dfsg/buildtools/chromeDevenvPoller__.js.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/chromeDevenvPoller__.js.tmpl 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/chromeDevenvPoller__.js.tmpl 2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
/*
* This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
*
* Adblock Plus is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/chromeInfo.js.tmpl adblock-plus-2.6+dfsg/buildtools/chromeInfo.js.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/chromeInfo.js.tmpl 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/chromeInfo.js.tmpl 2014-04-22 06:28:36.000000000 +0000
@@ -1,6 +1,6 @@
/*
* This file is part of the Adblock Plus build tools,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
*
* Adblock Plus is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/.hgsubstate adblock-plus-2.6+dfsg/buildtools/.hgsubstate
--- adblock-plus-2.4.1+dfsg/buildtools/.hgsubstate 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/.hgsubstate 2014-04-22 06:28:36.000000000 +0000
@@ -1 +1 @@
-6737deead473f5b2290c3e039e935669d732ded1 jshydra
+77e57ef745092d07ae5d2d05d61f964790332252 jshydra
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/imageConversion.py adblock-plus-2.6+dfsg/buildtools/imageConversion.py
--- adblock-plus-2.4.1+dfsg/buildtools/imageConversion.py 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/imageConversion.py 2014-04-22 06:28:36.000000000 +0000
@@ -1,7 +1,7 @@
# coding: utf-8
# This file is part of the Adblock Plus build tools,
-# Copyright (C) 2006-2013 Eyeo GmbH
+# Copyright (C) 2006-2014 Eyeo GmbH
#
# Adblock Plus is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 3 as
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/Info.plist.tmpl adblock-plus-2.6+dfsg/buildtools/Info.plist.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/Info.plist.tmpl 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/Info.plist.tmpl 2014-04-22 06:28:36.000000000 +0000
@@ -17,7 +17,7 @@
CFBundleInfoDictionaryVersion
6.0
CFBundleShortVersionString
- {{ shortVersion }}
+ {{ version }}
CFBundleVersion
{{ version }}
Chrome
@@ -72,6 +72,8 @@
Identifier
{{ identifier }}
+ Label
+ {{ name }}
{%- for key, value in props.iteritems() %}
{{ key }}
{{ str_or_real(value) }}
diff -Nru adblock-plus-2.4.1+dfsg/buildtools/install.rdf.tmpl adblock-plus-2.6+dfsg/buildtools/install.rdf.tmpl
--- adblock-plus-2.4.1+dfsg/buildtools/install.rdf.tmpl 2014-01-18 15:03:07.000000000 +0000
+++ adblock-plus-2.6+dfsg/buildtools/install.rdf.tmpl 2014-04-22 06:28:36.000000000 +0000
@@ -2,7 +2,7 @@