[26053] in Source-Commits
/svn/athena r25366 - trunk/third/moira/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Wed Aug 10 10:21:42 2011
Date: Wed, 10 Aug 2011 10:21:35 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201108101421.p7AELZ9F011829@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2011-08-10 10:21:35 -0400 (Wed, 10 Aug 2011)
New Revision: 25366
Modified:
trunk/third/moira/debian/changelog
trunk/third/moira/debian/control.in
Log:
In moira:
* Conflict with the stella package.
Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog 2011-08-09 13:50:57 UTC (rev 25365)
+++ trunk/third/moira/debian/changelog 2011-08-10 14:21:35 UTC (rev 25366)
@@ -1,3 +1,9 @@
+debathena-moira (4.0.0+svn20110728-r4045-0debathena3) UNRELEASED; urgency=low
+
+ * Conflict with the stella package.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Wed, 10 Aug 2011 10:17:48 -0400
+
debathena-moira (4.0.0+svn20110728-r4045-0debathena2) unstable; urgency=low
* Install new upstream file /etc/shells.moira
Modified: trunk/third/moira/debian/control.in
===================================================================
--- trunk/third/moira/debian/control.in 2011-08-09 13:50:57 UTC (rev 25365)
+++ trunk/third/moira/debian/control.in 2011-08-10 14:21:35 UTC (rev 25366)
@@ -9,7 +9,7 @@
Package: debathena-moira-clients
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libzephyr4-krb5 | libzephyr3-krb
-Conflicts: debathena-moira-update-server (<= 4.0.0+cvs20090728-0debathena1)
+Conflicts: debathena-moira-update-server (<= 4.0.0+cvs20090728-0debathena1), stella
Description: Clients for the Moira database
Moira is the Athena Service Management system. It serves as the
central repository for information about users, groups hosts, print
