sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (28c0e9490a19059a0f74fabb742b9738d761eef0)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (28c0e9490a19059a0f74fabb742b9738d761eef0)
Date: Mon, 16 Jan 2017 00:49:56 +0000

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

python-pypi/pil/HISTORY | 4 ++++
python-pypi/pil/TRIGGERS | 1 -
python-pypi/pil/UP_TRIGGERS | 2 ++
python-pypi/pillow/CONFLICTS | 1 +
python-pypi/pillow/HISTORY | 3 +++
5 files changed, 10 insertions(+), 1 deletion(-)

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

pillow: conflicts with pil

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

pil: use UP_TRIGGERS

diff --git a/python-pypi/pil/HISTORY b/python-pypi/pil/HISTORY
index ac4c10e..bfc1574 100644
--- a/python-pypi/pil/HISTORY
+++ b/python-pypi/pil/HISTORY
@@ -1,3 +1,7 @@
+2017-01-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: added, for smooth migration to pillow
+ * TRIGGERS: dropped
+
2013-08-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* spell deprecated [unmaintained]
* PATCHLEVEL=9999
diff --git a/python-pypi/pil/TRIGGERS b/python-pypi/pil/TRIGGERS
deleted file mode 100755
index 08e5186..0000000
--- a/python-pypi/pil/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast pil dispel_self
diff --git a/python-pypi/pil/UP_TRIGGERS b/python-pypi/pil/UP_TRIGGERS
new file mode 100755
index 0000000..ea1e392
--- /dev/null
+++ b/python-pypi/pil/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger pil dispel_self &&
+up_trigger pillow cast_self
diff --git a/python-pypi/pillow/CONFLICTS b/python-pypi/pillow/CONFLICTS
new file mode 100755
index 0000000..ba7ed56
--- /dev/null
+++ b/python-pypi/pillow/CONFLICTS
@@ -0,0 +1 @@
+conflicts pil y
diff --git a/python-pypi/pillow/HISTORY b/python-pypi/pillow/HISTORY
index b2ee1ed..2624996 100644
--- a/python-pypi/pillow/HISTORY
+++ b/python-pypi/pillow/HISTORY
@@ -1,3 +1,6 @@
+2017-01-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added, conflicts with pil
+
2017-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.0.0

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (28c0e9490a19059a0f74fabb742b9738d761eef0), Vlad Glagolev, 01/15/2017