ndn-tools: Update to version 0.2 and related fixes
Change-Id: I7e50a73c4e77a50d09414cb6d24e503df05c365a
diff --git a/ndn-tools/Makefile b/ndn-tools/Makefile
index 8392438..b726c0f 100644
--- a/ndn-tools/Makefile
+++ b/ndn-tools/Makefile
@@ -2,15 +2,15 @@
GIT_URL=https://github.com/named-data/ndn-tools
# Tag name or commit hash for checkout
-GIT_VERSION=4bd28fc8394a53a49fc283ead2bdc6a77893da4c
+GIT_VERSION=ndn-tools-0.2
# Package name
NAME=ndn-tools
# Package version
-VERSION=0.0.0-1-g4bd28fc
+VERSION=0.2
# PPA version
-PPA_VERSION=1
+PPA_VERSION=6
include ../packaging.mk
diff --git a/ndn-tools/debian/changelog b/ndn-tools/debian/changelog
index 24a6e0f..7f6afd1 100644
--- a/ndn-tools/debian/changelog
+++ b/ndn-tools/debian/changelog
@@ -1,3 +1,10 @@
+ndn-tools (0.2-ppa6~DISTRO) DISTRO; urgency=low
+
+ * New version based on ndn-tools-0.2 (https://github.com/named-
+ data/ndn-tools)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue, 01 Sep 2015 00:57:26 +0000
+
ndn-tools (0.0.0~ppa0~DISTRO) DISTRO; urgency=low
* Initial release
diff --git a/ndn-tools/debian/control b/ndn-tools/debian/control
index 485ce73..d442043 100644
--- a/ndn-tools/debian/control
+++ b/ndn-tools/debian/control
@@ -6,6 +6,7 @@
python (>= 2.7.0),
pkg-config (>= 0.26),
libpcap-dev,
+ python-sphinx,
ndn-cxx-dev (>= 0.3.3)
Standards-Version: 3.9.2
Section: net
@@ -16,6 +17,7 @@
Package: ndn-tools
Architecture: i386 amd64
Depends: ndndump, ndnping, ndnpeek, ndn-dissect
+Description: A collection of essential tools for Named Data Networking
Package: ndndump
Architecture: i386 amd64
@@ -31,7 +33,7 @@
Package: ndn-tlv-ping
Architecture: i386 amd64
Depends: ndnping
-Description: deprecated package, use ndnping instead
+Description: Deprecated package, use ndnping instead
Package: ndnpeek
Architecture: i386 amd64
@@ -46,3 +48,11 @@
an input file or the standard input, and displays the Type-Length-Value (TLV) structure
of those packets on the standard output.
+Package: ndn-dissect-wireshark
+Architecture: i386 amd64
+Description: Wireshark extension to inspect TLV structure of NDN packets
+
+Package: ndn-pib
+Architecture: i386 amd64
+Description: A service to manage the public information of keys and publish certificates
+
diff --git a/ndn-tools/debian/control.precise b/ndn-tools/debian/control.precise
new file mode 100644
index 0000000..bdaf61c
--- /dev/null
+++ b/ndn-tools/debian/control.precise
@@ -0,0 +1,57 @@
+Source: ndn-tools
+Priority: extra
+Maintainer: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+Build-Depends: debhelper (>= 8.0.0),
+ python (>= 2.7.0),
+ pkg-config (>= 0.26),
+ libpcap-dev,
+ python-sphinx,
+ ndn-cxx-dev (>= 0.3.3)
+Standards-Version: 3.9.2
+Section: net
+Homepage: http://github.com/named-data/ndn-tools
+Vcs-Git: git://github.com/named-data/ndn-tools.git
+Vcs-Browser: http://github.com/named-data/ndn-tools
+
+Package: ndn-tools
+Architecture: i386 amd64
+Depends: ndndump, ndnping, ndnpeek, ndn-dissect
+Description: A collection of essential tools for Named Data Networking
+
+Package: ndndump
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx
+Description: A traffic analysis tool that captures Interest and Data packets
+ on the wire, and displays brief information about captured packets.
+
+Package: ndnping
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx, nfd
+Description: Reachability testing tools for Named Data Networking.
+
+Package: ndn-tlv-ping
+Architecture: i386 amd64
+Depends: ndnping
+Description: Deprecated package, use ndnping instead
+
+Package: ndnpeek
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx
+Description: ndnpeek and ndnpoke are a pair of programs to request and make available
+ for retrieval of a single Data packet.
+
+Package: ndn-dissect
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx
+Description: An NDN packet format inspector. It reads zero or more NDN packets from either
+ an input file or the standard input, and displays the Type-Length-Value (TLV) structure
+ of those packets on the standard output.
+
+Package: ndn-dissect-wireshark
+Architecture: i386 amd64
+Description: Wireshark extension to inspect TLV structure of NDN packets
+
+Package: ndn-pib
+Architecture: i386 amd64
+Description: A service to manage the public information of keys and publish certificates
+
diff --git a/ndn-tools/debian/ndn-dissect-wireshark.install b/ndn-tools/debian/ndn-dissect-wireshark.install
new file mode 100644
index 0000000..3e5da88
--- /dev/null
+++ b/ndn-tools/debian/ndn-dissect-wireshark.install
@@ -0,0 +1 @@
+usr/share/ndn-dissect-wireshark/ndn.lua
diff --git a/ndn-tools/debian/ndn-pib.install b/ndn-tools/debian/ndn-pib.install
new file mode 100644
index 0000000..cd28a7d
--- /dev/null
+++ b/ndn-tools/debian/ndn-pib.install
@@ -0,0 +1,3 @@
+usr/bin/ndn-pib
+usr/share/man/man1/ndn-pib.1
+
diff --git a/ndn-tools/debian/rules.precise b/ndn-tools/debian/rules.precise
new file mode 100755
index 0000000..4cd26f1
--- /dev/null
+++ b/ndn-tools/debian/rules.precise
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+
+%:
+ dh $@ --parallel
+
+override_dh_auto_configure:
+ CXXFLAGS="$(CXXFLAGS)" LINKFLAGS="$(LDFLAGS)" ./waf configure --prefix=/usr
+
+override_dh_auto_build:
+ ./waf build
+
+override_dh_auto_install:
+ ./waf install --destdir=debian/tmp
+
+override_dh_auto_clean:
+ ./waf distclean
+
+override_dh_clean:
+ dh_clean
+ ./waf distclean
+ rm -rf .waf-1*
+ rm -rf .waf3-1*
+ rm -f .waf-tools/*.pyc
+ rm -Rf manpages/*.pyc
+
+override_dh_auto_test: