[28735] in Source-Commits
chromium-config commit: Use /etc/chromium.d when it exists (Debian jessie and later)
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sun Nov 13 22:48:24 2016
Date: Sun, 13 Nov 2016 22:48:15 -0500
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201611140348.uAE3mF4Q028158@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/chromium-config/commit/9616d2617c2175567c8c841d42d94248b1e8ff63
commit 9616d2617c2175567c8c841d42d94248b1e8ff63
Author: Anders Kaseorg <andersk@mit.edu>
Date: Sun Nov 13 22:47:50 2016 -0500
Use /etc/chromium.d when it exists (Debian jessie and later)
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
debian/changelog | 6 ++++++
debian/debathena | 1 +
debian/rules | 4 ++++
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3729c39..7f18a67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-chromium-config (1.2) unstable; urgency=medium
+
+ * Use /etc/chromium.d when it exists (Debian jessie and later).
+
+ -- Anders Kaseorg <andersk@mit.edu> Sun, 13 Nov 2016 22:46:45 -0500
+
debathena-chromium-config (1.1) unstable; urgency=low
* Add git-buildpackage configuration
diff --git a/debian/debathena b/debian/debathena
new file mode 100644
index 0000000..bbfa9c1
--- /dev/null
+++ b/debian/debathena
@@ -0,0 +1 @@
+CHROMIUM_FLAGS="--auth-server-whitelist=idp.mit.edu $CHROMIUM_FLAGS"
diff --git a/debian/rules b/debian/rules
index 84055f4..e4b7471 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,9 @@
# Disambiguate between distro versions with chromium-browser and ones with
# chromium
override_dh_configpackage:
+ifneq ($(wildcard /etc/chromium.d),)
+ dh_install -pdebathena-chromium-config debathena etc/chromium.d
+else
ifneq ($(wildcard /etc/chromium-browser/default),)
dh_configpackage --transform "/etc/chromium-browser/default.debathena perl -0777 -pe's/\nCHROMIUM_FLAGS=\"/\nCHROMIUM_FLAGS=\"--auth-server-whitelist=idp.mit.edu / or die'"
echo "chromium-package-name=chromium-browser" >> debian/debathena-chromium-config.substvars
@@ -17,3 +20,4 @@ else
exit 1
endif
endif
+endif
