Skip to content

Commit

Permalink
nfd: Update to version 0.5.1
Browse files Browse the repository at this point in the history
Change-Id: I18270180692f0b70ab7c08d2f929e5815ab9493b
  • Loading branch information
cawka committed Jan 26, 2017
1 parent dc8114b commit 82d638b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 10 deletions.
6 changes: 3 additions & 3 deletions nfd/Makefile
Expand Up @@ -2,15 +2,15 @@
GIT_URL=https://github.com/named-data/NFD.git

# Tag name or commit hash for checkout
GIT_VERSION=NFD-0.5.0
GIT_VERSION=NFD-0.5.1

# Package name
NAME=nfd

# Package version
VERSION=0.5.0
VERSION=0.5.1

# PPA version
PPA_VERSION=1
PPA_VERSION=2

include ../packaging.mk
7 changes: 7 additions & 0 deletions nfd/debian/changelog
@@ -1,3 +1,10 @@
nfd (0.5.1-ppa2~DISTRO) DISTRO; urgency=low

* New version based on NFD-0.5.1 (https://github.com/named-
data/NFD.git)

-- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu, 26 Jan 2017 05:17:40 +0000

nfd (0.5.0-ppa1~DISTRO) DISTRO; urgency=low

* New version based on NFD-0.5.0 (https://github.com/named-
Expand Down
12 changes: 6 additions & 6 deletions nfd/debian/control
Expand Up @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 8.0.0),
dh-systemd (>= 1.5),
python (>= 2.7.0),
pkg-config (>= 0.26),
ndn-cxx-dev (>= 0.5.0),
ndn-cxx-dev (>= 0.5.1),
python-sphinx,
libpcap-dev,
libboost-all-dev (>= 1.53.0)
Expand All @@ -16,29 +16,29 @@ Vcs-Git: git://github.com/named-data/NFD.git
Vcs-Browser: http://github.com/named-data/NFD

Package: nfd
Architecture: i386 amd64
Architecture: i386 amd64 arm64 armel armhf ppc64el
Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx, sudo, procps
Description: NFD - Named Data Networking Forwarding Daemon
NFD is a network forwarder that implements and evolves together with the Named Data
Networking (NDN) protocol.

Package: nfd-status-http-server
Architecture: i386 amd64
Architecture: i386 amd64 arm64 armel armhf ppc64el
Depends: nfd (= ${binary:Version}), ${misc:Depends}, python2.7-minimal
Description: NFD HTTP status server

Package: nfd-autoreg
Architecture: i386 amd64
Architecture: i386 amd64 arm64 armel armhf ppc64el
Depends: nfd (= ${binary:Version}), ${misc:Depends}
Description: NFD autoreg server

Package: ndn-autoconfig-server
Architecture: i386 amd64
Architecture: i386 amd64 arm64 armel armhf ppc64el
Depends: nfd (= ${binary:Version}), ${misc:Depends}
Description: NDN autoconfig server

Package: ndn-autoconfig-client
Architecture: i386 amd64
Architecture: i386 amd64 arm64 armel armhf ppc64el
Depends: nfd (= ${binary:Version}), ${misc:Depends}
Description: NDN autoconfig client

Expand Down
1 change: 1 addition & 0 deletions nfd/debian/nfd-status-http-server.service
Expand Up @@ -28,6 +28,7 @@ Documentation=man:nfd-status-http-server
After=nfd.service

[Service]
Environment=HOME=/var/lib/ndn/nfd-status-http-server
EnvironmentFile=-/etc/default/nfd-status-http-server
ExecStart=/usr/bin/nfd-status-http-server $FLAGS
Restart=on-failure
Expand Down
3 changes: 2 additions & 1 deletion nfd/debian/rules
Expand Up @@ -12,12 +12,13 @@
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
CXXFLAGS += -std=c++11
LIBDIR := /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

%:
dh $@ --parallel --with=systemd

override_dh_auto_configure:
CXXFLAGS="$(CXXFLAGS)" ./waf configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
CXXFLAGS="$(CXXFLAGS)" ./waf configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --boost-libs="$(LIBDIR)"

override_dh_auto_build:
./waf build
Expand Down

0 comments on commit 82d638b

Please sign in to comment.