From ae0274ceab80a2cd5284379ba5bd4a74a2a1f02f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 21 Aug 2009 16:30:02 -0600
Subject: [PATCH] IGN:...

---
 installer/windows/freeze.py                 | 6 ------
 src/calibre/gui2/dialogs/metadata_single.py | 2 +-
 src/calibre/manual/qthelp.py                | 2 +-
 upload.py                                   | 7 +++++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/installer/windows/freeze.py b/installer/windows/freeze.py
index a1e752eebf..4dadc8875c 100644
--- a/installer/windows/freeze.py
+++ b/installer/windows/freeze.py
@@ -91,7 +91,6 @@ class BuildEXE(py2exe.build_exe.py2exe):
 
         print
         print 'Adding third party dependencies'
-        print '\tAdding devcon'
         tdir = os.path.join(PY2EXE_DIR, 'driver')
         os.makedirs(tdir)
         for pat in ('*.dll', '*.sys', '*.cat', '*.inf'):
@@ -104,11 +103,6 @@ class BuildEXE(py2exe.build_exe.py2exe):
             'bin\\freetype.dll', 'bin\\jpeg62.dll'):
             shutil.copyfile(os.path.join(POPPLER, x),
                     os.path.join(PY2EXE_DIR, os.path.basename(x)))
-        #shutil.copyfile(PDFTOHTML, os.path.join(PY2EXE_DIR, os.path.basename(PDFTOHTML)))
-        #shutil.copyfile(PDFTOHTML+'.manifest', os.path.join(PY2EXE_DIR,
-        #    os.path.basename(PDFTOHTML)+'.manifest'))
-        #print '\tAdding pdftk'
-        #shutil.copyfile(PDFTK, os.path.join(PY2EXE_DIR, os.path.basename(PDFTK)))
         print '\tAdding podofo'
         for f in glob.glob(os.path.join(PODOFO, '*.dll')):
             shutil.copyfile(f, os.path.join(PY2EXE_DIR, os.path.basename(f)))
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index ab86cc810d..3d7e881492 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@@ -92,7 +92,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
 
     def select_cover(self, checked):
         files = choose_images(self, 'change cover dialog',
-                             u'Choose cover for ' + qstring_to_unicode(self.title.text()))
+                             _('Choose cover for ') + unicode(self.title.text()))
         if not files:
             return
         _file = files[0]
diff --git a/src/calibre/manual/qthelp.py b/src/calibre/manual/qthelp.py
index 165a0b6915..f3e304f155 100644
--- a/src/calibre/manual/qthelp.py
+++ b/src/calibre/manual/qthelp.py
@@ -160,7 +160,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
             sections.extend(self.write_toc(node))
 
         if self.config.html_use_modindex:
-            item = section_template % {'title': _('Global Module Index'),
+            item = section_template % {'title': 'Global Module Index',
                                        'ref': 'modindex.html'}
             sections.append(' '*4*4 + item)
         sections = '\n'.join(sections)
diff --git a/upload.py b/upload.py
index 0bf7deb952..8dac5af79c 100644
--- a/upload.py
+++ b/upload.py
@@ -123,8 +123,8 @@ class manual(OptionlessCommand):
                 os.makedirs(d)
             if not os.path.exists('.build'+os.sep+'html'):
                 os.makedirs('.build'+os.sep+'html')
-            check_call(['sphinx-build', '-b', 'custom', '-d', '-t', 'online',
-                                   '.build/doctrees', '.', '.build/html'])
+            check_call(['sphinx-build', '-b', 'custom', '-t', 'online',
+                                   '-d', '.build/doctrees', '.', '.build/html'])
             check_call(['sphinx-build', '-b', 'epub', '-d',
                                    '.build/doctrees', '.', '.build/epub'])
             j = os.path.join
@@ -706,6 +706,9 @@ class stage3(OptionlessCommand):
                    shell=True)
         check_call('ssh divok bzr update /usr/local/calibre',
                    shell=True)
+        check_call('ssh divok /etc/init.d/apache2 graceful',
+                   shell=True)
+
 
 
     def run(self):