[git] GPGME - branch, master, updated. gpgme-1.11.1-323-gf3fc737

[by Ben McGinnes]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  f3fc73738264d21baf0e9b49fdd5cb67faa11d31 (commit)
      from  2cca422ca4b2df831a824393077d0b52d79532aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f3fc73738264d21baf0e9b49fdd5cb67faa11d31
Author: Ben McGinnes <ben at adversary.org>
Date:   Thu Oct 4 21:10:46 2018 +1000

    python: makefiles
    
    * doc/Makefile.am: Removed a bit I forgot about.
    * Renamed lang/python/docs to lang/python/doc bvecause apparently
      automake cares about that too.
    * Decided to be extra explicit in the manifest because if I don't then
      all sorts of things get deleted ... like lang/python
    * Tested on an external linux system just in case my osx workstation
      introduces too much weirdness.
    
    Tested-by: Ben McGinnes <ben at adversary.org>
    Signed-off-by: Ben McGinnes <ben at adversary.org>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5f161a9..db8a1a2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -53,7 +53,7 @@ defs.inc: defsincdate Makefile mkdefsinc
 	    $(info_TEXINFOS) $(gpgme_TEXINFOS) >$@
 
 
-online: gpgme.html gpgme.pdf gpgme-python-howto.html gpgme-python-howto.pdf
+online: gpgme.html gpgme.pdf
 	set -e; \
 	echo "Uploading current manuals to www.gnupg.org ..."; \
         user=werner ; \
diff --git a/lang/python/MANIFEST.in b/lang/python/MANIFEST.in
index bd7462a..f4def41 100644
--- a/lang/python/MANIFEST.in
+++ b/lang/python/MANIFEST.in
@@ -1,7 +1,8 @@
-recursive-include docs *.org *.texi *.info *.rst
-recursive-include docs src *.org
-recursive-include docs rst *.rst
-recursive-include docs texinfo *.texi *.infok
+recursive-include doc *.org
+recursive-include doc *.rst
+recursive-include doc *.tex
+recursive-include doc *.texi
+recursive-include doc *.info
 recursive-include examples *.py *.pyx
 include README README.org
 include gpgme.i
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 8645305..6df17ce 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -22,12 +22,9 @@ EXTRA_DIST = \
 	gpgme.i \
 	helpers.c helpers.h private.h \
 	examples \
-	docs \
+	doc \
 	src
 
-dist-hook:
-        cp -pr "$(srcdir)/docs" "$(DESTDIR)/docs"
-
 SUBDIRS = . tests
 
 .PHONY: prepare
diff --git a/lang/python/docs/README b/lang/python/doc/README
similarity index 100%
rename from lang/python/docs/README
rename to lang/python/doc/README
diff --git a/lang/python/docs/meta/TODO.org b/lang/python/doc/meta/TODO.org
similarity index 100%
rename from lang/python/docs/meta/TODO.org
rename to lang/python/doc/meta/TODO.org
diff --git a/lang/python/docs/meta/old-commits.log b/lang/python/doc/meta/old-commits.log
similarity index 100%
rename from lang/python/docs/meta/old-commits.log
rename to lang/python/doc/meta/old-commits.log
diff --git a/lang/python/docs/rst/gpgme-python-howto.rst b/lang/python/doc/rst/gpgme-python-howto.rst
similarity index 100%
rename from lang/python/docs/rst/gpgme-python-howto.rst
rename to lang/python/doc/rst/gpgme-python-howto.rst
diff --git a/lang/python/docs/rst/short-history.rst b/lang/python/doc/rst/short-history.rst
similarity index 100%
rename from lang/python/docs/rst/short-history.rst
rename to lang/python/doc/rst/short-history.rst
diff --git a/lang/python/docs/src/gpgme-python-howto.org b/lang/python/doc/src/gpgme-python-howto.org
similarity index 100%
rename from lang/python/docs/src/gpgme-python-howto.org
rename to lang/python/doc/src/gpgme-python-howto.org
diff --git a/lang/python/docs/src/short-history.org b/lang/python/doc/src/short-history.org
similarity index 100%
rename from lang/python/docs/src/short-history.org
rename to lang/python/doc/src/short-history.org
diff --git a/lang/python/docs/texinfo/gpgme-python-howto.texi b/lang/python/doc/texinfo/gpgme-python-howto.texi
similarity index 100%
rename from lang/python/docs/texinfo/gpgme-python-howto.texi
rename to lang/python/doc/texinfo/gpgme-python-howto.texi
diff --git a/lang/python/docs/texinfo/short-history.texi b/lang/python/doc/texinfo/short-history.texi
similarity index 100%
rename from lang/python/docs/texinfo/short-history.texi
rename to lang/python/doc/texinfo/short-history.texi
diff --git a/lang/python/docs/texinfo/texinfo.tex b/lang/python/doc/texinfo/texinfo.tex
similarity index 100%
rename from lang/python/docs/texinfo/texinfo.tex
rename to lang/python/doc/texinfo/texinfo.tex

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.am                                           | 2 +-
 lang/python/MANIFEST.in                                   | 9 +++++----
 lang/python/Makefile.am                                   | 5 +----
 lang/python/{docs => doc}/README                          | 0
 lang/python/{docs => doc}/meta/TODO.org                   | 0
 lang/python/{docs => doc}/meta/old-commits.log            | 0
 lang/python/{docs => doc}/rst/gpgme-python-howto.rst      | 0
 lang/python/{docs => doc}/rst/short-history.rst           | 0
 lang/python/{docs => doc}/src/gpgme-python-howto.org      | 0
 lang/python/{docs => doc}/src/short-history.org           | 0
 lang/python/{docs => doc}/texinfo/gpgme-python-howto.texi | 0
 lang/python/{docs => doc}/texinfo/short-history.texi      | 0
 lang/python/{docs => doc}/texinfo/texinfo.tex             | 0
 13 files changed, 7 insertions(+), 9 deletions(-)
 rename lang/python/{docs => doc}/README (100%)
 rename lang/python/{docs => doc}/meta/TODO.org (100%)
 rename lang/python/{docs => doc}/meta/old-commits.log (100%)
 rename lang/python/{docs => doc}/rst/gpgme-python-howto.rst (100%)
 rename lang/python/{docs => doc}/rst/short-history.rst (100%)
 rename lang/python/{docs => doc}/src/gpgme-python-howto.org (100%)
 rename lang/python/{docs => doc}/src/short-history.org (100%)
 rename lang/python/{docs => doc}/texinfo/gpgme-python-howto.texi (100%)
 rename lang/python/{docs => doc}/texinfo/short-history.texi (100%)
 rename lang/python/{docs => doc}/texinfo/texinfo.tex (100%)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org