nlsr: install nlsr.conf.sample in /etc/ndn
Remove dependencies that are no longer needed
Restore NLSR github to named-data
refs: #4071, #3992
Change-Id: Ia3aebdf6902e7a254b84f3ae92a42967b7a30b1e
diff --git a/nlsr/Makefile b/nlsr/Makefile
index 61f6ada..4ae9e19 100644
--- a/nlsr/Makefile
+++ b/nlsr/Makefile
@@ -1,14 +1,14 @@
# URL for git clone
-GIT_URL=https://github.com/agawande/NLSR
+GIT_URL=https://github.com/named-data/NLSR
# Tag name or commit hash for checkout
-GIT_VERSION=4c66119046e21c503a5c5dfb9cc478d360c65a10
+GIT_VERSION=0.4.0
# Package name
NAME=nlsr
# Package version
-VERSION=0.3.2-14-backport-of-0.3.2-9-g4c661190
+VERSION=0.4.0-9e955bc
# PPA version
PPA_VERSION=1
diff --git a/nlsr/debian/control b/nlsr/debian/control
index ead5add..4a3a1d4 100644
--- a/nlsr/debian/control
+++ b/nlsr/debian/control
@@ -1,16 +1,13 @@
Source: nlsr
Priority: extra
-Maintainer: Vince Lehman <vslehman@memphis.edu>
+Maintainer: Ashlesh Gawande <agawande@memphis.edu>
Build-Depends: debhelper (>= 8.0.0),
dh-systemd (>= 1.5),
python (>= 2.7.0),
pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.5.1-60),
- libchronosync-dev (>= 0.3.0-9),
+ ndn-cxx-dev (>= 0.6.0),
+ libchronosync-dev (>= 0.4.0),
liblog4cxx10-dev (>= 0.10.0),
- libcrypto++-dev (>= 5.6.1),
- protobuf-compiler (>= 2.4.0),
- libprotobuf-dev (>= 2.4.0),
libboost-all-dev (>= 1.53.0),
python-sphinx (>= 1.1.3)
Standards-Version: 3.9.2
diff --git a/nlsr/debian/nlsr.dirs b/nlsr/debian/nlsr.dirs
index e772481..18488c7 100644
--- a/nlsr/debian/nlsr.dirs
+++ b/nlsr/debian/nlsr.dirs
@@ -1 +1,2 @@
+etc
usr/bin
diff --git a/nlsr/debian/nlsr.install b/nlsr/debian/nlsr.install
index 901dad3..70a47f1 100644
--- a/nlsr/debian/nlsr.install
+++ b/nlsr/debian/nlsr.install
@@ -1,3 +1,5 @@
+etc/ndn/nlsr.conf.sample
+
usr/bin/*
usr/share/man/*
diff --git a/nlsr/debian/rules b/nlsr/debian/rules
index b94084a..8ce273d 100755
--- a/nlsr/debian/rules
+++ b/nlsr/debian/rules
@@ -18,7 +18,7 @@
dh $@ --parallel --with=systemd
override_dh_auto_configure:
- CXXFLAGS="$(CXXFLAGS)" LINKFLAGS="$(LDFLAGS)" ./waf configure --prefix=/usr --boost-libs="$(LIBDIR)"
+ CXXFLAGS="$(CXXFLAGS)" LINKFLAGS="$(LDFLAGS)" ./waf configure --prefix=/usr --boost-libs="$(LIBDIR)" --sysconfdir=/etc
override_dh_auto_build:
./waf build