Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (ec8785dea82d5c4def6557fcd4083da52f0bf29c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (ec8785dea82d5c4def6557fcd4083da52f0bf29c)
  • Date: Sun, 22 May 2011 14:15:22 -0500

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

graphics/mcomix/HISTORY | 10 ++--------
python-pypi/setuptools/CONFLICTS | 1 +
python-pypi/setuptools/HISTORY | 3 +++
3 files changed, 6 insertions(+), 8 deletions(-)

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

setuptools: added CONFLICTS since it conflicts with distribute

commit 03e9b3328f22c549ec794fcdb6bedc62b85d698c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

mcomix: fixed history entry

diff --git a/graphics/mcomix/HISTORY b/graphics/mcomix/HISTORY
index fbc6824..c2c7234 100644
--- a/graphics/mcomix/HISTORY
+++ b/graphics/mcomix/HISTORY
@@ -1,10 +1,4 @@
2011-05-22 Sukneet Basuta <sukneet AT sourcemage.org>
- * Try it out: changed blabla
- * Copy it back to the grimoire: changed blabla
- * DEPENDS: changed blabla
- * PREPARE: added, bla bla!
- changed blabla
-
-2011-05-21 Sukneet Basuta <sukneet AT sourcemage.org>
- * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+ * BUILD, DEPENDS, DETAILS, INSTALL, PREPARE: spell created
+ Note that it can work with either setuptools or distribute

diff --git a/python-pypi/setuptools/CONFLICTS
b/python-pypi/setuptools/CONFLICTS
new file mode 100755
index 0000000..18c7638
--- /dev/null
+++ b/python-pypi/setuptools/CONFLICTS
@@ -0,0 +1 @@
+conflicts distribute
diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY
index 2a23a93..ee50fb6 100644
--- a/python-pypi/setuptools/HISTORY
+++ b/python-pypi/setuptools/HISTORY
@@ -1,3 +1,6 @@
+2011-05-22 Sukneet Basuta <sukneet AT sourcemage.org>
+ * CONFLICTS: created since it conflicts with distribute
+
2009-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6c11




  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (ec8785dea82d5c4def6557fcd4083da52f0bf29c), Sukneet Basuta, 05/22/2011

Archive powered by MHonArc 2.6.24.

Top of Page