Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (0b3460945661fcdfb3ca069a172adb2aa40361e2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (0b3460945661fcdfb3ca069a172adb2aa40361e2)
  • Date: Tue, 19 Apr 2011 12:31:26 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

lua-forge/lua-zlib-brimworks/CONFLICTS | 1 +
lua-forge/lua-zlib-brimworks/HISTORY | 4 ++++
lua-forge/lua-zlib-brimworks/PROVIDES | 1 +
lua-forge/lzlib/CONFLICTS | 1 +
lua-forge/lzlib/HISTORY | 4 ++++
lua-forge/lzlib/PROVIDES | 1 +
wm-addons/wmwifi/BUILD | 4 ----
wm-addons/wmwifi/DEPENDS | 1 +
wm-addons/wmwifi/HISTORY | 4 ++++
9 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 190e34a0bc03f9e02a88e7f1ecd7ae9f924ff57c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

lua-zlib-brimworks: conflicts with lzlib and provides LUA-ZLIB

commit ed7d503ab3c08362378bab9371edc200274ee437
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

lzlib: added CONFLICTS on lua-zlib-brimworks and provides LUA-ZLIB

commit 2b39786f2c01d02e969735f53c72524579dd38ef
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

wmwifi: removed obsolete BUILD and added missing dep on libxpm.
fixed bug #13839

diff --git a/lua-forge/lua-zlib-brimworks/CONFLICTS
b/lua-forge/lua-zlib-brimworks/CONFLICTS
new file mode 100755
index 0000000..b3e414a
--- /dev/null
+++ b/lua-forge/lua-zlib-brimworks/CONFLICTS
@@ -0,0 +1 @@
+conflicts lzlib
diff --git a/lua-forge/lua-zlib-brimworks/HISTORY
b/lua-forge/lua-zlib-brimworks/HISTORY
index 7a58353..5671114 100644
--- a/lua-forge/lua-zlib-brimworks/HISTORY
+++ b/lua-forge/lua-zlib-brimworks/HISTORY
@@ -1,3 +1,7 @@
+2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFLICTS: with lzlib
+ * PROVIDES: LUA-ZLIB
+
2011-04-08 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, DOWNLOAD: spell created

diff --git a/lua-forge/lua-zlib-brimworks/PROVIDES
b/lua-forge/lua-zlib-brimworks/PROVIDES
new file mode 100755
index 0000000..82ac75c
--- /dev/null
+++ b/lua-forge/lua-zlib-brimworks/PROVIDES
@@ -0,0 +1 @@
+LUA-ZLIB
diff --git a/lua-forge/lzlib/CONFLICTS b/lua-forge/lzlib/CONFLICTS
new file mode 100755
index 0000000..b8f6973
--- /dev/null
+++ b/lua-forge/lzlib/CONFLICTS
@@ -0,0 +1 @@
+conflicts lua-zlib-brimworks
diff --git a/lua-forge/lzlib/HISTORY b/lua-forge/lzlib/HISTORY
index 4055bde..96a6749 100644
--- a/lua-forge/lzlib/HISTORY
+++ b/lua-forge/lzlib/HISTORY
@@ -1,3 +1,7 @@
+2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFLICTS: conflicts with lua-zlib-brimworks
+ * PROVIDES: added, provides LUA-ZLIB
+
2008-06-18 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: added missing `&&', increase verbosity

diff --git a/lua-forge/lzlib/PROVIDES b/lua-forge/lzlib/PROVIDES
new file mode 100755
index 0000000..82ac75c
--- /dev/null
+++ b/lua-forge/lzlib/PROVIDES
@@ -0,0 +1 @@
+LUA-ZLIB
diff --git a/wm-addons/wmwifi/BUILD b/wm-addons/wmwifi/BUILD
deleted file mode 100755
index df276d3..0000000
--- a/wm-addons/wmwifi/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-aclocal &&
-automake &&
-./configure &&
-make top_builddir=${SOURCE_DIRECTORY}
diff --git a/wm-addons/wmwifi/DEPENDS b/wm-addons/wmwifi/DEPENDS
index 4742a45..f3c779b 100755
--- a/wm-addons/wmwifi/DEPENDS
+++ b/wm-addons/wmwifi/DEPENDS
@@ -1,2 +1,3 @@
+depends libxpm &&
depends xorg-libs &&
depends wireless_tools
diff --git a/wm-addons/wmwifi/HISTORY b/wm-addons/wmwifi/HISTORY
index 3aea67b..940fe5f 100644
--- a/wm-addons/wmwifi/HISTORY
+++ b/wm-addons/wmwifi/HISTORY
@@ -1,3 +1,7 @@
+2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD: removed, obsolete
+ * DEPENDS: added missing dep on libxpm
+
2010-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 0.6



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (0b3460945661fcdfb3ca069a172adb2aa40361e2), Arjan Bouter, 04/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page