Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 utils/dcron/CONFLICTS      |    3 +++
 utils/dcron/HISTORY        |    3 +++
 utils/hc-cron/CONFLICTS    |    4 +++-
 utils/hc-cron/HISTORY      |    4 +++-
 utils/vixie-cron/CONFLICTS |    4 +++-
 utils/vixie-cron/HISTORY   |    3 +++
 6 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit d62b9bde7ab524df4abcd4a4f12cc1fd1e040d27
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    dcron: added CONFLICTS file

commit 922de368d324553e1cf645c5bb0ea90c4157b660
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    vixie-cron: added new conflicts

commit b18f6b6ba87bacf7eb46cf28110d2d32868382e3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    hc-cron: added new conflicts

diff --git a/utils/dcron/CONFLICTS b/utils/dcron/CONFLICTS
new file mode 100755
index 0000000..d94762d
--- /dev/null
+++ b/utils/dcron/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts vixie-cron &&
+conflicts hc-cron &&
+conflicts cronie
diff --git a/utils/dcron/HISTORY b/utils/dcron/HISTORY
index c83536a..676dd61 100644
--- a/utils/dcron/HISTORY
+++ b/utils/dcron/HISTORY
@@ -1,3 +1,6 @@
+2009-04-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added
+
 2007-11-14 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD, DETAILS, DEPENDS, BUILD, HISTORY: created spell
        * init.d/crond: added
diff --git a/utils/hc-cron/CONFLICTS b/utils/hc-cron/CONFLICTS
index 2cde1f1..d9d5e8c 100755
--- a/utils/hc-cron/CONFLICTS
+++ b/utils/hc-cron/CONFLICTS
@@ -1 +1,3 @@
-conflicts  vixie-cron
+conflicts vixie-cron &&
+conflicts cronie &&
+conflicts dcron
diff --git a/utils/hc-cron/HISTORY b/utils/hc-cron/HISTORY
index 2713c3a..7b046c7 100644
--- a/utils/hc-cron/HISTORY
+++ b/utils/hc-cron/HISTORY
@@ -1,3 +1,6 @@
+2009-04-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added new conflicts, missing `&&'
+
 2007-11-14 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * BUILD: fixes for paths
        * PROVIDES: provides CRON
@@ -33,4 +36,3 @@
        * Updated to use sorcery init.d installer
        * Updated PRE_REMOVE and POST_INSTALL to only run
          the script if it is executable
-
diff --git a/utils/vixie-cron/CONFLICTS b/utils/vixie-cron/CONFLICTS
index 1d7975b..7b04fa7 100755
--- a/utils/vixie-cron/CONFLICTS
+++ b/utils/vixie-cron/CONFLICTS
@@ -1 +1,3 @@
-conflicts  hc-cron
+conflicts hc-cron &&
+conflicts cronie &&
+conflicts dcron
diff --git a/utils/vixie-cron/HISTORY b/utils/vixie-cron/HISTORY
index 024b8b9..521cd43 100644
--- a/utils/vixie-cron/HISTORY
+++ b/utils/vixie-cron/HISTORY
@@ -1,3 +1,6 @@
+2009-04-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added new conflicts, missing `&&'
+
 2007-11-14 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * BUILD: fixes for paths
        * init.d/crond: fixes for paths