Add files from parent branch HEAD:
[pkgsrc.git] / misc / calibre / patches / patch-aa
1 $NetBSD$
2
3 --- src/calibre/linux.py.orig   2009-01-06 00:25:49.000000000 +0100
4 +++ src/calibre/linux.py
5 @@ -397,10 +397,9 @@ def option_parser():
6      return parser
7  
8  def install_man_pages(fatal_errors):
9 -    from bz2 import compress
10      import subprocess
11      print 'Installing MAN pages...'
12      manpath = '/usr/share/man/man1'
13      f = NamedTemporaryFile()
14      f.write('[see also]\nhttp://%s.kovidgoyal.net\n'%__appname__)
15      f.flush()
16 @@ -417,7 +416,7 @@ def install_man_pages(fatal_errors):
17          help2man = ('help2man', prog, '--name', 'part of %s'%__appname__,
18                      '--section', '1', '--no-info', '--include',
19                      f.name, '--manual', __appname__)
20 -        manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
21 +        manfile = os.path.join(manpath, prog+'.1')
22          print '\tInstalling MAN page for', prog
23          try:
24              p = subprocess.Popen(help2man, stdout=subprocess.PIPE)
25 @@ -434,7 +433,7 @@ def install_man_pages(fatal_errors):
26              continue
27          f2 = open_file(manfile)
28          manifest.append(f2.name)
29 -        f2.write(compress(raw))
30 +        f2.write(raw)
31      return manifest
32  
33  def post_install():
34 @@ -448,8 +447,6 @@ def post_install():
35      global use_destdir
36      use_destdir = opts.destdir
37      manifest = []
38 -    manifest += setup_udev_rules(opts.group_file, not opts.dont_reload, opts.fatal_errors)
39 -    manifest += setup_completion(opts.fatal_errors)
40      setup_desktop_integration(opts.fatal_errors)
41      manifest += install_man_pages(opts.fatal_errors)
42