[23957] in Source-Commits
/svn/athena r23567 - trunk/debathena/config/linerva/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Sat Mar 7 14:48:40 2009
Date: Sat, 7 Mar 2009 14:48:31 -0500
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903071948.n27JmV3L006651@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-03-07 14:48:31 -0500 (Sat, 07 Mar 2009)
New Revision: 23567
Modified:
trunk/debathena/config/linerva/debian/changelog
trunk/debathena/config/linerva/debian/control.in
Log:
In debathena-linerva:
* Explicitly conflict with Apache so it doesn't get installed
Modified: trunk/debathena/config/linerva/debian/changelog
===================================================================
--- trunk/debathena/config/linerva/debian/changelog 2009-03-07 19:47:17 UTC (rev 23566)
+++ trunk/debathena/config/linerva/debian/changelog 2009-03-07 19:48:31 UTC (rev 23567)
@@ -8,8 +8,9 @@
* Increase the OpenAFS cache size
* Fix linerva-install to deal with the package being moved
* Add a couple more utilities to the suid whitelist
+ * Explicitly conflict with Apache so it doesn't get installed
- -- Evan Broder <broder@mit.edu> Sat, 07 Mar 2009 14:46:59 -0500
+ -- Evan Broder <broder@mit.edu> Sat, 07 Mar 2009 14:48:15 -0500
debathena-linerva (1.19) unstable; urgency=low
Modified: trunk/debathena/config/linerva/debian/control.in
===================================================================
--- trunk/debathena/config/linerva/debian/control.in 2009-03-07 19:47:17 UTC (rev 23566)
+++ trunk/debathena/config/linerva/debian/control.in 2009-03-07 19:48:31 UTC (rev 23567)
@@ -10,7 +10,7 @@
Pre-Depends: git-core
Depends: logcheck, screen, elinks, rsyslog, linux32, bind9
Provides: ${diverted-files}
-Conflicts: ${diverted-files}
+Conflicts: ${diverted-files}, apache2
Description: Special Configuration for Linerva
This package does all the special stuff needed for Linerva's security
setup. It should be idempotent, though we do not guarantee that it
