ndn-traffic-generator: Updating to the latest version
diff --git a/ndn-traffic-generator/Makefile b/ndn-traffic-generator/Makefile
index a5a5ee5..d58e6e5 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=976c3972c738ba027a7ada551d4204869aefcd34
+GIT_VERSION=740812e0d83c7cfc767e4faf9bac4045ac92e1be
# Package name
NAME=ndn-traffic-generator
# Package version
-VERSION=0.0.1
+VERSION=0.0.2
# PPA version
-PPA_VERSION=5
+PPA_VERSION=1
include ../packaging.mk
diff --git a/ndn-traffic-generator/debian/changelog b/ndn-traffic-generator/debian/changelog
index 2e6e51e..f62ae10 100644
--- a/ndn-traffic-generator/debian/changelog
+++ b/ndn-traffic-generator/debian/changelog
@@ -1,3 +1,10 @@
+ndn-traffic-generator (0.0.2-ppa1~DISTRO) DISTRO; urgency=low
+
+ * New version based on 740812e0d83c7cfc767e4faf9bac4045ac92e1be
+ (https://github.com/named-data/ndn-traffic-generator)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu, 18 Dec 2014 23:26:26 -0800
+
ndn-traffic-generator (0.0.1-ppa5~DISTRO) DISTRO; urgency=low
* New version based on 976c3972c738ba027a7ada551d4204869aefcd34
diff --git a/ndn-traffic-generator/debian/control b/ndn-traffic-generator/debian/control
index 561d729..2102afa 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.3.0~rc0.0)
+ ndn-cxx-dev (>= 0.3.0~rc0.2)
Standards-Version: 3.9.2
Section: net
Homepage: http://github.com/named-data/ndn-tlv-ping
diff --git a/ndn-traffic-generator/debian/rules b/ndn-traffic-generator/debian/rules
index 4f6bbef..0d3817e 100755
--- a/ndn-traffic-generator/debian/rules
+++ b/ndn-traffic-generator/debian/rules
@@ -10,15 +10,17 @@
# 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 --nocache configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ CXXFLAGS="$(CXXFLAGS)" LINKFLAGS="$(LDFLAGS)" ./waf configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
override_dh_auto_build:
- ./waf --nocache build
+ ./waf build
override_dh_auto_install:
./waf install --destdir=debian/tmp
@@ -30,6 +32,7 @@
dh_clean
./waf distclean
rm -rf .waf-1*
+ rm -rf .waf3-1*
rm -f .waf-tools/*.pyc
override_dh_auto_test:
diff --git a/ndn-traffic-generator/debian/rules.precise b/ndn-traffic-generator/debian/rules.precise
new file mode 100755
index 0000000..5fa0a0c
--- /dev/null
+++ b/ndn-traffic-generator/debian/rules.precise
@@ -0,0 +1,38 @@
+#!/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: