| 1 |
xarthisius 11/09/03 19:51:44 |
| 2 |
|
| 3 |
Added: identicurse-config_json_path.patch |
| 4 |
identicurse-gzipped_readme.patch |
| 5 |
Log: |
| 6 |
Initial import wrt bug #381695. Ebuild written by me. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/identicurse/files/identicurse-config_json_path.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/identicurse/files/identicurse-config_json_path.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/identicurse/files/identicurse-config_json_path.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: identicurse-config_json_path.patch |
| 17 |
=================================================================== |
| 18 |
Description: IdentiCurse checks for config.json in |
| 19 |
/usr/lib/python*/*-packages/identicurse/, change this behaviour to make it |
| 20 |
check it in /usr/share/identicurse/. |
| 21 |
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621895 |
| 22 |
Author: Alessio Treglia <alessio@××××××.org> |
| 23 |
Modified: Kacper Kowalik <xarthisius@g.o> |
| 24 |
|
| 25 |
--- a/src/identicurse/identicurse.py |
| 26 |
+++ b/src/identicurse/identicurse.py |
| 27 |
@@ -133,8 +133,8 @@ class IdentiCurse(object): |
| 28 |
else: |
| 29 |
import getpass, time |
| 30 |
# no config yet, so let's build one |
| 31 |
- print os.path.join(self.path, "config.json") |
| 32 |
- config.config.load(os.path.join(self.path, "config.json")) |
| 33 |
+ print os.path.join("/", "usr", "share", "identicurse", "config.json") |
| 34 |
+ config.config.load(os.path.join("/", "usr", "share", "identicurse", "config.json")) |
| 35 |
print "No config was found, so we will now run through a few quick questions to set up a basic config for you (which will be saved as %s so you can manually edit it later). If the default (where defaults are available, they're stated in []) is already fine for any question, just press Enter without typing anything, and the default will be used." % (config.config.filename) |
| 36 |
print "This version of IdentiCurse supports OAuth login. Using OAuth to log in means that you do not need to enter your username and password." |
| 37 |
use_oauth = raw_input("Use OAuth [Y/n]? ").upper() |
| 38 |
--- a/setup.py |
| 39 |
+++ b/setup.py |
| 40 |
@@ -36,7 +36,7 @@ |
| 41 |
|
| 42 |
license="GPLv3+", |
| 43 |
|
| 44 |
- data_files=[('identicurse',['README', 'conf/config.json'])], |
| 45 |
+ data_files=[('share/identicurse',['README','conf/config.json'])], |
| 46 |
packages=find_packages('src'), |
| 47 |
package_dir={'': 'src'}, |
| 48 |
include_package_data=True, |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.1 net-misc/identicurse/files/identicurse-gzipped_readme.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/identicurse/files/identicurse-gzipped_readme.patch?rev=1.1&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/identicurse/files/identicurse-gzipped_readme.patch?rev=1.1&content-type=text/plain |
| 56 |
|
| 57 |
Index: identicurse-gzipped_readme.patch |
| 58 |
=================================================================== |
| 59 |
Description: Point the online help to /usr/share/identicurse/README. |
| 60 |
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612976 |
| 61 |
Author: Alessio Treglia <alessio@××××××.org> |
| 62 |
|
| 63 |
--- a/src/identicurse/tabbage.py |
| 64 |
+++ b/src/identicurse/tabbage.py |
| 65 |
@@ -225,6 +225,8 @@ class Help(Tab): |
| 66 |
def __init__(self, window, identicurse_path): |
| 67 |
self.name = "Help" |
| 68 |
self.path = os.path.join(identicurse_path, "README") |
| 69 |
+ if not os.path.isfile(self.path): |
| 70 |
+ self.path = '/usr/share/identicurse/README' |
| 71 |
Tab.__init__(self, window) |
| 72 |
|
| 73 |
def update(self): |
Archives