nlsr: Update to the latest version
diff --git a/nlsr/Makefile b/nlsr/Makefile
index 37c9432..6a718af 100644
--- a/nlsr/Makefile
+++ b/nlsr/Makefile
@@ -2,13 +2,13 @@
GIT_URL=https://github.com/named-data/NLSR
# Tag name or commit hash for checkout
-GIT_VERSION=7b616582edf0c2253f9c88405079c69c058ea4f0
+GIT_VERSION=93d9ec37eabd7a9866cc3e249452ef8464234577
# Package name
NAME=nlsr
# Package version
-VERSION=0.2.0~rc0.0
+VERSION=0.2.0~rc0.1
# PPA version
PPA_VERSION=1
diff --git a/nlsr/debian/changelog b/nlsr/debian/changelog
index 298a53e..905a675 100644
--- a/nlsr/debian/changelog
+++ b/nlsr/debian/changelog
@@ -1,3 +1,10 @@
+nlsr (0.2.0~rc0.1-ppa1~DISTRO) DISTRO; urgency=low
+
+ * New version based on 93d9ec37eabd7a9866cc3e249452ef8464234577
+ (https://github.com/named-data/NLSR)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu, 18 Dec 2014 23:36:09 -0800
+
nlsr (0.2.0~rc0.0-ppa1~DISTRO) DISTRO; urgency=low
* New version based on 7b616582edf0c2253f9c88405079c69c058ea4f0
diff --git a/nlsr/debian/control b/nlsr/debian/control
index cfb321d..773e1b9 100644
--- a/nlsr/debian/control
+++ b/nlsr/debian/control
@@ -4,7 +4,7 @@
Build-Depends: debhelper (>= 8.0.0),
python (>= 2.7.0),
pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.3.0~rc0.0),
+ ndn-cxx-dev (>= 0.3.0~rc0.2),
liblog4cxx10-dev (>= 0.10.0),
libcrypto++-dev (>= 5.6.1),
protobuf-compiler (>= 2.4.0),
diff --git a/nlsr/debian/control.precise b/nlsr/debian/control.precise
index 8ce1626..e2a1821 100644
--- a/nlsr/debian/control.precise
+++ b/nlsr/debian/control.precise
@@ -4,7 +4,7 @@
Build-Depends: debhelper (>= 8.0.0),
python (>= 2.7.0),
pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.3.0~rc0.0),
+ ndn-cxx-dev (>= 0.3.0~rc0.2),
liblog4cxx10-dev (>= 0.10.0),
libcrypto++-dev (>= 5.6.1),
protobuf-compiler (>= 2.4.0),
diff --git a/nlsr/debian/rules b/nlsr/debian/rules
index 44c87df..23a8078 100755
--- a/nlsr/debian/rules
+++ b/nlsr/debian/rules
@@ -10,12 +10,14 @@
# export DH_VERBOSE=1
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+CXXFLAGS += -std=c++11
%:
dh $@ --parallel
override_dh_auto_configure:
- ./waf configure --prefix=/usr
+ CXXFLAGS="$(CXXFLAGS)" LINKFLAGS="$(LDFLAGS)" ./waf configure --prefix=/usr
override_dh_auto_build:
./waf build
@@ -31,6 +33,7 @@
./waf distclean
rm -f VERSION
rm -rf .waf-1*
+ rm -rf .waf3-1*
rm -f .waf-tools/*.pyc
rm -f docs/*.pyc
diff --git a/nlsr/debian/rules.precise b/nlsr/debian/rules.precise
new file mode 100755
index 0000000..0f56088
--- /dev/null
+++ b/nlsr/debian/rules.precise
@@ -0,0 +1,40 @@
+#!/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
+
+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 -f VERSION
+ rm -rf .waf-1*
+ rm -rf .waf3-1*
+ rm -f .waf-tools/*.pyc
+ rm -f docs/*.pyc
+
+override_dh_auto_test: