[24341] in Source-Commits
/svn/athena r23939 - trunk/third/moira/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Tue Jul 28 21:29:49 2009
X-Barracuda-Envelope-From: broder@mit.edu
Date: Tue, 28 Jul 2009 21:29:37 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200907290129.n6T1Tb3j027017@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-07-28 21:29:37 -0400 (Tue, 28 Jul 2009)
New Revision: 23939
Modified:
trunk/third/moira/debian/changelog
trunk/third/moira/debian/control.in
Log:
In moira:
* Add a missing conflicts to make upgrades run more smoothly.
Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog 2009-07-29 00:55:42 UTC (rev 23938)
+++ trunk/third/moira/debian/changelog 2009-07-29 01:29:37 UTC (rev 23939)
@@ -1,3 +1,9 @@
+debathena-moira (4.0.0+cvs20090728-0debathena3) unstable; urgency=low
+
+ * Add a missing conflicts to make upgrades run more smoothly.
+
+ -- Evan Broder <broder@mit.edu> Tue, 28 Jul 2009 18:28:33 -0700
+
debathena-moira (4.0.0+cvs20090728-0debathena2) unstable; urgency=low
* Include the headers in debathena-libmoira-dev.
Modified: trunk/third/moira/debian/control.in
===================================================================
--- trunk/third/moira/debian/control.in 2009-07-29 00:55:42 UTC (rev 23938)
+++ trunk/third/moira/debian/control.in 2009-07-29 01:29:37 UTC (rev 23939)
@@ -9,6 +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)
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
