6 files changed, 31 insertions, 12 deletions
diff --git a/debian/gnunet-common.install b/debian/gnunet-common.install
index d7020a1..b85d5c4 100644
--- a/debian/gnunet-common.install
+++ b/debian/gnunet-common.install
@@ -1,5 +1,7 @@
 usr/lib/libgnunetdatastore.so.*
 usr/lib/libgnunetfs.so.*
+usr/lib/libgnunetmysql.so.*
+usr/lib/libgnunetpostgres.so.*
 usr/lib/libgnunetstatistics.so.*
 usr/lib/libgnunetutil.so.*
 usr/share/locale/*/LC_MESSAGES/gnunet.mo
diff --git a/debian/gnunet-dev.install b/debian/gnunet-dev.install
index 9d4598d..09f2563 100644
--- a/debian/gnunet-dev.install
+++ b/debian/gnunet-dev.install
@@ -1,3 +1,4 @@
 usr/include
 usr/lib/*.so
 usr/lib/pkgconfig
+usr/share/gnunet/testing_hostkeys.dat
diff --git a/debian/gnunet-server.install b/debian/gnunet-server.install
index 44a1acc..95ff725 100644
--- a/debian/gnunet-server.install
+++ b/debian/gnunet-server.install
@@ -1,20 +1,16 @@
 etc/gnunet.conf
 usr/bin/gnunet-arm
-usr/bin/gnunet-core-list-connections
+usr/bin/gnunet-core
 usr/bin/gnunet-daemon-*
-usr/bin/gnunet-dht-get
-usr/bin/gnunet-dht-put
+usr/bin/gnunet-dht-*
 usr/bin/gnunet-fs
-usr/bin/gnunet-helper-dns
-usr/bin/gnunet-helper-exit
-usr/bin/gnunet-helper-fs-publish
-usr/bin/gnunet-helper-nat-client
-usr/bin/gnunet-helper-nat-server
-usr/bin/gnunet-helper-transport-wlan
-usr/bin/gnunet-helper-vpn
+usr/bin/gnunet-gns*
+usr/bin/gnunet-helper-*
+usr/bin/gnunet-namestore
 usr/bin/gnunet-nat-server
 usr/bin/gnunet-peerinfo
 usr/bin/gnunet-resolver
+usr/bin/gnunet-rsa
 usr/bin/gnunet-service-*
 usr/bin/gnunet-testing
 usr/bin/gnunet-transport
@@ -30,25 +26,35 @@ usr/lib/libgnunetdns.so.*
 usr/lib/libgnunetdnsparser.so.*
 usr/lib/libgnunetdht.so.*
 usr/lib/libgnunetfragmentation.so.*
+usr/lib/libgnunetgns.so.0*
 usr/lib/libgnunethello.so.*
+usr/lib/libgnunetlockmanager.so.0*
 usr/lib/libgnunetmesh.so.*
 usr/lib/libgnunetnamestore.so.*
 usr/lib/libgnunetnat.so.*
 usr/lib/libgnunetnse.so.*
 usr/lib/libgnunetpeerinfo.so.*
 usr/lib/libgnunettesting.so.*
+usr/lib/libgnunettesting_new.so.0*
+usr/lib/libgnunettestbed.so.0*
 usr/lib/libgnunettransport.so.*
 usr/lib/libgnunettransporttesting.so.*
 usr/lib/libgnunettun.so.*
 usr/lib/libgnunetvpn.so.*
+usr/lib/libnss_gns.so.2
+usr/lib/libnss_gns4.so.2
+usr/lib/libnss_gns6.so.2
 usr/lib/gnunet/*.so
 usr/share/gnunet/config.d
+usr/share/gnunet/hellos/*
 usr/share/man/man1/gnunet-arm.1
+usr/share/man/man1/gnunet-core.1
 usr/share/man/man1/gnunet-fs.1
+usr/share/man/man1/gnunet-gns.1
+usr/share/man/man1/gnunet-namestore.1
 usr/share/man/man1/gnunet-nat-server.1
 usr/share/man/man1/gnunet-peerinfo.1
+usr/share/man/man1/gnunet-rsa.1
 usr/share/man/man1/gnunet-transport.1
 usr/share/man/man1/gnunet-vpn.1
 debian/man/* usr/share/man/man1/
-
-
diff --git a/debian/gnunet-server.links b/debian/gnunet-server.links
index 1bd18fa..9d62eb4 100644
--- a/debian/gnunet-server.links
+++ b/debian/gnunet-server.links
@@ -8,6 +8,7 @@
 /usr/share/man/man1/gnunet-helpers.1 /usr/share/man/man1/gnunet-helper-nat-client.1
 /usr/share/man/man1/gnunet-helpers.1 /usr/share/man/man1/gnunet-helper-nat-server.1
 /usr/share/man/man1/gnunet-helpers.1 /usr/share/man/man1/gnunet-helper-transport-wlan.1
+/usr/share/man/man1/gnunet-helpers.1 /usr/share/man/man1/gnunet-helper-transport-wlan-dummy.1
 /usr/share/man/man1/gnunet-helpers.1 /usr/share/man/man1/gnunet-helper-vpn.1
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-arm.1
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-ats.1
@@ -16,6 +17,8 @@
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-dht.1
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-dns.1
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-fs.1
+/usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-gns.1
+/usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-lockmanager.1
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-mesh.1
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-namestore.1
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-nse.1
@@ -26,3 +29,7 @@
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-service-vpn.1
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/mockup-service.1
 /usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-transport-certificate-creation.1
+/usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-dht-monitor.1
+/usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-gns-fcfsd.1
+/usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-gns-import.1
+/usr/share/man/man1/gnunet-services.1 /usr/share/man/man1/gnunet-gns-proxy.1
diff --git a/debian/gnunet-server.postinst b/debian/gnunet-server.postinst
index d2995fc..439b3db 100644
--- a/debian/gnunet-server.postinst
+++ b/debian/gnunet-server.postinst
@@ -61,6 +61,7 @@ case "${1}" in
 		chmod 0700 "${SERVICEHOME}" || true
 		# Restrict access on setuid binaries
 		for i in /usr/bin/gnunet-helper-exit \
+			/usr/bin/gnunet-helper-fs-publish \
 			/usr/bin/gnunet-helper-nat-client \
 			/usr/bin/gnunet-helper-nat-server \
 			/usr/bin/gnunet-helper-transport-wlan \
diff --git a/debian/rules b/debian/rules
index 986830a..47cc256 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,8 @@ override_dh_auto_install:
 	# Remove gnunet-download-manager.scm extension to match the manpage name
 	mv debian/tmp/usr/bin/gnunet-download-manager.scm \
 		debian/tmp/usr/bin/gnunet-download-manager
+	mv debian/tmp/usr/bin/gnunet-gns-import.sh \
+		debian/tmp/usr/bin/gnunet-gns-import
 	
 	# Removing useless files
 	rm -f debian/tmp/usr/lib/*.la debian/tmp/usr/lib/gnunet/*.la \