sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ff2331c2b94a68232ed0413ee2a1d50b370d6ce4)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ff2331c2b94a68232ed0413ee2a1d50b370d6ce4)
Date: Tue, 17 Feb 2015 02:37:12 -0600

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

smgl/initng/CONFLICTS | 3 +++
smgl/initng/HISTORY | 3 +++
smgl/simpleinit-msb/CONFLICTS | 3 ++-
smgl/simpleinit-msb/HISTORY | 3 +++
smgl/upstart/CONFLICTS | 3 ++-
smgl/upstart/HISTORY | 3 +++
6 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit ff2331c2b94a68232ed0413ee2a1d50b370d6ce4
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

smgl/upstart: conflicts with epoch

commit 1a5683264a6f8592fa21edc8b15355f4f80ca5a0
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

smgl/initng: added CONFLICTS

commit a258661ae46b1fe5986a3c50b43db5d20af56412
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

smgl/simpleinit-msb: conflicts with epoch

diff --git a/smgl/initng/CONFLICTS b/smgl/initng/CONFLICTS
new file mode 100755
index 0000000..39a9019
--- /dev/null
+++ b/smgl/initng/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts upstart &&
+conflicts simpleinit-msb &&
+conflicts epoch
diff --git a/smgl/initng/HISTORY b/smgl/initng/HISTORY
index a9db4d6..de0080b 100644
--- a/smgl/initng/HISTORY
+++ b/smgl/initng/HISTORY
@@ -1,3 +1,6 @@
+2015-02-17 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: added
+
2007-12-05 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD: use cmake_build from FUNCTIONS

diff --git a/smgl/simpleinit-msb/CONFLICTS b/smgl/simpleinit-msb/CONFLICTS
index 082e2e4..e46c150 100755
--- a/smgl/simpleinit-msb/CONFLICTS
+++ b/smgl/simpleinit-msb/CONFLICTS
@@ -1,2 +1,3 @@
conflicts upstart &&
-conflicts initng
+conflicts initng &&
+conflicts epoch
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index c643641..6aecc67 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,6 @@
+2015-02-17 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: added epoch
+
2014-06-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply patch
diff --git a/smgl/upstart/CONFLICTS b/smgl/upstart/CONFLICTS
index cb7b017..a55c6a1 100755
--- a/smgl/upstart/CONFLICTS
+++ b/smgl/upstart/CONFLICTS
@@ -1,2 +1,3 @@
conflicts simpleinit-msb &&
-conflicts initng
+conflicts initng &&
+conflicts epoch
diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index c525689..a0e3461 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -1,3 +1,6 @@
+2015-02-17 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: added epoch
+
2012-01-17 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.4
* PRE_BUILD: fixed removal of sysv-compat jobs

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ff2331c2b94a68232ed0413ee2a1d50b370d6ce4), Pavel Vinogradov, 02/17/2015