data/: Don't mimick FHS in source tree. Use more commonly used data/ tree structure.

6 files changed, 5 insertions, 3 deletions

diff --git a/data/usr/bin/ayatana-settings b/ayatana-settings
index dde807e..dde807e 100755
--- a/data/usr/bin/ayatana-settings
+++ b/ayatana-settings
diff --git a/data/usr/share/applications/ayatana-settings.desktop b/data/applications/ayatana-settings.desktop
index f416c39..f416c39 100644
--- a/data/usr/share/applications/ayatana-settings.desktop
+++ b/data/applications/ayatana-settings.desktop
diff --git a/data/usr/share/ayatana-settings/ayatana-settings.glade b/data/ayatana-settings/ayatana-settings.glade
index 346dc8d..346dc8d 100755
--- a/data/usr/share/ayatana-settings/ayatana-settings.glade
+++ b/data/ayatana-settings/ayatana-settings.glade
diff --git a/data/usr/share/icons/hicolor/scalable/apps/ayatana-settings.svg b/data/icons/hicolor/scalable/apps/ayatana-settings.svg
index 758cfa5..758cfa5 100755
--- a/data/usr/share/icons/hicolor/scalable/apps/ayatana-settings.svg
+++ b/data/icons/hicolor/scalable/apps/ayatana-settings.svg
diff --git a/data/usr/share/locale/.gitkeep b/data/locale/.gitkeep
index e69de29..e69de29 100644
--- a/data/usr/share/locale/.gitkeep
+++ b/data/locale/.gitkeep
diff --git a/setup.py b/setup.py
index 0955d06..1021212 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ import os, polib, configparser
 
 m_lstDataFiles = []
 
-oFile = open('data/usr/share/applications/{}.desktop'.format(APPNAME), 'r+')
+oFile = open('data/applications/{}.desktop'.format(APPNAME), 'r+')
 oConfigParser = configparser.ConfigParser()
 oConfigParser.optionxform = str
 oConfigParser.read_file(oFile)
@@ -46,7 +46,7 @@ for strRoot, lstDirnames, lstFilenames in os.walk('po'):
 
         if strLocale != APPNAME:
 
-            strLocaleDir = 'data/usr/share/locale/' + strLocale + '/LC_MESSAGES/'
+            strLocaleDir = 'data/locale/' + strLocale + '/LC_MESSAGES/'
 
             if not os.path.isdir(strLocaleDir):
 
@@ -63,7 +63,9 @@ for strRoot, lstDirnames, lstFilenames in os.walk('data'):
             continue
 
         strPath = os.path.join(strRoot, strFilename)
-        m_lstDataFiles.append((os.path.dirname(strPath).lstrip('data'), [strPath]))
+        m_lstDataFiles.append(("share/{data}".format(data=os.path.dirname(strPath).replace('data/', '')), [strPath]))
+
+m_lstDataFiles.append(('bin/', ['ayatana-settings']))
 
 setup(
     name = APPNAME,