[Pkg-mozext-commits] [adblock-plus] 459/464: 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 b0a5f3608dbdfd27f6aca49342f59222675656f2
Merge: 711d46b 2f8dde6
Author: David Prévot <taffit at debian.org>
Date:   Tue Jul 22 14:44:25 2014 -0400

    Merge remote-tracking branch 'buildtools/master'

 buildtools/.hgignore                  |   3 +
 buildtools/.hgtags                    |  96 ++++++
 buildtools/Info.plist.tmpl            | 161 ++++++++++
 buildtools/LocaleTester.pm            | 331 +++++++++++++++++++
 buildtools/__init__.py                |   0
 buildtools/background.html.tmpl       |   9 +
 buildtools/bootstrap.js.tmpl          | 202 ++++++++++++
 buildtools/build.py                   | 578 ++++++++++++++++++++++++++++++++++
 buildtools/chainedconfigparser.py     | 128 ++++++++
 buildtools/chromeDevenvPoller__.js    |  40 +++
 buildtools/chromeInfo.js.tmpl         |  44 +++
 buildtools/imageConversion.py         | 135 ++++++++
 buildtools/install.rdf.tmpl           | 116 +++++++
 buildtools/lib/hooks.js               |  93 ++++++
 buildtools/lib/keySelector.js         | 228 ++++++++++++++
 buildtools/lib/prefs.js               | 203 ++++++++++++
 buildtools/lib/windowObserver.js      | 112 +++++++
 buildtools/localeTools.py             | 469 +++++++++++++++++++++++++++
 buildtools/manifest.json.tmpl         |  92 ++++++
 buildtools/packager.py                | 136 ++++++++
 buildtools/packagerChrome.py          | 399 +++++++++++++++++++++++
 buildtools/packagerGecko.py           | 344 ++++++++++++++++++++
 buildtools/packagerSafari.py          | 268 ++++++++++++++++
 buildtools/publicSuffixListUpdater.py |  70 ++++
 buildtools/releaseAutomation.py       | 110 +++++++
 buildtools/safariInfo.js.tmpl         |  32 ++
 26 files changed, 4399 insertions(+)

diff --cc buildtools/.hgignore
index 0000000,bb6d589..bb6d589
mode 000000,100644..100644
--- a/buildtools/.hgignore
+++ b/buildtools/.hgignore
diff --cc buildtools/.hgtags
index 0000000,57d48bd..57d48bd
mode 000000,100644..100644
--- a/buildtools/.hgtags
+++ b/buildtools/.hgtags
diff --cc buildtools/Info.plist.tmpl
index 0000000,67042f1..67042f1
mode 000000,100644..100644
--- a/buildtools/Info.plist.tmpl
+++ b/buildtools/Info.plist.tmpl
diff --cc buildtools/LocaleTester.pm
index 0000000,9c00941..9c00941
mode 000000,100644..100644
--- a/buildtools/LocaleTester.pm
+++ b/buildtools/LocaleTester.pm
diff --cc buildtools/__init__.py
index 0000000,e69de29..e69de29
mode 000000,100644..100644
--- a/buildtools/__init__.py
+++ b/buildtools/__init__.py
diff --cc buildtools/background.html.tmpl
index 0000000,6dfa0a8..6dfa0a8
mode 000000,100644..100644
--- a/buildtools/background.html.tmpl
+++ b/buildtools/background.html.tmpl
diff --cc buildtools/bootstrap.js.tmpl
index 0000000,08878e1..08878e1
mode 000000,100644..100644
--- a/buildtools/bootstrap.js.tmpl
+++ b/buildtools/bootstrap.js.tmpl
diff --cc buildtools/build.py
index 0000000,d4afa6c..d4afa6c
mode 000000,100644..100644
--- a/buildtools/build.py
+++ b/buildtools/build.py
diff --cc buildtools/chainedconfigparser.py
index 0000000,bfe30c3..bfe30c3
mode 000000,100644..100644
--- a/buildtools/chainedconfigparser.py
+++ b/buildtools/chainedconfigparser.py
diff --cc buildtools/chromeDevenvPoller__.js
index 0000000,2c50487..2c50487
mode 000000,100644..100644
--- a/buildtools/chromeDevenvPoller__.js
+++ b/buildtools/chromeDevenvPoller__.js
diff --cc buildtools/chromeInfo.js.tmpl
index 0000000,8d5687f..8d5687f
mode 000000,100644..100644
--- a/buildtools/chromeInfo.js.tmpl
+++ b/buildtools/chromeInfo.js.tmpl
diff --cc buildtools/imageConversion.py
index 0000000,1ac6ee2..1ac6ee2
mode 000000,100644..100644
--- a/buildtools/imageConversion.py
+++ b/buildtools/imageConversion.py
diff --cc buildtools/install.rdf.tmpl
index 0000000,900a4ef..900a4ef
mode 000000,100644..100644
--- a/buildtools/install.rdf.tmpl
+++ b/buildtools/install.rdf.tmpl
diff --cc buildtools/lib/hooks.js
index 0000000,8645a8b..8645a8b
mode 000000,100644..100644
--- a/buildtools/lib/hooks.js
+++ b/buildtools/lib/hooks.js
diff --cc buildtools/lib/keySelector.js
index 0000000,20847d9..20847d9
mode 000000,100644..100644
--- a/buildtools/lib/keySelector.js
+++ b/buildtools/lib/keySelector.js
diff --cc buildtools/lib/prefs.js
index 0000000,e1b6ae0..e1b6ae0
mode 000000,100644..100644
--- a/buildtools/lib/prefs.js
+++ b/buildtools/lib/prefs.js
diff --cc buildtools/lib/windowObserver.js
index 0000000,eb0b13a..eb0b13a
mode 000000,100644..100644
--- a/buildtools/lib/windowObserver.js
+++ b/buildtools/lib/windowObserver.js
diff --cc buildtools/localeTools.py
index 0000000,f0dd721..f0dd721
mode 000000,100644..100644
--- a/buildtools/localeTools.py
+++ b/buildtools/localeTools.py
diff --cc buildtools/manifest.json.tmpl
index 0000000,2839cb1..2839cb1
mode 000000,100644..100644
--- a/buildtools/manifest.json.tmpl
+++ b/buildtools/manifest.json.tmpl
diff --cc buildtools/packager.py
index 0000000,86fca1f..86fca1f
mode 000000,100644..100644
--- a/buildtools/packager.py
+++ b/buildtools/packager.py
diff --cc buildtools/packagerChrome.py
index 0000000,7fefa79..7fefa79
mode 000000,100644..100644
--- a/buildtools/packagerChrome.py
+++ b/buildtools/packagerChrome.py
diff --cc buildtools/packagerGecko.py
index 0000000,ab73145..ab73145
mode 000000,100644..100644
--- a/buildtools/packagerGecko.py
+++ b/buildtools/packagerGecko.py
diff --cc buildtools/packagerSafari.py
index 0000000,6374f3f..6374f3f
mode 000000,100644..100644
--- a/buildtools/packagerSafari.py
+++ b/buildtools/packagerSafari.py
diff --cc buildtools/publicSuffixListUpdater.py
index 0000000,c581cbf..c581cbf
mode 000000,100644..100644
--- a/buildtools/publicSuffixListUpdater.py
+++ b/buildtools/publicSuffixListUpdater.py
diff --cc buildtools/releaseAutomation.py
index 0000000,98724d2..98724d2
mode 000000,100644..100644
--- a/buildtools/releaseAutomation.py
+++ b/buildtools/releaseAutomation.py
diff --cc buildtools/safariInfo.js.tmpl
index 0000000,2ff4dd7..2ff4dd7
mode 000000,100644..100644
--- a/buildtools/safariInfo.js.tmpl
+++ b/buildtools/safariInfo.js.tmpl

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