File curlew-0.2.1_path.patch of Package curlew

File curlew-0.2.1_path.patch of Package curlew (Revision 2)

Currently displaying revision 2 , Show latest

diff -U 3 -dHrN curlew-0.2.1.orig/curlew curlew-0.2.1/curlew
--- curlew-0.2.1.orig/curlew	2016-01-23 15:08:20.000000000 +0300
+++ curlew-0.2.1/curlew	2016-02-28 02:10:29.409365970 +0300
@@ -1,9 +1,5 @@
 #!/usr/bin/env python3
 
-from site import addsitedir
-addsitedir('/usr/share/curlew')
-addsitedir('/usr/local/share/curlew')
-
 import sys
-from modules.curlew import main
+from curlew.curlew import main
 main(*sys.argv[1:])
diff -U 3 -dHrN curlew-0.2.1.orig/modules/codecs.py curlew-0.2.1/modules/codecs.py
--- curlew-0.2.1.orig/modules/codecs.py	2016-02-27 10:27:05.000000000 +0300
+++ curlew-0.2.1/modules/codecs.py	2016-02-28 02:19:50.890717533 +0300
@@ -21,7 +21,7 @@
 gi.require_version('Gtk', '3.0')
 
 from gi.repository import Gtk, Pango
-from modules.functions import get_available_codecs
+from curlew.functions import get_available_codecs
 
 class CodecsDialog(Gtk.Dialog):
     def __init__(self, prnt, encoder, title):
diff -U 3 -dHrN curlew-0.2.1.orig/modules/consts.py curlew-0.2.1/modules/consts.py
--- curlew-0.2.1.orig/modules/consts.py	2016-02-16 00:33:49.000000000 +0300
+++ curlew-0.2.1/modules/consts.py	2016-02-28 02:49:54.000000000 +0300
@@ -26,7 +26,7 @@
 CONF_FILE = join(CONF_PATH, 'curlew.cfg')
 
 PKG_DIR = dirname(realpath(__file__))
-DTA_DIR = join(PKG_DIR, '../')
+DTA_DIR = join(PKG_DIR, '../../../../share/curlew')
 
 ORG_FFILE = join(DTA_DIR, 'formats.cfg')
 USR_FFILE = join(CONF_PATH, 'formats.cfg')
diff -U 3 -dHrN curlew-0.2.1.orig/modules/curlew.py curlew-0.2.1/modules/curlew.py
--- curlew-0.2.1.orig/modules/curlew.py	2016-02-27 10:27:38.000000000 +0300
+++ curlew-0.2.1/modules/curlew.py	2016-02-28 02:50:14.000000000 +0300
@@ -39,21 +39,21 @@
     from gi.repository import Gtk, GLib, Gdk, GObject, GdkPixbuf, Gio
     import dbus.glib, dbus.service
     
-    from modules.customwidgets import LabeledHBox, TimeLayout, HScale, \
+    from curlew.customwidgets import LabeledHBox, TimeLayout, HScale, \
     SpinsFrame, LabeledGrid, ComboWithEntry
-    from modules.about import About
-    from modules.functions import show_message, get_format_size, \
+    from curlew.about import About
+    from curlew.functions import show_message, get_format_size, \
     duration_to_time, time_to_duration, check_codec
-    from modules.logdialog import LogDialog
-    from modules.tray import StatusIcon
-    from modules.languages import LANGUAGES
-    from modules.favdialog import Favorite
-    from modules.waitdialog import WaitDialog
-    from modules.fileinfos import FileInfos
-    from modules.formats import Formats
-    from modules.infobars import InfoBar
-    from modules.codecs import CodecsDialog
-    from modules.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \
+    from curlew.logdialog import LogDialog
+    from curlew.tray import StatusIcon
+    from curlew.languages import LANGUAGES
+    from curlew.favdialog import Favorite
+    from curlew.waitdialog import WaitDialog
+    from curlew.fileinfos import FileInfos
+    from curlew.formats import Formats
+    from curlew.infobars import InfoBar
+    from curlew.codecs import CodecsDialog
+    from curlew.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \
     ORG_FFILE, USR_FFILE
 except Exception as e:
     print(e)
@@ -72,7 +72,7 @@
 
 # Localization.
 DOMAIN = 'curlew'
-LOCALDIR = join(DTA_DIR, 'locale')
+LOCALDIR = join(DTA_DIR, '../locale')
 gettext.install(DOMAIN, LOCALDIR)
 
 # Create ".curlew" folder if not exist
diff -U 3 -dHrN curlew-0.2.1.orig/modules/edition.py curlew-0.2.1/modules/edition.py
--- curlew-0.2.1.orig/modules/edition.py	2016-02-27 10:28:13.000000000 +0300
+++ curlew-0.2.1/modules/edition.py	2016-02-28 02:19:50.886717580 +0300
@@ -24,9 +24,9 @@
 
 from gi.repository import Gtk, GLib
 
-from modules.customwidgets import LabeledGrid, ButtonWithIcon
-from modules.consts import CONF_FILE, ORG_FFILE
-from modules.functions import show_message
+from curlew.customwidgets import LabeledGrid, ButtonWithIcon
+from curlew.consts import CONF_FILE, ORG_FFILE
+from curlew.functions import show_message
 
 
 class FormatEditor(Gtk.Dialog):
diff -U 3 -dHrN curlew-0.2.1.orig/modules/formats.py curlew-0.2.1/modules/formats.py
--- curlew-0.2.1.orig/modules/formats.py	2016-02-27 10:29:02.000000000 +0300
+++ curlew-0.2.1/modules/formats.py	2016-02-28 02:19:50.882717628 +0300
@@ -21,7 +21,7 @@
 gi.require_version('Gtk', '3.0')
 
 from gi.repository import Gtk
-from modules.edition import FormatEditor
+from curlew.edition import FormatEditor
 
 class Formats(Gtk.Popover):
     
diff -U 3 -dHrN curlew-0.2.1.orig/setup.py curlew-0.2.1/setup.py
--- curlew-0.2.1.orig/setup.py	2016-02-27 10:24:30.000000000 +0300
+++ curlew-0.2.1/setup.py	2016-02-28 01:50:54.810509993 +0300
@@ -17,11 +17,7 @@
 doc_files  = ['LICENSE-ar.txt', 'LICENSE-en.txt', 'AUTHORS', 'ChangeLog', 'README']
 data_files = [('share/applications/', ['curlew.desktop']),
               ('share/icons/hicolor/scalable/apps', ['curlew.svg']),
-              ('share/pixmaps', ['curlew.svg']),
-              ('share/doc/curlew', doc_files),
               ('share/curlew', ['formats.cfg']),
-              #('share/curlew', ['formats.cfg', 'ffmpeg']), # Portable version
-              ('share/curlew/modules', glob("modules/*.py"))
               ]
 
 # Prepare curlew icons
@@ -58,7 +54,7 @@
         # Generate mo files
         call("msgfmt {} -o {}".format(po_file, mo_path), shell=True)
     
-    locales = map(lambda i: ('share/curlew/'+i, [i+'/curlew.mo', ]), glob('locale/*/LC_MESSAGES'))
+    locales = map(lambda i: ('share/'+i, [i+'/curlew.mo', ]), glob('locale/*/LC_MESSAGES'))
     data_files.extend(locales)
     
     return 0
@@ -163,5 +159,7 @@
                      'Topic :: Desktop Environment :: Gnome',
                      'Topic :: Multimedia :: Sound/Audio :: Conversion',
                      'Topic :: Utilities'],
-      data_files=data_files
+      data_files=data_files,
+      packages=['curlew'],
+      package_dir={"curlew" : "modules"},
       )