ndn-cxx: Add conflict with ndn.cxx-security-tools package
Fixes: #3
diff --git a/ndn-cxx/Makefile b/ndn-cxx/Makefile
index 82de8e7..de3a86e 100644
--- a/ndn-cxx/Makefile
+++ b/ndn-cxx/Makefile
@@ -11,6 +11,6 @@
VERSION=0.3.1
# PPA version
-PPA_VERSION=1
+PPA_VERSION=2
include ../packaging.mk
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-
diff --git a/ndn-cxx/debian/control b/ndn-cxx/debian/control
index 1a42dfa..ac8f52b 100644
--- a/ndn-cxx/debian/control
+++ b/ndn-cxx/debian/control
@@ -32,3 +32,4 @@
Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: NDN C++ library with eXperimental eXtensions and security tools
+Conflicts: ndn.cxx-security-tools
diff --git a/ndn-cxx/debian/control.precise b/ndn-cxx/debian/control.precise
index f04a090..fbcdfb8 100644
--- a/ndn-cxx/debian/control.precise
+++ b/ndn-cxx/debian/control.precise
@@ -32,3 +32,4 @@
Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: NDN C++ library with eXperimental eXtensions and security tools
+Conflicts: ndn.cxx-security-tools