packages: calibre/calibre-manpages.patch (NEW) - fix manpages filenames (pa...
lisu
lisu at pld-linux.org
Thu May 20 19:53:17 CEST 2010
Author: lisu Date: Thu May 20 17:53:17 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fix manpages filenames (patch taken from fc)
---- Files affected:
packages/calibre:
calibre-manpages.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/calibre/calibre-manpages.patch
diff -u /dev/null packages/calibre/calibre-manpages.patch:1.1
--- /dev/null Thu May 20 19:53:17 2010
+++ packages/calibre/calibre-manpages.patch Thu May 20 19:53:11 2010
@@ -0,0 +1,37 @@
+diff -up calibre/src/calibre/linux.py.manpages calibre/src/calibre/linux.py
+--- calibre/src/calibre/linux.py.manpages 2010-04-10 19:34:42.632332811 +0300
++++ calibre/src/calibre/linux.py 2010-04-10 19:34:50.404207554 +0300
+@@ -339,7 +339,7 @@ class PostInstall:
+ continue
+ parser = parser()
+ raw = create_man_page(prog, parser)
+- if isfreebsd:
++ if isfreebsd or islinux:
+ manfile = os.path.join(manpath, prog+'.1')
+ else:
+ manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
+diff -up calibre/src/calibre/utils/help2man.py.manpages calibre/src/calibre/utils/help2man.py
+--- calibre/src/calibre/utils/help2man.py.manpages 2010-04-10 19:30:51.670926847 +0300
++++ calibre/src/calibre/utils/help2man.py 2010-04-10 19:32:27.842332121 +0300
+@@ -4,7 +4,7 @@ __copyright__ = '2009, Kovid Goyal <kovi
+ __docformat__ = 'restructuredtext en'
+
+ import time, bz2
+-from calibre.constants import isfreebsd
++from calibre.constants import isfreebsd, islinux
+
+ from calibre.constants import __version__, __appname__, __author__
+
+@@ -58,9 +58,7 @@ def create_man_page(prog, parser):
+ lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
+ x in lines]
+
+- if not isfreebsd:
+- return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
+- else:
++ if isfreebsd or islinux:
+ return (u'\n'.join(lines)).encode('utf-8')
+-
+-
++ else:
++ return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
================================================================
More information about the pld-cvs-commit
mailing list