summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-10-27 17:30:26 +0000
committerng0 <ng0@n0.is>2019-10-27 17:30:26 +0000
commit577627286931f739cf5e18670f16cf9636ed0f79 (patch)
tree89c06399093cd9b9286d18ad6ae656238127591a
parentcf9440cc40334ed87755615ecf6d5d2c2445f17b (diff)
parent9627d21ca8c7244f517cc0a67bbc9ca72a966611 (diff)
Merge branch 'master' of gnunet.org:gnunet
-rw-r--r--configure.ac2
-rw-r--r--contrib/Makefile.am33
-rw-r--r--src/gns/Makefile.am1
3 files changed, 17 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index 0083cf3d7..bfd227d59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
#
AC_PREREQ(2.61)
# Checks for programs.
-AC_INIT([gnunet], [0.11.6], [bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.11.7], [bug-gnunet@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
# check for legacy option that is no longer supported (#5627) and fail hard
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 26d570101..a997a8377 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -18,23 +18,22 @@ INITD_FILES = \
services/systemd/gnunet.service
PACKAGES_FILES = \
- guix/guix-env-py2.scm \
- guix/guix-env-gillmann.scm \
- guix/notest-guix-env.scm \
- nix/gnunet-dev.nix \
- nix/default.nix \
- alpine/gnunet-gtk/APKBUILD \
- alpine/gnunet/APKBUILD \
- alpine/gnunet/gnunet-system-services.initd \
- alpine/gnunet/gnunet-system.conf \
- alpine/gnunet/gnunet-user-services.initd \
- alpine/gnunet/gnunet-user.conf \
- alpine/gnunet/gnunet.post-deinstall \
- alpine/gnunet/gnunet.post-install \
- alpine/gnunet/gnunet.pre-deinstall \
- alpine/gnunet/gnunet.pre-install \
- alpine/gnunet/gnunet.xsession \
- alpine/gnurl/APKBUILD
+ packages/guix/guix-env-py2.scm \
+ packages/guix/guix-env-gillmann.scm \
+ packages/guix/notest-guix-env.scm \
+ packages/nix/gnunet-dev.nix \
+ packages/nix/default.nix \
+ packages/alpine/gnunet-gtk/APKBUILD \
+ packages/alpine/gnunet/APKBUILD \
+ packages/alpine/gnunet/gnunet-system-services.initd \
+ packages/alpine/gnunet/gnunet-system.conf \
+ packages/alpine/gnunet/gnunet-user-services.initd \
+ packages/alpine/gnunet/gnunet-user.conf \
+ packages/alpine/gnunet/gnunet.post-install \
+ packages/alpine/gnunet/gnunet.pre-deinstall \
+ packages/alpine/gnunet/gnunet.pre-install \
+ packages/alpine/gnunet/gnunet.xsession \
+ packages/alpine/gnurl/APKBUILD
EXTRA_DIST = \
conf/colorit/colorit.conf \
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 48d13e3c0..49e0750fa 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -15,7 +15,6 @@ EXTRA_DIST = \
test_gns_lookup.conf \
test_gns_proxy.conf \
test_gns_simple_lookup.conf \
- w32nsp.def \
openssl.cnf \
gnunet-gns-proxy-setup-ca.in \
zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \