sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (04a9e9efd72ce5b48f0f11e2015c2011ac2ac92e)

From: Sukneet Basuta <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (04a9e9efd72ce5b48f0f11e2015c2011ac2ac92e)
Date: Fri, 18 Nov 2011 15:40:30 -0600

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

ftp/netkit-ftp/CONFLICTS | 2 +-
ftp/netkit-ftp/HISTORY | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 04a9e9efd72ce5b48f0f11e2015c2011ac2ac92e
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

netkit-ftp: changed conflict with krb to krb-appl
see Bug #330

diff --git a/ftp/netkit-ftp/CONFLICTS b/ftp/netkit-ftp/CONFLICTS
index 2dafa65..f095cc9 100755
--- a/ftp/netkit-ftp/CONFLICTS
+++ b/ftp/netkit-ftp/CONFLICTS
@@ -1 +1 @@
-conflicts krb5
+conflicts krb5-appl
diff --git a/ftp/netkit-ftp/HISTORY b/ftp/netkit-ftp/HISTORY
index c7b2cbc..467cc1f 100644
--- a/ftp/netkit-ftp/HISTORY
+++ b/ftp/netkit-ftp/HISTORY
@@ -1,3 +1,6 @@
+2011-11-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * CONFLICTS: change krb to krb-appl (Bug #330)
+
2009-03-26 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: Added to apply patch
* ftp-glob.patch: Added fedora patch to fix build with glibc >= 2.8

[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (04a9e9efd72ce5b48f0f11e2015c2011ac2ac92e), Sukneet Basuta, 11/18/2011