Several fixes
diff --git a/ndndump/debian/repo-ng.dirs b/ndndump/debian/ndndump.dirs
similarity index 100%
rename from ndndump/debian/repo-ng.dirs
rename to ndndump/debian/ndndump.dirs
diff --git a/ndndump/debian/repo-ng.install b/ndndump/debian/ndndump.install
similarity index 100%
rename from ndndump/debian/repo-ng.install
rename to ndndump/debian/ndndump.install
diff --git a/ndndump/debian/rules b/ndndump/debian/rules
index dfbc583..79f988d 100755
--- a/ndndump/debian/rules
+++ b/ndndump/debian/rules
@@ -15,10 +15,10 @@
dh $@ --parallel
override_dh_auto_configure:
- ./waf --nocache configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ ./waf configure --prefix=/usr
override_dh_auto_build:
- ./waf --nocache build
+ ./waf build
override_dh_auto_install:
./waf install --destdir=debian/tmp
diff --git a/nfd/debian/control.precise b/nfd/debian/control.precise
index 94b7375..6ddc3cb 100644
--- a/nfd/debian/control.precise
+++ b/nfd/debian/control.precise
@@ -20,3 +20,13 @@
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
+Depends: nfd (= ${binary:Version}), ${misc:Depends}
+Description: NFD HTTP status server
+
+Package: nfd-autoreg
+Architecture: i386 amd64
+Depends: nfd (= ${binary:Version}), ${misc:Depends}
+Description: NFD autoreg server
diff --git a/nfd/debian/rules b/nfd/debian/rules
index 58579fb..2936900 100755
--- a/nfd/debian/rules
+++ b/nfd/debian/rules
@@ -15,10 +15,10 @@
dh $@ --parallel
override_dh_auto_configure:
- ./waf --nocache configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ ./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
diff --git a/packaging.mk b/packaging.mk
index 9d40d3d..33e5466 100644
--- a/packaging.mk
+++ b/packaging.mk
@@ -23,7 +23,16 @@
cd .. ; \
tar --exclude .git -czf ${NAME}_${VERSION}.orig.tar.gz ${NAME}_${VERSION}
-build: distro
+source-build:
+ $(MAKE) _build DEBUILD="debuild -S -sa"
+
+build:
+ $(MAKE) _build DEBUILD=debuild DISTROS=precise
+
+install: build
+ sudo dpkg -i work/*.deb
+
+_build: distro
\
if test -z "$$DEBEMAIL" -o -z "$$DEBFULLNAME"; then \
echo "DEBFULLNAME and DEBEMAIL environmental variable should be set" ; \
@@ -57,7 +66,7 @@
${DEBUILD} ; \
done
-dput: build
+dput: source-build
\
cd "work" ; \
for distro in ${DISTROS}; do \
diff --git a/repo-ng/debian/control b/repo-ng/debian/control
index 649ac67..c8a420a 100644
--- a/repo-ng/debian/control
+++ b/repo-ng/debian/control
@@ -1,4 +1,4 @@
-Source: ndn-tlv-ping
+Source: repo-ng
Priority: extra
Maintainer: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
Build-Depends: debhelper (>= 8.0.0),
diff --git a/repo-ng/debian/rules b/repo-ng/debian/rules
index dfbc583..1450368 100755
--- a/repo-ng/debian/rules
+++ b/repo-ng/debian/rules
@@ -15,10 +15,10 @@
dh $@ --parallel
override_dh_auto_configure:
- ./waf --nocache configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ ./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