Gentoo Archives: gentoo-commits

From: "Tiziano Mueller (dev-zero)" <dev-zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-misc/nx_util/files: 0.52.1-fix-install-paths.patch
Date: Fri, 27 Sep 2013 13:42:32
Message-Id: 20130927134225.78DE620034@flycatcher.gentoo.org
1 dev-zero 13/09/27 13:42:25
2
3 Added: 0.52.1-fix-install-paths.patch
4 Log:
5 Version bump
6
7 (Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0x1E0CA85F!)
8
9 Revision Changes Path
10 1.1 www-misc/nx_util/files/0.52.1-fix-install-paths.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/nx_util/files/0.52.1-fix-install-paths.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/nx_util/files/0.52.1-fix-install-paths.patch?rev=1.1&content-type=text/plain
14
15 Index: 0.52.1-fix-install-paths.patch
16 ===================================================================
17 diff --git a/nx_util/nx_util.conf b/nx_util/nx_util.conf
18 index cd2a591..818daaf 100644
19 --- a/nx_util/nx_util.conf
20 +++ b/nx_util/nx_util.conf
21 @@ -1,4 +1,4 @@
22 [nx_util]
23 -data_dir=/usr/local/nx_datas
24 +data_dir=/usr/share/nx_datas
25 database_dir=
26 naxsi_core_rules=/etc/nginx/naxsi_core.rules
27 diff --git a/nx_util/nx_util.py b/nx_util/nx_util.py
28 old mode 100644
29 new mode 100755
30 index 0509b51..38be37e
31 --- a/nx_util/nx_util.py
32 +++ b/nx_util/nx_util.py
33 @@ -62,8 +62,8 @@ if __name__ == "__main__":
34
35 # Configuration
36 parser.add_option("-c", "--config", dest="conf_path",
37 - help="Path to configuration (defaults to /usr/local/etc/nx_util.conf)",
38 - type="string", default="/usr/local/etc/nx_util.conf")
39 + help="Path to configuration (defaults to /etc/nx_util.conf)",
40 + type="string", default="/etc/nx_util.conf")
41
42 # Filtering options should go here :)
43 parser.add_option("-f", "--filters", dest="usr_filter",
44 diff --git a/nx_util/setup.py b/nx_util/setup.py
45 index cc48a5c..b855459 100644
46 --- a/nx_util/setup.py
47 +++ b/nx_util/setup.py
48 @@ -8,14 +8,14 @@ setup(name='nx_util',
49 author='Naxsi Dev Team',
50 author_email='thibault.koechlin@××××××××××.com',
51 url='naxsi.googlecode.com',
52 - scripts=['nx_util.py'],
53 + scripts=['nx_util'],
54 packages=['nx_lib'],
55 - data_files=[('nx_datas', ['nx_datas/bootstrap.min.css',
56 + data_files=[('/usr/share/nx_datas', ['nx_datas/bootstrap.min.css',
57 'nx_datas/bootstrap-responsive.min.css',
58 'nx_datas/highcharts.js',
59 'nx_datas/map.tpl',
60 'nx_datas/bootstrap.min.js',
61 'nx_datas/country2coords.txt']),
62 ('/usr/share/man/man1', ['nx_util.1.gz']),
63 - ('/usr/local/etc/', ['nx_util.conf'])]
64 + ('/etc/', ['nx_util.conf'])]
65 )