diff --git a/MANIFEST.in b/MANIFEST.in index 91594aa853..3be239ea0f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,7 +10,6 @@ include setup-bundle.sh include tryton.desktop include *.nsh include doc/* -include share/pixmaps/tryton-icon.png include share/pixmaps/tryton/LICENSE include share/pixmaps/tryton/*.png include share/pixmaps/tryton/*.svg diff --git a/setup.py b/setup.py index c001655879..82cc2b8f02 100644 --- a/setup.py +++ b/setup.py @@ -89,7 +89,6 @@ dist = setup(name=PACKAGE, VERSION.rsplit('.', 1)[0] + '/', packages=find_packages(), data_files=[ - ('share/pixmaps', glob.glob('share/pixmaps/tryton-icon.png')), ('share/pixmaps/tryton', glob.glob('share/pixmaps/tryton/*.png') + \ glob.glob('share/pixmaps/tryton/*.svg')), ('share/locale/cs_CZ/LC_MESSAGES', glob.glob('share/locale/cs_CZ/LC_MESSAGES/*.mo')), diff --git a/share/pixmaps/tryton-icon.png b/share/pixmaps/tryton/tryton-icon.png similarity index 100% rename from share/pixmaps/tryton-icon.png rename to share/pixmaps/tryton/tryton-icon.png diff --git a/tryton/config.py b/tryton/config.py index 137fcf518e..273b942feb 100644 --- a/tryton/config.py +++ b/tryton/config.py @@ -192,7 +192,7 @@ if not os.path.isdir(PIXMAPS_DIR): PIXMAPS_DIR = os.path.join(PREFIX, 'share', 'pixmaps', 'tryton') TRYTON_ICON = gtk.gdk.pixbuf_new_from_file( - os.path.join(PIXMAPS_DIR, '..', 'tryton-icon.png')) + os.path.join(PIXMAPS_DIR, 'tryton-icon.png')) def _data_dir(): data_dir = os.path.join(CURRENT_DIR, 'share', 'tryton')