ndn-traffic-generator: Update to version 0.0.6-g6f33e (based on ndn-cxx-0.5.0)
Change-Id: Ieb7e2027ae9460a9716a6d65d573866b741660cd
diff --git a/ndn-traffic-generator/Makefile b/ndn-traffic-generator/Makefile
index c2b2db1..da84ca7 100644
--- a/ndn-traffic-generator/Makefile
+++ b/ndn-traffic-generator/Makefile
@@ -2,15 +2,15 @@
GIT_URL=https://github.com/named-data/ndn-traffic-generator
# Tag name or commit hash for checkout
-GIT_VERSION=ef56143e6ff73d935499c6c4708bf124aff40407
+GIT_VERSION=6f33e0ffca38158700413eba663f558960abc2df
# Package name
NAME=ndn-traffic-generator
# Package version
-VERSION=0.0.5-gef561
+VERSION=0.0.6-g6f33e
# PPA version
-PPA_VERSION=3
+PPA_VERSION=1
include ../packaging.mk
diff --git a/ndn-traffic-generator/debian/changelog b/ndn-traffic-generator/debian/changelog
index 5731fbb..8843e00 100644
--- a/ndn-traffic-generator/debian/changelog
+++ b/ndn-traffic-generator/debian/changelog
@@ -1,3 +1,10 @@
+ndn-traffic-generator (0.0.6-g6f33e-ppa1~DISTRO) DISTRO; urgency=low
+
+ * New version based on 6f33e0ffca38158700413eba663f558960abc2df
+ (https://github.com/named-data/ndn-traffic-generator)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed, 05 Oct 2016 06:00:29 +0000
+
ndn-traffic-generator (0.0.5-gef561-ppa3~DISTRO) DISTRO; urgency=low
* New version based on ef56143e6ff73d935499c6c4708bf124aff40407
diff --git a/ndn-traffic-generator/debian/control b/ndn-traffic-generator/debian/control
index 5b0662e..89ec8ed 100644
--- a/ndn-traffic-generator/debian/control
+++ b/ndn-traffic-generator/debian/control
@@ -4,7 +4,7 @@
Build-Depends: debhelper (>= 8.0.0),
python (>= 2.7.0),
pkg-config (>= 0.26),
- 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-tlv-ping
diff --git a/ndn-traffic-generator/debian/copyright b/ndn-traffic-generator/debian/copyright
index a469d6a..782327d 100644
--- a/ndn-traffic-generator/debian/copyright
+++ b/ndn-traffic-generator/debian/copyright
@@ -4,30 +4,22 @@
Files: *
Copyright: Copyright (C) 2014 University of Arizona.
-License: Unknown
+License: GPL 3.0+
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.
+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-traffic-generator/debian/rules.precise b/ndn-traffic-generator/debian/rules.precise
deleted file mode 100755
index 5fa0a0c..0000000
--- a/ndn-traffic-generator/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 --sysconfdir=/etc --localstatedir=/var
-
-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: