ndndump: Incorporated as part of ndn-tools package
Change-Id: Ic36257c2b12dc147d82818b62e003ae07da312bf
diff --git a/ndndump/Makefile b/ndndump/Makefile
deleted file mode 100644
index 2eab769..0000000
--- a/ndndump/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# URL for git clone
-GIT_URL=https://github.com/named-data/ndndump
-
-# Tag name or commit hash for checkout
-GIT_VERSION=0ce60362a285f42cf2ecbeea8cff0c7919d28d72
-
-# Package name
-NAME=ndndump
-
-# Package version
-VERSION=0.5.3
-
-# PPA version
-PPA_VERSION=7
-
-include ../packaging.mk
diff --git a/ndndump/debian/changelog b/ndndump/debian/changelog
deleted file mode 100644
index fa0bf2b..0000000
--- a/ndndump/debian/changelog
+++ /dev/null
@@ -1,115 +0,0 @@
-ndndump (0.5.3-ppa7~DISTRO) DISTRO; urgency=low
-
- * New version based on 0ce60362a285f42cf2ecbeea8cff0c7919d28d72
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed, 13 May 2015 05:24:42 +0000
-
-ndndump (0.5.3-ppa6~DISTRO) DISTRO; urgency=low
-
- * New version based on 0ce60362a285f42cf2ecbeea8cff0c7919d28d72
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue, 05 May 2015 22:52:23 +0000
-
-ndndump (0.5.3-ppa5~DISTRO) DISTRO; urgency=low
-
- * New version based on 0ce60362a285f42cf2ecbeea8cff0c7919d28d72
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue, 05 May 2015 22:46:13 +0000
-
-ndndump (0.5.3-ppa4~DISTRO) DISTRO; urgency=low
-
- * New version based on 0ce60362a285f42cf2ecbeea8cff0c7919d28d72
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu, 18 Dec 2014 23:14:22 -0800
-
-ndndump (0.5.3-ppa3~DISTRO) DISTRO; urgency=low
-
- * New version based on 0ce60362a285f42cf2ecbeea8cff0c7919d28d72
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu, 18 Dec 2014 23:08:47 -0800
-
-ndndump (0.5.3-ppa2~DISTRO) DISTRO; urgency=low
-
- * New version based on 0ce60362a285f42cf2ecbeea8cff0c7919d28d72
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu, 18 Dec 2014 23:05:16 -0800
-
-ndndump (0.5.3-ppa1~DISTRO) DISTRO; urgency=low
-
- * New version based on 0ce60362a285f42cf2ecbeea8cff0c7919d28d72
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu, 18 Dec 2014 22:57:08 -0800
-
-ndndump (0.5.2-ppa2~DISTRO) DISTRO; urgency=low
-
- * New version based on 483aae5f92fb9beb9fd883424b3aa28bcb8ce822
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu, 18 Dec 2014 22:51:26 -0800
-
-ndndump (0.5.2-ppa1~DISTRO) DISTRO; urgency=low
-
- * New version based on 483aae5f92fb9beb9fd883424b3aa28bcb8ce822
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue, 28 Oct 2014 12:29:07 -0700
-
-ndndump (0.5.1-ppa1~DISTRO) DISTRO; urgency=low
-
- * New version based on v0.5.1 (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon, 25 Aug 2014 12:12:03 -0700
-
-ndndump (0.5-ppa1~DISTRO) DISTRO; urgency=low
-
- * New version based on 0.5 (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue, 12 Aug 2014 17:32:34 -0700
-
-ndndump (0.0.1-ppa2~DISTRO) DISTRO; urgency=low
-
- * New version based on 22f77ef777d7201b3677b04e6b1e0e85c45f0238
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed, 30 Jul 2014 12:40:18 -0700
-
-ndndump (0.0.1-ppa1~DISTRO) DISTRO; urgency=low
-
- * New version based on 22f77ef777d7201b3677b04e6b1e0e85c45f0238
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue, 22 Jul 2014 11:20:24 -0700
-
-ndndump (0.0.0-ppa3~DISTRO) DISTRO; urgency=low
-
- * New version based on 22f77ef777d7201b3677b04e6b1e0e85c45f0238
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue, 01 Jul 2014 16:57:39 -0700
-
-ndndump (0.0.0-ppa2~DISTRO) DISTRO; urgency=low
-
- * New version based on 22f77ef777d7201b3677b04e6b1e0e85c45f0238
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu, 29 May 2014 03:13:42 -0700
-
-ndndump (0.0.0-ppa1~DISTRO) DISTRO; urgency=low
-
- * New version based on 22f77ef777d7201b3677b04e6b1e0e85c45f0238
- (https://github.com/named-data/ndndump)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon, 26 May 2014 07:13:45 -0700
-
-ndndump (0.0.0~ppa0~DISTRO) DISTRO; urgency=low
-
- * Initial release
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat, 24 May 2014 16:58:30 -0800
diff --git a/ndndump/debian/compat b/ndndump/debian/compat
deleted file mode 100644
index 45a4fb7..0000000
--- a/ndndump/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/ndndump/debian/control b/ndndump/debian/control
deleted file mode 100644
index 15cedd2..0000000
--- a/ndndump/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: ndndump
-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,
- ndn-cxx-dev (>= 0.3.0~rc0.2)
-Standards-Version: 3.9.2
-Section: net
-Homepage: http://github.com/named-data/ndndump
-Vcs-Git: git://github.com/named-data/ndndump.git
-Vcs-Browser: http://github.com/named-data/ndndump
-
-Package: ndndump
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, tcpdump, ndn-cxx
-Description: Packet capture and analysis tool for NDN
- ndndump was created to provide a tcpdump-like tool for Named Data Networking (NDN).
diff --git a/ndndump/debian/copyright b/ndndump/debian/copyright
deleted file mode 100644
index a15e2de..0000000
--- a/ndndump/debian/copyright
+++ /dev/null
@@ -1,43 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: ndndump
-Source: http://github.com/named-data/ndndump
-
-Files: *
-Copyright: Copyright (c) 2011-2014, Regents of the University of California.
-License: GPL-3+
- ndndump is free software: you can redistribute it and/or modify it under the terms
- of the GNU General Public License as published by the Free Software Foundation,
- either version 3 of the License, or (at your option) any later version.
- .
- ndndump is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- ndndump, e.g., in COPYING file. If not, see <http://www.gnu.org/licenses/>.
-
-Files: debian/*
-Copyright: Copyright (c) 2013-2014, Alexander Afanasyev <alexander.afanasyev@ucla.edu>
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the Regents of the University of California nor
- the names of its contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL REGENTS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ndndump/debian/ndndump.dirs b/ndndump/debian/ndndump.dirs
deleted file mode 100644
index e772481..0000000
--- a/ndndump/debian/ndndump.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/ndndump/debian/ndndump.install b/ndndump/debian/ndndump.install
deleted file mode 100644
index 1df36c6..0000000
--- a/ndndump/debian/ndndump.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/*
diff --git a/ndndump/debian/rules b/ndndump/debian/rules
deleted file mode 100755
index a136bd9..0000000
--- a/ndndump/debian/rules
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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)
-CXXFLAGS += -std=c++11
-
-%:
- 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
-
-override_dh_auto_test:
diff --git a/ndndump/debian/rules.precise b/ndndump/debian/rules.precise
deleted file mode 100755
index 5c20f62..0000000
--- a/ndndump/debian/rules.precise
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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)
-CXXFLAGS += -std=c++0x
-
-%:
- 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
-
-override_dh_auto_test:
diff --git a/ndndump/debian/source/format b/ndndump/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/ndndump/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)