Rev 5218: Add copyrights in placeholder __init__.py files and fix the fallout from bzrlib/doc_generate/conf.py rename. in file:///home/vila/src/bzr/bugs/219334-texinfo/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/219334-texinfo/

------------------------------------------------------------
revno: 5218
revision-id: v.ladeuil+lp at free.fr-20100705160133-mm65deh355k9n89f
parent: v.ladeuil+lp at free.fr-20100705155019-fykb7mup612c7v2b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: texinfo
timestamp: Mon 2010-07-05 18:01:33 +0200
message:
  Add copyrights in placeholder __init__.py files and fix the fallout from bzrlib/doc_generate/conf.py rename.
-------------- next part --------------
=== modified file 'bzrlib/doc_generate/builders/__init__.py'
--- a/bzrlib/doc_generate/builders/__init__.py	2010-04-29 15:41:20 +0000
+++ b/bzrlib/doc_generate/builders/__init__.py	2010-07-05 16:01:33 +0000
@@ -1,1 +1,18 @@
+# Copyright (C) 2010 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Placeholder to allow sphinx builders imports."""
 

=== modified file 'bzrlib/doc_generate/writers/__init__.py'
--- a/bzrlib/doc_generate/writers/__init__.py	2010-04-29 15:41:20 +0000
+++ b/bzrlib/doc_generate/writers/__init__.py	2010-07-05 16:01:33 +0000
@@ -1,1 +1,18 @@
+# Copyright (C) 2010 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Placeholder to allow sphinx writer imports."""
 

=== modified file 'bzrlib/tests/test_source.py'
--- a/bzrlib/tests/test_source.py	2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/test_source.py	2010-07-05 16:01:33 +0000
@@ -40,11 +40,17 @@
 
 # Files which are listed here will be skipped when testing for Copyright (or
 # GPL) statements.
-COPYRIGHT_EXCEPTIONS = ['bzrlib/lsprof.py', 'bzrlib/_bencode_py.py',
-    'bzrlib/doc_generate/sphinx_conf.py']
+COPYRIGHT_EXCEPTIONS = [
+    'bzrlib/_bencode_py.py',
+    'bzrlib/doc_generate/conf.py',
+    'bzrlib/lsprof.py',
+    ]
 
-LICENSE_EXCEPTIONS = ['bzrlib/lsprof.py', 'bzrlib/_bencode_py.py',
-    'bzrlib/doc_generate/sphinx_conf.py']
+LICENSE_EXCEPTIONS = [
+    'bzrlib/_bencode_py.py',
+    'bzrlib/doc_generate/conf.py',
+    'bzrlib/lsprof.py',
+    ]
 # Technically, 'bzrlib/lsprof.py' should be 'bzrlib/util/lsprof.py',
 # (we do not check bzrlib/util/, since that is code bundled from elsewhere)
 # but for compatibility with previous releases, we don't want to move it.