ndn-tools: Update to version 0.3-28-g72c96d2 (based on ndn-cxx-0.5.0)
Change-Id: I5d5d57a9a5a341fb6482d9475e24cb4fe82df6ef
diff --git a/ndn-tools/Makefile b/ndn-tools/Makefile
index 21b2928..add10f8 100644
--- a/ndn-tools/Makefile
+++ b/ndn-tools/Makefile
@@ -2,13 +2,13 @@
GIT_URL=https://github.com/named-data/ndn-tools
# Tag name or commit hash for checkout
-GIT_VERSION=d2300731edd88593290ac0c33ed25d5b353b6634
+GIT_VERSION=72c96d23f0c66d157c69954b4b06d8cc2ef330c2
# Package name
NAME=ndn-tools
# Package version
-VERSION=0.3-6-gd230073
+VERSION=0.3-28-g72c96d2
# PPA version
PPA_VERSION=1
diff --git a/ndn-tools/debian/changelog b/ndn-tools/debian/changelog
index 5878f92..fb65484 100644
--- a/ndn-tools/debian/changelog
+++ b/ndn-tools/debian/changelog
@@ -1,3 +1,10 @@
+ndn-tools (0.3-28-g72c96d2-ppa1~DISTRO) DISTRO; urgency=low
+
+ * New version based on 72c96d23f0c66d157c69954b4b06d8cc2ef330c2
+ (https://github.com/named-data/ndn-tools)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed, 05 Oct 2016 05:56:49 +0000
+
ndn-tools (0.3-6-gd230073-ppa1~DISTRO) DISTRO; urgency=low
* New version based on d2300731edd88593290ac0c33ed25d5b353b6634
diff --git a/ndn-tools/debian/control b/ndn-tools/debian/control
index 189f5e2..ac7c4a8 100644
--- a/ndn-tools/debian/control
+++ b/ndn-tools/debian/control
@@ -7,7 +7,7 @@
pkg-config (>= 0.26),
libpcap-dev,
python-sphinx,
- ndn-cxx-dev (>= 0.4.1)
+ ndn-cxx-dev (>= 0.5.0)
Standards-Version: 3.9.2
Section: net
Homepage: http://github.com/named-data/ndn-tools
@@ -55,4 +55,3 @@
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
deleted file mode 100644
index 7d9a1eb..0000000
--- a/ndn-tools/debian/control.precise
+++ /dev/null
@@ -1,57 +0,0 @@
-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.4.1)
-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/copyright b/ndn-tools/debian/copyright
index 8561bf4..21b8266 100644
--- a/ndn-tools/debian/copyright
+++ b/ndn-tools/debian/copyright
@@ -3,7 +3,7 @@
Source: http://github.com/named-data/ndn-tools
Files: *
-Copyright: Copyright (c) 2014-2015, Regents of the University of California,
+Copyright: Copyright (c) 2014-2016, Regents of the University of California,
Arizona Board of Regents,
Colorado State University,
University Pierre & Marie Curie, Sorbonne University,
@@ -23,27 +23,19 @@
ndndump, e.g., in COPYING file. If not, see <http://www.gnu.org/licenses/>.
Files: debian/*
-Copyright: Copyright (c) 2013-2015, 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.
+Copyright: Copyright (c) 2013-2016, Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+License: Apache 2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
.
- 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.
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License 2.0 can
+ be found in "/usr/share/common-licenses/Apache-2.0"
diff --git a/ndn-tools/debian/rules.precise b/ndn-tools/debian/rules.precise
deleted file mode 100755
index 4cd26f1..0000000
--- a/ndn-tools/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)
-
-%:
- 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: