commit 3cc93ffb724b619846e0f336df33f7433d70f652
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Mar 03 22:34:50 2015 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Mar 03 22:36:35 2015 -0800
tree b079d25102f747c549d19c0469e502e07525bd7c
parent 60eca6a8a65a5d30574b26ff80708dbd2a0ee190

ndn-cxx: Add conflict with ndn.cxx-security-tools package

Fixes: #3

ndn-cxx/debian/changelog

diff --git a/ndn-cxx/debian/changelog b/ndn-cxx/debian/changelog
index 19db1e8..4f26d8f 100644
--- a/ndn-cxx/debian/changelog
+++ b/ndn-cxx/debian/changelog
@@ -1,3 +1,10 @@
+ndn-cxx (0.3.1-ppa2~DISTRO) DISTRO; urgency=low
+
+  * New version based on ndn-cxx-0.3.1 (https://github.com/named-
+    data/ndn-cxx.git)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 03 Mar 2015 22:36:14 -0800
+
 ndn-cxx (0.3.1-ppa1~DISTRO) DISTRO; urgency=low
 
   * New version based on ndn-cxx-0.3.1 (https://github.com/named-