[28776] in Source-Commits
chromium-config commit: Switch chromium-config to use a Chromium policy file
daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Sun May 7 01:56:12 2017
Date: Sun, 7 May 2017 01:56:03 -0400
From: Victor Vasiliev <vasilvv@mit.edu>
Message-Id: <201705070556.v475u3m8010187@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/chromium-config/commit/97aa641e28bc5ee87c6aa5dd0cbd6c58f8019b16
commit 97aa641e28bc5ee87c6aa5dd0cbd6c58f8019b16
Author: Victor Vasiliev <vasilvv@mit.edu>
Date: Sun May 7 01:47:48 2017 -0400
Switch chromium-config to use a Chromium policy file
This also adds support for both Chromium and Chrome
debathena | 1 -
debian/changelog | 6 ++++++
debian/control | 8 +++-----
debian/copyright | 2 +-
debian/debathena-chromium-config.install | 2 ++
debian/mit-idp.json | 3 +++
debian/rules | 21 +--------------------
7 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/debathena b/debathena
deleted file mode 100644
index bbfa9c1..0000000
--- a/debathena
+++ /dev/null
@@ -1 +0,0 @@
-CHROMIUM_FLAGS="--auth-server-whitelist=idp.mit.edu $CHROMIUM_FLAGS"
diff --git a/debian/changelog b/debian/changelog
index c4a99e4..c5c31ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-chromium-config (1.4) unstable; urgency=medium
+
+ * Use new Chromium policy format.
+
+ -- Victor Vasiliev <vasilvv@mit.edu> Sun, 07 May 2017 00:43:02 -0400
+
debathena-chromium-config (1.3) unstable; urgency=medium
* Move debathena file (for /etc/chromium.d) to the right place.
diff --git a/debian/control b/debian/control
index f2be37d..a10206a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,12 @@ Source: debathena-chromium-config
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: debhelper (>= 7.0.50~), config-package-dev (>= 5), chromium-browser | chromium (>= 1)
+Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 3.9.3
Package: debathena-chromium-config
Architecture: all
-Depends: ${misc:Depends}, ${chromium-package-name}
-Provides: ${diverted-files}
-Conflicts: ${diverted-files}
+Depends: ${misc:Depends}
+Recommends: google-chrome-stable | google-chrome-beta | google-chrome-unstable | chromium-browser | chromium (>= 1)
Description: Enable GSSAPI authentication in Chromium.
This package enables GSSAPI authentication in Chromium for idp.mit.edu.
-
diff --git a/debian/copyright b/debian/copyright
index de3bdb1..dd985a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: debathena-chromium-config
Files: *
-Copyright: Copyright 2013 Victor Vasiliev <vasilvv@mit.edu>
+Copyright: Copyright 2013-2017 Victor Vasiliev <vasilvv@mit.edu>, Google Inc.
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/debian/debathena-chromium-config.install b/debian/debathena-chromium-config.install
new file mode 100644
index 0000000..daa985c
--- /dev/null
+++ b/debian/debathena-chromium-config.install
@@ -0,0 +1,2 @@
+debian/mit-idp.json etc/opt/chrome/policies/managed
+debian/mit-idp.json etc/chromium/policies/managed
diff --git a/debian/mit-idp.json b/debian/mit-idp.json
new file mode 100644
index 0000000..48bbe88
--- /dev/null
+++ b/debian/mit-idp.json
@@ -0,0 +1,3 @@
+{
+ "AuthServerWhitelist": "idp.mit.edu"
+}
diff --git a/debian/rules b/debian/rules
index e4b7471..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@ --with config-package
-
-# 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
-else
-ifneq ($(wildcard /etc/chromium/default),)
- dh_configpackage --transform "/etc/chromium/default.debathena perl -0777 -pe's/\nCHROMIUM_FLAGS=\"/\nCHROMIUM_FLAGS=\"--auth-server-whitelist=idp.mit.edu / or die'"
- echo "chromium-package-name=chromium" >> debian/debathena-chromium-config.substvars
-else
- exit 1
-endif
-endif
-endif
+ dh $@
