aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-11-09 08:55:58 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-11-09 08:58:16 +0100
commiteefc611960146fbd8ee00253ff9f8efa82917b09 (patch)
tree035490bc630a8d0c1468e785d0c5d3e97f2b5f61
parenta66c41bede54531e0c94675205593320cc8d2066 (diff)
downloadayatana-settings-eefc611960146fbd8ee00253ff9f8efa82917b09.tar.gz
ayatana-settings-eefc611960146fbd8ee00253ff9f8efa82917b09.tar.bz2
ayatana-settings-eefc611960146fbd8ee00253ff9f8efa82917b09.zip
data/: Don't mimick FHS in source tree. Use more commonly used data/ tree structure.
-rwxr-xr-xayatana-settings (renamed from data/usr/bin/ayatana-settings)0
-rw-r--r--data/applications/ayatana-settings.desktop (renamed from data/usr/share/applications/ayatana-settings.desktop)0
-rwxr-xr-xdata/ayatana-settings/ayatana-settings.glade (renamed from data/usr/share/ayatana-settings/ayatana-settings.glade)0
-rwxr-xr-xdata/icons/hicolor/scalable/apps/ayatana-settings.svg (renamed from data/usr/share/icons/hicolor/scalable/apps/ayatana-settings.svg)0
-rw-r--r--data/locale/.gitkeep (renamed from data/usr/share/locale/.gitkeep)0
-rwxr-xr-xsetup.py8
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,