Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to stable-0.44 grimoire by George Sherwood 
<gsherwood AT sourcemage.org>:

 crypto/krb5-appl/CONFLICTS  |    1 +
 crypto/krb5-appl/DEPENDS    |    2 +-
 crypto/krb5-appl/HISTORY    |    6 ++++++
 net/netkit-telnet/CONFLICTS |    3 ++-
 net/netkit-telnet/HISTORY   |    3 +++
 net/telnet-bsd/CONFLICTS    |    1 +
 net/telnet-bsd/HISTORY      |    3 +++
 7 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 29a2e8ad5bfb7b6d639a1ee097cbb46021465a1d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    krb5-appl: trailing && removed, #15732
    (cherry picked from commit 97486f1afbd3cf46b22dae8102769beb29209650)

commit 319257849fe95c237e80b0c9e3503be8812f492e
Author: Robert Figura <template AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    krb5: CONFLICTS: netkit-telnet, telnet-bsd
    (cherry picked from commit 96e57923ac6db0dc07253af154932075bd6bcf09)

commit 45378c7b6e56d7544046e7fd94c6db38cbc22e42
Author: Robert Figura <template AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    netkit-telnet: krb5-appl, telnet-bsd
    (cherry picked from commit 118cbd7e6cc6ba8b39b89be159552a038729fc75)

commit 6fe2687d94564cb571f2204abf147cd2725076b3
Author: Robert Figura <template AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    telnet-bsd: CONFLICTS: krb5-appl, netkit-telnet
    (cherry picked from commit 90d7e686fd1ef0da181ae9a28bd8e4b22d7cae55)

diff --git a/crypto/krb5-appl/CONFLICTS b/crypto/krb5-appl/CONFLICTS
index 39404be..074b91b 100755
--- a/crypto/krb5-appl/CONFLICTS
+++ b/crypto/krb5-appl/CONFLICTS
@@ -1,2 +1,3 @@
 conflicts netkit-telnet
+conflicts telnet-bsd
 conflicts netkit-ftp
diff --git a/crypto/krb5-appl/DEPENDS b/crypto/krb5-appl/DEPENDS
index fddc7fd..3184381 100755
--- a/crypto/krb5-appl/DEPENDS
+++ b/crypto/krb5-appl/DEPENDS
@@ -3,4 +3,4 @@ depends krb5 &&
 optional_depends "linux-pam"        \
                  ""                 \
                  ""                 \
-                 "for PAM support"  &&
+                 "for PAM support"
diff --git a/crypto/krb5-appl/HISTORY b/crypto/krb5-appl/HISTORY
index 00189fe..8e7aaf3 100644
--- a/crypto/krb5-appl/HISTORY
+++ b/crypto/krb5-appl/HISTORY
@@ -1,3 +1,9 @@
+2010-06-03 Ladislav Hagara <hgr AT vabo.cz>
+       * DEPENDS: trailing && removed, #15732
+
+2010-06-02 Robert Figura <template AT sourcemage.org>
+       * CONFLICTS: netkit-telnet, telnet-bsd
+
 2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS, PRE_BUILD, BUILD, CONFLICTS, PROVIDES,
          system-et.patch.bz2, desktop/telnet.desktop, 
pam.d/{rexec,rlogin,rsh},
diff --git a/net/netkit-telnet/CONFLICTS b/net/netkit-telnet/CONFLICTS
index 2dafa65..c2142f0 100755
--- a/net/netkit-telnet/CONFLICTS
+++ b/net/netkit-telnet/CONFLICTS
@@ -1 +1,2 @@
-conflicts  krb5
+conflicts telnet-bsd
+conflicts krb5-appl
diff --git a/net/netkit-telnet/HISTORY b/net/netkit-telnet/HISTORY
index b357b41..d2d4fd2 100644
--- a/net/netkit-telnet/HISTORY
+++ b/net/netkit-telnet/HISTORY
@@ -1,3 +1,6 @@
+2010-06-02 Robert Figura <template AT sourcemage.org>
+       * CONFLICTS: krb5-appl, telnet-bsd
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/net/telnet-bsd/CONFLICTS b/net/telnet-bsd/CONFLICTS
index 5c752b1..f8b6143 100755
--- a/net/telnet-bsd/CONFLICTS
+++ b/net/telnet-bsd/CONFLICTS
@@ -1 +1,2 @@
 conflicts netkit-telnet
+conflicts krb5-appl
diff --git a/net/telnet-bsd/HISTORY b/net/telnet-bsd/HISTORY
index 40e034a..58e13fd 100644
--- a/net/telnet-bsd/HISTORY
+++ b/net/telnet-bsd/HISTORY
@@ -1,3 +1,6 @@
+2010-06-02 Robert Figura <template AT sourcemage.org>
+       * CONFLICTS: krb5-appl, netkit-telnet
+
 2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
        * CONFIGURE, BUILD, INSTALL: telnetd should die ;)