[27186] in Source-Commits
/svn/athena r25998 - trunk/debathena/config/chromium-config/debian
daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Wed May 29 07:55:41 2013
Date: Wed, 29 May 2013 07:55:33 -0400
From: Victor Vasiliev <vasilvv@MIT.EDU>
Message-Id: <201305291155.r4TBtXcA022541@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: vasilvv
Date: 2013-05-29 07:55:33 -0400 (Wed, 29 May 2013)
New Revision: 25998
Modified:
trunk/debathena/config/chromium-config/debian/control
trunk/debathena/config/chromium-config/debian/rules
Log:
Fix debathena-chromium-config per review notes:
* Use substvar to specifically depend upon the correct chromium package
* Avoid pulling in space shooter by explicitly specifying chromiun (>= 1)
* Fail if configuration file transform does not work
Modified: trunk/debathena/config/chromium-config/debian/control
===================================================================
--- trunk/debathena/config/chromium-config/debian/control 2013-05-18 03:58:55 UTC (rev 25997)
+++ trunk/debathena/config/chromium-config/debian/control 2013-05-29 11:55:33 UTC (rev 25998)
@@ -2,12 +2,12 @@
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
+Build-Depends: debhelper (>= 7.0.50~), config-package-dev (>= 5), chromium-browser | chromium (>= 1)
Standards-Version: 3.9.3
Package: debathena-chromium-config
Architecture: all
-Depends: ${misc:Depends}, chromium-browser | chromium
+Depends: ${misc:Depends}, ${chromium-package-name}
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Enable GSSAPI authentication in Chromium.
Modified: trunk/debathena/config/chromium-config/debian/rules
===================================================================
--- trunk/debathena/config/chromium-config/debian/rules 2013-05-18 03:58:55 UTC (rev 25997)
+++ trunk/debathena/config/chromium-config/debian/rules 2013-05-29 11:55:33 UTC (rev 25998)
@@ -7,10 +7,12 @@
# chromium
override_dh_configpackage:
ifneq ($(wildcard /etc/chromium-browser/default),)
- dh_configpackage --transform "/etc/chromium-browser/default.debathena sed -e's/^CHROMIUM_FLAGS=\"/CHROMIUM_FLAGS=\"--auth-server-whitelist=idp.mit.edu /'"
+ 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 sed -e's/^CHROMIUM_FLAGS=\"/CHROMIUM_FLAGS=\"--auth-server-whitelist=idp.mit.edu /'"
+ 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
