summaryrefslogtreecommitdiffstats
path: root/ftp-libs
diff options
context:
space:
mode:
authorArwed von Merkatz2010-04-14 20:04:17 +0200
committerArwed von Merkatz2010-04-14 20:04:17 +0200
commit5677bc6f8318192cf40efe95dc0584225c0c23c7 (patch)
treeb2033a07be1f749fff691c2d7ef7abb975d0d880 /ftp-libs
parentda40179498e9c06ad17339e7483cc57605081279 (diff)
rb-libtorrent: added self conflict to fix linking of python bindings
Diffstat (limited to 'ftp-libs')
-rwxr-xr-xftp-libs/rb-libtorrent/CONFLICTS1
-rw-r--r--ftp-libs/rb-libtorrent/HISTORY4
2 files changed, 5 insertions, 0 deletions
diff --git a/ftp-libs/rb-libtorrent/CONFLICTS b/ftp-libs/rb-libtorrent/CONFLICTS
new file mode 100755
index 0000000000..54745908e8
--- /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 4f47b72871..7c0b082e04 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@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@sourcemage.org>
* DETAILS: updated spell to 0.15.0