File calibre-no-update-manpage.diff of Package calibre

Overview Repositories Revisions Requests Users Attributes Meta

File calibre-no-update-manpage.diff of Package calibre (Revision ae63bae45c203aed8607792f5538126d)

Currently displaying revision ae63bae45c203aed8607792f5538126d , Show latest

diff -x '*~' -Naur calibre.bak//src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
--- calibre.bak//src/calibre/gui2/ui.py	2010-05-01 01:20:07.000000000 +0200
+++ calibre/src/calibre/gui2/ui.py	2010-05-05 08:59:34.000000000 +0200
@@ -251,11 +251,11 @@
         self.latest_version = ' '
         self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
         self.device_info = ' '
-        if not opts.no_update_check:
-            self.update_checker = CheckForUpdates(self)
-            QObject.connect(self.update_checker,
-                    SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
-            self.update_checker.start(2000)
+        #if not opts.no_update_check:
+        #    self.update_checker = CheckForUpdates(self)
+        #    QObject.connect(self.update_checker,
+        #            SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
+        #    self.update_checker.start(2000)
         ####################### Status Bar #####################
         self.status_bar = StatusBar(self.jobs_dialog, self.system_tray_icon)
         self.setStatusBar(self.status_bar)
diff -x '*~' -Naur calibre.bak//src/calibre/linux.py calibre/src/calibre/linux.py
--- calibre.bak//src/calibre/linux.py	2010-05-01 01:20:06.000000000 +0200
+++ calibre/src/calibre/linux.py	2010-05-05 09:46:20.000000000 +0200
@@ -326,10 +326,11 @@
             if isfreebsd:
                 manpath = os.path.join(self.opts.staging_root, 'man/man1')
             else:
-                manpath = os.path.join(self.opts.staging_sharedir, 'man/man1')
+                self.info('Directory for MAN pages: %s' % self.opts.staging_mandir)
+                manpath = os.path.join(self.opts.staging_mandir, 'man1')
             if not os.path.exists(manpath):
                 os.makedirs(manpath)
-            self.info('Installing MAN pages...')
+            self.info('Installing MAN pages to %s...' % manpath)
             for src in entry_points['console_scripts']:
                 prog, right = src.split('=')
                 prog = prog.strip()
@@ -342,7 +343,7 @@
                 if isfreebsd:
                     manfile = os.path.join(manpath, prog+'.1')
                 else:
-                    manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
+                    manfile = os.path.join(manpath, prog+'.1'+'.gz')
                 self.info('\tInstalling MAN page for', prog)
                 open(manfile, 'wb').write(raw)
                 self.manifest.append(manfile)
diff -x '*~' -Naur calibre.bak//src/calibre/utils/help2man.py calibre/src/calibre/utils/help2man.py
--- calibre.bak//src/calibre/utils/help2man.py	2010-05-01 01:20:07.000000000 +0200
+++ calibre/src/calibre/utils/help2man.py	2010-05-05 09:19:03.000000000 +0200
@@ -3,7 +3,7 @@
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import time, bz2
+import time, gzip, StringIO
 from calibre.constants import isfreebsd
 
 from calibre.constants import __version__, __appname__, __author__
@@ -59,7 +59,14 @@
             x in lines]
 
     if not isfreebsd:
-        return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
+        buf = StringIO.StringIO()
+        f = gzip.GzipFile(mode="wb", fileobj=buf)
+        try:
+          f.write( (u'\n'.join(lines)).encode('utf-8') )
+        finally:
+          f.close()
+        return buf.getvalue()
+        #return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
     else:
         return  (u'\n'.join(lines)).encode('utf-8')

Places

File calibre-no-update-manpage.diff of Package calibre (Revision ae63bae45c203aed8607792f5538126d)

Places