[26112] in Source-Commits
/svn/athena r25395 - trunk/debathena/meta/extra-software-nox/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Wed Sep 7 01:28:50 2011
Date: Wed, 7 Sep 2011 01:28:44 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201109070528.p875Si1q032096@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2011-09-07 01:28:43 -0400 (Wed, 07 Sep 2011)
New Revision: 25395
Modified:
trunk/debathena/meta/extra-software-nox/debian/changelog
trunk/debathena/meta/extra-software-nox/debian/control.in
Log:
In extra-software-nox:
* Prefer the cyrus-clients metapackage (new in wheezy/oneiric) to the
specific version cyrus-clients-2.2.
Modified: trunk/debathena/meta/extra-software-nox/debian/changelog
===================================================================
--- trunk/debathena/meta/extra-software-nox/debian/changelog 2011-09-06 20:42:56 UTC (rev 25394)
+++ trunk/debathena/meta/extra-software-nox/debian/changelog 2011-09-07 05:28:43 UTC (rev 25395)
@@ -1,3 +1,10 @@
+debathena-extra-software-nox (1.3) unstable; urgency=low
+
+ * Prefer the cyrus-clients metapackage (new in wheezy/oneiric) to the
+ specific version cyrus-clients-2.2.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Wed, 07 Sep 2011 01:26:08 -0400
+
debathena-extra-software-nox (1.2) unstable; urgency=low
* Conditionally depend on libstdc++5 if it exists
Modified: trunk/debathena/meta/extra-software-nox/debian/control.in
===================================================================
--- trunk/debathena/meta/extra-software-nox/debian/control.in 2011-09-06 20:42:56 UTC (rev 25394)
+++ trunk/debathena/meta/extra-software-nox/debian/control.in 2011-09-07 05:28:43 UTC (rev 25395)
@@ -34,7 +34,7 @@
moreutils,
socat,
vpnc,
- cyrus-clients-2.2,
+ cyrus-clients | cyrus-clients-2.2,
expect,
traceroute,
fortune-mod,
