[X2Go-Commits] pyhoca-gui.git - master (branch) updated: 0.4.0.8-40-g09f7d13

X2Go dev team git-admin at x2go.org
Tue Dec 10 22:24:42 CET 2013


The branch, master has been updated
       via  09f7d139ee4364e8b182c344658f87527ce1321c (commit)
      from  45e855e179b8ab1d4e6d037aa4cdca772e412a77 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 09f7d139ee4364e8b182c344658f87527ce1321c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 10 22:24:39 2013 +0100

    When installing icons via setup.py, let's use the copied icons rather than the icon set from icons_symlinked. That assures that really all icons are present. (The icons_symlinked folder is rather Debianic and not appropriate for non-Debian derived distributions).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    4 ++++
 setup.py         |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3e61c65..6fda41d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,10 @@ pyhoca-gui (0.4.0.9-0x2go1) UNRELEASED; urgency=low
       the wxApplication.
     - Slight notification layout change for HOOK_on_control_session_death() method.
     - Update German and English translation.
+    - When installing icons via setup.py, let's use the copied icons rather than
+      the icon set from icons_symlinked. That assures that really all icons are
+      present. (The icons_symlinked folder is rather Debianic and not appropriate
+      for non-Debian derived distributions).
   * debian/copyright:
     + Update file. Add entry for file icon2exe.py.
   * debian/control:
diff --git a/setup.py b/setup.py
index 4cc4b2c..ebb878b 100755
--- a/setup.py
+++ b/setup.py
@@ -261,7 +261,7 @@ elif platform.system() == 'Linux':
         }
     )
 
-    icon_files = datafilelist('{prefix}/share/icons/PyHoca'.format(prefix=sys.prefix), r'icons_symlinked/PyHoca')
+    icon_files = datafilelist('{prefix}/share/icons/PyHoca'.format(prefix=sys.prefix), r'icons/PyHoca')
     img_files = [("{prefix}/share/pyhoca/img".format(prefix=sys.prefix), glob('img/*.*'))]
     desktop_files = [
         ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/*')),


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).




More information about the x2go-commits mailing list