[23445] in Source-Commits
/svn/athena r23098 - in trunk/debathena/debathena/evolution-wrapper: . debian
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Tue Jul 22 21:02:28 2008
Date: Tue, 22 Jul 2008 21:01:54 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200807230101.VAA15078@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-07-22 21:01:52 -0400 (Tue, 22 Jul 2008)
New Revision: 23098
Modified:
trunk/debathena/debathena/evolution-wrapper/debian/changelog
trunk/debathena/debathena/evolution-wrapper/debian/control
trunk/debathena/debathena/evolution-wrapper/debian/control.in
trunk/debathena/debathena/evolution-wrapper/evolution.debathena
Log:
In evolution-wrapper:
* Recommend and check for debathena-libcamel-krb4.
Modified: trunk/debathena/debathena/evolution-wrapper/debian/changelog
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/debian/changelog 2008-07-22 19:58:09 UTC (rev 23097)
+++ trunk/debathena/debathena/evolution-wrapper/debian/changelog 2008-07-23 01:01:52 UTC (rev 23098)
@@ -1,3 +1,9 @@
+debathena-evolution-wrapper (10.0.5) unstable; urgency=low
+
+ * Recommend and check for debathena-libcamel-krb4.
+
+ -- Greg Hudson <ghudson@mit.edu> Tue, 22 Jul 2008 14:04:41 -0400
+
debathena-evolution-wrapper (10.0.4) unstable; urgency=low
* Don't assume krb4 support in the wrapper; use it if we have it.
Modified: trunk/debathena/debathena/evolution-wrapper/debian/control
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/debian/control 2008-07-22 19:58:09 UTC (rev 23097)
+++ trunk/debathena/debathena/evolution-wrapper/debian/control 2008-07-23 01:01:52 UTC (rev 23098)
@@ -8,7 +8,7 @@
Package: debathena-evolution-wrapper
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, evolution
-Recommends: debathena-evolution-data-server
+Recommends: debathena-libcamel-krb4
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Wrapper to configure Evolution for Debathena
Modified: trunk/debathena/debathena/evolution-wrapper/debian/control.in
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/debian/control.in 2008-07-22 19:58:09 UTC (rev 23097)
+++ trunk/debathena/debathena/evolution-wrapper/debian/control.in 2008-07-23 01:01:52 UTC (rev 23098)
@@ -8,7 +8,7 @@
Package: debathena-evolution-wrapper
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, libgnome2-gconf-perl
-Recommends: debathena-evolution-data-server
+Recommends: debathena-libcamel-krb4
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Wrapper to configure Evolution for Debathena
Modified: trunk/debathena/debathena/evolution-wrapper/evolution.debathena
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/evolution.debathena 2008-07-22 19:58:09 UTC (rev 23097)
+++ trunk/debathena/debathena/evolution-wrapper/evolution.debathena 2008-07-23 01:01:52 UTC (rev 23098)
@@ -51,9 +51,9 @@
"America/New_York");
# To configure the accounts we need to know if we have krb4 support.
- my $provides = `dpkg-query -Wf '\${Provides}' evolution-data-server`;
+ my $provides = `dpkg-query -Wf '${Provides}' 'libcamel*'`;
my $krb4 = "";
- if ($provides =~ /debathena-evolution-data-server/) {
+ if ($provides =~ /debathena-libcamel-krb4/) {
$krb4 = ";auth=KERBEROS_V4";
}
