]> git.pld-linux.org Git - packages/calibre.git/commitdiff
- fix manpages filenames (patch taken from fc)
authorlisu <lisu@pld-linux.org>
Thu, 20 May 2010 17:53:11 +0000 (17:53 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    calibre-manpages.patch -> 1.1

calibre-manpages.patch [new file with mode: 0644]

diff --git a/calibre-manpages.patch b/calibre-manpages.patch
new file mode 100644 (file)
index 0000000..8cf30e7
--- /dev/null
@@ -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'))
This page took 0.107712 seconds and 4 git commands to generate.