Merge launchpad:master into launchpad:db-devel

[Colin Watson]

Manually merge from master to fix building on git

[Colin Watson (cjwatson)]

review: Approve

[Otto Co-Pilot (otto-copilot)]

There was nothing to merge
https://jenkins.ols.canonical.com/online-services/job/launchpad/5/

diff --git a/doc/_static/.gitignore b/doc/_static/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doc/_static/.gitignore
diff --git a/doc/_templates/.gitignore b/doc/_templates/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doc/_templates/.gitignore
diff --git a/lib/lp/answers/configure.zcml b/lib/lp/answers/configure.zcml
index dd3d075..9735be8 100644
--- a/lib/lp/answers/configure.zcml
+++ b/lib/lp/answers/configure.zcml
@@ -269,7 +269,5 @@
     <allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
   </class>
 
-  <lp:help-folder folder="help" name="+help-answers"/>
-
   <webservice:register module="lp.answers.interfaces.webservice" />
 </configure>
diff --git a/lib/lp/app/tests/test_help.py b/lib/lp/app/tests/test_help.py
index fb44bf6..e4ef38a 100644
--- a/lib/lp/app/tests/test_help.py
+++ b/lib/lp/app/tests/test_help.py
@@ -35,10 +35,6 @@ class TestHelpSystemSetup(unittest.TestCase):
             "Expected help folder %s, got %s" % (
                 expected_folder_path, view.folder))
 
-    def test_answers_help_folder(self):
-        self.assertHasHelpFolderView(
-            '+help-answers', os.path.join(ROOT, 'lib/lp/answers/help'))
-
     def test_blueprints_help_folder(self):
         self.assertHasHelpFolderView(
             '+help-blueprints', os.path.join(ROOT, 'lib/lp/blueprints/help'))
diff --git a/lib/lp/services/mail/tests/test_stub.py b/lib/lp/services/mail/tests/test_stub.py
index f91edad..095af90 100644
--- a/lib/lp/services/mail/tests/test_stub.py
+++ b/lib/lp/services/mail/tests/test_stub.py
@@ -101,16 +101,19 @@ def test_simple_sendmail():
 
     The message has a number of additional headers added by default.
     'X-Generated-By' not only indicates that the source is Launchpad, but
-    shows the bzr revision and instance name.
-
-    >>> message['X-Generated-By'].replace('\n\t', '\n ')
-    'Launchpad (canonical.com); Revision="1999";\n Instance="launchpad-lazr.conf"'
+    shows the git revision and instance name.
 
+    >>> message.get_params(header='X-Generated-By')
+    ... # doctest: +NORMALIZE_WHITESPACE
+    [('Launchpad (canonical.com)', ''),
+     ('revision', '0000000000000000000000000000000000000000'),
+     ('instance', 'launchpad-lazr.conf')]
     """
 
 
 def test_suite():
     suite = DocTestSuite(checker=RENormalizing([
-        (re.compile(r'Revision="\d+"'), 'Revision="1999"')]))
+        (re.compile(r"'revision', '[0-9a-f]+'"),
+         "'revision', '%s'" % ('0' * 40))]))
     suite.layer = LaunchpadFunctionalLayer
     return suite
diff --git a/scripts/update-version-info.sh b/scripts/update-version-info.sh
index d888e6a..3b56737 100755
--- a/scripts/update-version-info.sh
+++ b/scripts/update-version-info.sh
@@ -17,6 +17,7 @@ if [ -d .git ]; then
 
     branch_nick="$(git rev-parse --abbrev-ref HEAD | sed "s/'/\\\\'/g")"
     revision_id="$(git rev-parse HEAD)"
+    date="$(git show -s --format=%ci HEAD)"
     cat > $newfile <<EOF
 #! /usr/bin/env python
 
@@ -24,6 +25,7 @@ from __future__ import print_function
 
 version_info = {
     'branch_nick': u'$branch_nick',
+    'date': u'$date',
     'revision_id': u'$revision_id',
     }