summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-01-29 21:28:20 -0800
committerEric Sandall2010-01-30 09:42:08 -0800
commit744bbb38bed25fda328f07e35955dec42a0b4605 (patch)
treeb1cbf1b2e2b9e98e7f8559be47ad9977d13b1912
parent611a3c95f6d4d11686084b858b35239e3c53a18f (diff)
qca2: Auto-conflict or it links against the current
/usr/lib/libqca.so, which may have undefined references if it has been recently broken by an API change (e.g. qt4 4.5 -> 4.6)
-rwxr-xr-xcrypto/qca2/CONFLICTS1
-rw-r--r--crypto/qca2/HISTORY5
2 files changed, 6 insertions, 0 deletions
diff --git a/crypto/qca2/CONFLICTS b/crypto/qca2/CONFLICTS
new file mode 100755
index 0000000000..24b1c644ce
--- /dev/null
+++ b/crypto/qca2/CONFLICTS
@@ -0,0 +1 @@
+conflicts qca2 y
diff --git a/crypto/qca2/HISTORY b/crypto/qca2/HISTORY
index 4df6d801a1..c0310e0e56 100644
--- a/crypto/qca2/HISTORY
+++ b/crypto/qca2/HISTORY
@@ -1,3 +1,8 @@
+2010-01-29 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflict or it links against the current
+ /usr/lib/libqca.so, which may have undefined references if it has been
+ recently broken by an API change (e.g. qt4 4.5 -> 4.6)
+
2009-05-02 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.0.2