This reverts commit 350ecfecca136f50877898774c6b40014b5c2b1c. It broke
distcheck.
---
.gitignore | 1 -
Makefile.am | 12 +-----------
doc/index.rst | 1 -
3 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index 59f9ffd..e002438 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@
/doc/api
/doc/build
/doc/html
-/doc/news.rst
/doc/*.in
/doc/*.png
diff --git a/Makefile.am b/Makefile.am
index ed34957..9e67492 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,6 @@ CLEANFILES = \
autotools/replace_vars.sed \
daemons/ganeti-cleaner \
devel/upload \
- doc/news.rst \
doc/examples/bash_completion \
doc/examples/ganeti.initd \
doc/examples/ganeti.cron \
@@ -74,7 +73,6 @@ CLEANFILES = \
BUILT_SOURCES = \
ganeti \
srclinks \
- doc/news.rst \
lib/_autoconf.py
nodist_pkgpython_PYTHON = \
@@ -150,7 +148,7 @@ docrst = \
doc/rapi.rst \
doc/security.rst
-doc/html: $(docrst) doc/news.rst $(docpng) doc/conf.py configure.ac
+doc/html: $(docrst) $(docpng) doc/conf.py configure.ac
@test -n "$(SPHINX)" || \
{ echo 'sphinx-build' not found during configure; exit 1; }
mkdir -p doc/build/doctrees
@@ -317,14 +315,6 @@ daemons/ganeti-cleaner: daemons/ganeti-cleaner.in
stamp-directories \
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
-doc/news.rst: NEWS
- set -e; \
- { echo '.. This file is automatically updated at build time from $<.'; \
- echo '.. Do not edit.'; \
- echo; \
- cat $<; \
- } > $@
-
doc/examples/%: doc/examples/%.in stamp-directories \
$(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
diff --git a/doc/index.rst b/doc/index.rst
index 8fb7a4b..feeb8cf 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -19,7 +19,6 @@ Contents:
iallocator.rst
rapi.rst
devnotes.rst
- news.rst
glossary.rst
Also see the :ref:`search`.
--
1.6.4.3