Merge branch '1.5'
This commit is contained in:
commit
cb97e5e951
5 files changed
+4356
-1
No files matched your search
Submodule
+1
Submodule docu/DokuWiki-to-Markdown-Converter added at 31fa3ea64e.
+2764
File diff suppressed because it is too large.
Load diff
+1590
File diff suppressed because it is too large.
Load diff
Regular → Executable
File mode changed.
@@ -33,7 +33,7 @@ data_files.append((destDir, files))
|
||||
files = glob.glob('tools/*')
|
||||
data_files.append(('/usr/share/fenrir/tools', files))
|
||||
data_files.append(('/usr/lib/systemd/system', ['autostart/systemd/fenrir.service']))
|
||||
|
||||
data_files.append(('/usr/share/man/man1', ['docu/fenrir.1']))
|
||||
|
||||
def read(fname):
|
||||
return open(os.path.join(os.path.dirname(__file__), fname)).read()
|
||||
|
||||
Reference in new issue
Block a user