use correct source file for generating NEWS

buildbot · Sep 22, 2012 · 498375d · 498375d
1 parent d1137e1
commit 498375d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/master/MANIFEST.in b/master/MANIFEST.in
@@ -18,6 +18,7 @@ include docs/manual/_images/icon.blend
 include docs/manual/_images/Makefile
 include docs/bbdocs/*
 include docs/developer/*
+include docs/relnotes/*
 
 include buildbot/scripts/sample.cfg
 include buildbot/scripts/buildbot_tac.tmpl

diff --git a/master/setup.py b/master/setup.py
@@ -67,7 +67,7 @@ def make_release_tree(self, base_dir, files):
 
         # ensure that NEWS has a copy of the latest release notes, with the
         # proper version substituted
-        src_fn = os.path.join('docs', 'release-notes.rst')
+        src_fn = os.path.join('docs', 'relnotes/index.rst')
         src = open(src_fn).read()
         src = src.replace('|version|', version)
         dst_fn = os.path.join(base_dir, 'NEWS')

diff --git a/slave/setup.py b/slave/setup.py
@@ -59,7 +59,7 @@ def make_release_tree(self, base_dir, files):
 
         # ensure that NEWS has a copy of the latest release notes, copied from
         # the master tree, with the proper version substituted
-        src_fn = os.path.join('..', 'master', 'docs', 'release-notes.rst')
+        src_fn = os.path.join('..', 'master', 'docs', 'relnotes/index.rst')
         src = open(src_fn).read()
         src = src.replace('|version|', version)
         dst_fn = os.path.join(base_dir, 'NEWS')