Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5677bc6f8318192cf40efe95dc0584225c0c23c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5677bc6f8318192cf40efe95dc0584225c0c23c7)
  • Date: Wed, 14 Apr 2010 13:04:41 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

ftp-libs/rb-libtorrent/CONFLICTS | 1 +
ftp-libs/rb-libtorrent/HISTORY | 4 ++++
2 files changed, 5 insertions(+)

New commits:
commit 5677bc6f8318192cf40efe95dc0584225c0c23c7
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

rb-libtorrent: added self conflict to fix linking of python bindings

diff --git a/ftp-libs/rb-libtorrent/CONFLICTS
b/ftp-libs/rb-libtorrent/CONFLICTS
new file mode 100755
index 0000000..5474590
--- /dev/null
+++ b/ftp-libs/rb-libtorrent/CONFLICTS
@@ -0,0 +1 @@
+conflicts rb-libtorrent y
diff --git a/ftp-libs/rb-libtorrent/HISTORY b/ftp-libs/rb-libtorrent/HISTORY
index 4f47b72..7c0b082 100644
--- a/ftp-libs/rb-libtorrent/HISTORY
+++ b/ftp-libs/rb-libtorrent/HISTORY
@@ -1,3 +1,7 @@
+2010-04-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added self conflict, a bug in the build system leads to
+ the python binding being linked to the old lib otherwise
+
2010-04-10 Mark Bainter <mbainter AT sourcemage.org>
* DETAILS: updated spell to 0.15.0




  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5677bc6f8318192cf40efe95dc0584225c0c23c7), Arwed von Merkatz, 04/14/2010

Archive powered by MHonArc 2.6.24.

Top of Page