[gnunet] branch master updated (bcf99cf2e -> 2a7d977ee)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from bcf99cf2e - housekeeping, forgotten for 0.19.1
     new 37a3445a3 DIST: Do not install legacy icons
     new 2a7d977ee DOC: Update handbook and properly reset on bootstrap

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bootstrap           | 6 ++++++
 contrib/Makefile.am | 7 -------
 contrib/sphinx      | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bootstrap b/bootstrap
index fbe03c6f7..727df2e99 100755
--- a/bootstrap
+++ b/bootstrap
@@ -110,7 +110,13 @@ sphinx_update()
       cd contrib/sphinx || exit 1
       # GNS
       make html >/dev/null || exit 1
+      if test -e ../../doc/handbook/html; then
+        rm -r ../../doc/handbook/html || exit 1
+      fi
       cp -r _build/html ../../doc/handbook/ || exit 1
+      if test -e ../../doc/handbook/texinfo; then
+        rm -r ../../doc/handbook/texinfo || exit 1
+      fi
       make info >/dev/null || exit 1
       cp -r _build/texinfo ../../doc/handbook/ || exit 1
       cd $cwd
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index acfea9365..4cbb38cb0 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -20,15 +20,8 @@ dist_pkgdata_DATA = \
   fcfsd/fcfsd-forbidden.html \
   fcfsd/fcfsd-notfound.html \
   branding/logo/gnunet-logo.png \
-  branding/logo/lynXified-amirouche-v3.svg \
   branding/logo/gnunet-logo-dark-text.svg \
-  branding/logo/lynXified-amirouche-anonymous-v3.png \
   branding/logo/gnunet-logo-dark-only-text.svg \
-  branding/logo/old-gnunet-logo.pdf \
-  branding/logo/old-gnunet-logo.svg \
-  branding/logo/old-gnunet-logo-big.png \
-  branding/logo/old-gnunet-logo-color.png \
-  branding/logo/old-gnunet-logo-regrouped.svg \
   testing_hostkeys.ecc \
   netjail/netjail_core.sh \
   netjail/netjail_exec.sh \
diff --git a/contrib/sphinx b/contrib/sphinx
index 4f40b5dec..263aed2cf 160000
--- a/contrib/sphinx
+++ b/contrib/sphinx
@@ -1 +1 @@
-Subproject commit 4f40b5deca02c8dc64ff6c73e6602e6abdd1bae2
+Subproject commit 263aed2cf5b5bbad6620fee899769eb4b0762f6e

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.