[Pkg-mozext-commits] [adblock-plus] 18/24: Merge remote-tracking branch 'buildtools/master'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 508f1c2c0441bb2b265eec5cc4c26bebc6590a1a
Merge: 9445b95 2efd35c
Author: David Prévot <taffit at debian.org>
Date:   Sun Oct 19 21:22:36 2014 -0400

    Merge remote-tracking branch 'buildtools/master'

 buildtools/LocaleTester.pm            |  17 +-
 buildtools/bootstrap.js.tmpl          |  19 +--
 buildtools/build.py                   |  17 +-
 buildtools/chainedconfigparser.py     |  20 +--
 buildtools/chromeDevenvPoller__.js    |  19 +--
 buildtools/chromeInfo.js.tmpl         |  19 +--
 buildtools/dependencies               |   2 +
 buildtools/ensure_dependencies.py     | 285 ++++++++++++++++++++++++++++++++++
 buildtools/imageConversion.py         |  17 +-
 buildtools/install.rdf.tmpl           |  19 +--
 buildtools/lib/hooks.js               |  19 +--
 buildtools/lib/keySelector.js         |  19 +--
 buildtools/lib/prefs.js               |  19 +--
 buildtools/lib/windowObserver.js      |  21 +--
 buildtools/localeTools.py             |  27 +---
 buildtools/manifest.json.tmpl         |  19 +--
 buildtools/packager.py                |  17 +-
 buildtools/packagerChrome.py          |  59 ++++---
 buildtools/packagerGecko.py           |  29 +---
 buildtools/packagerSafari.py          |  17 +-
 buildtools/publicSuffixListUpdater.py |  17 +-
 buildtools/releaseAutomation.py       |  64 ++++----
 buildtools/safariInfo.js.tmpl         |  19 +--
 23 files changed, 415 insertions(+), 365 deletions(-)

diff --cc buildtools/dependencies
index 0000000,cc72883..cc72883
mode 000000,100644..100644
--- a/buildtools/dependencies
+++ b/buildtools/dependencies
diff --cc buildtools/ensure_dependencies.py
index 0000000,ffe04a0..ffe04a0
mode 000000,100755..100755
--- a/buildtools/ensure_dependencies.py
+++ b/buildtools/ensure_dependencies.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git