ndns: Update to version 0.0.6-gdc2df (based on ndn-cxx-0.5.0)
Change-Id: I8c618f4c3777e9a9fd985e60ad2f1eb3d2c780af
diff --git a/ndns/Makefile b/ndns/Makefile
index 3e20962..0ea3af3 100644
--- a/ndns/Makefile
+++ b/ndns/Makefile
@@ -2,13 +2,13 @@
GIT_URL=https://github.com/named-data/ndns
# Tag name or commit hash for checkout
-GIT_VERSION=df2e9394fcbfc93169343044b440f258d6c70234
+GIT_VERSION=dc2df7c2b342db8ee3b20c8d45bfa016f895e82b
# Package name
NAME=ndns
# Package version
-VERSION=0.0.5
+VERSION=0.0.6-gdc2df
# PPA version
PPA_VERSION=1
diff --git a/ndns/debian/changelog b/ndns/debian/changelog
index f442e88..f5a2ad2 100644
--- a/ndns/debian/changelog
+++ b/ndns/debian/changelog
@@ -1,3 +1,10 @@
+ndns (0.0.6-gdc2df-ppa1~DISTRO) DISTRO; urgency=low
+
+ * New version based on dc2df7c2b342db8ee3b20c8d45bfa016f895e82b
+ (https://github.com/named-data/ndns)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed, 05 Oct 2016 06:07:11 +0000
+
ndns (0.0.5-ppa1~DISTRO) DISTRO; urgency=low
* New version based on df2e9394fcbfc93169343044b440f258d6c70234
diff --git a/ndns/debian/control b/ndns/debian/control
index ebdee48..04e2542 100644
--- a/ndns/debian/control
+++ b/ndns/debian/control
@@ -5,7 +5,7 @@
dh-systemd (>= 1.5),
python (>= 2.7.0),
pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.4.1),
+ ndn-cxx-dev (>= 0.5.0),
liblog4cxx10-dev (>= 0.10.0)
Standards-Version: 3.9.2
Section: net
diff --git a/ndns/debian/control.precise b/ndns/debian/control.precise
deleted file mode 100644
index 5b81fba..0000000
--- a/ndns/debian/control.precise
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: ndns
-Priority: extra
-Maintainer: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
-Build-Depends: debhelper (>= 8.0.0),
- python (>= 2.7.0),
- pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.4.1),
- liblog4cxx10-dev (>= 0.10.0)
-Standards-Version: 3.9.2
-Section: net
-Homepage: http://github.com/named-data/ndns
-Vcs-Git: git://github.com/named-data/ndns.git
-Vcs-Browser: http://github.com/named-data/ndns
-
-Package: ndns
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx, nfd
-Description: Domain Name Service for Named Data Networking
- NDNS is a completely distributed database system that largely mimics
- the structure of the DNS system in today's Internet but operates within
- the NDN architecture.
diff --git a/ndns/debian/copyright b/ndns/debian/copyright
index 75455e7..7fe6d6c 100644
--- a/ndns/debian/copyright
+++ b/ndns/debian/copyright
@@ -3,31 +3,23 @@
Source: http://github.com/named-data/repo-ng
Files: *
-Copyright: Copyright (c) 2014, Regents of the University of California.
-License: GPL-3+
+Copyright: Copyright (c) 2014-2016, Regents of the University of California.
+License: GPL 3+
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/ndns/debian/rules.precise b/ndns/debian/rules.precise
deleted file mode 100755
index ea22c4d..0000000
--- a/ndns/debian/rules.precise
+++ /dev/null
@@ -1,39 +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:
- LDFLAGS="${LDFLAGS}" CXXFLAGS="$(CXXFLAGS)" ./waf configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
-
-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 -f docs/*.pyc
-
-override_dh_auto_test: