Merge branch 'sunweaver-pr/data-dir-improvements'

Attributes GH PR #2: https://github.com/AyatanaIndicators/ayatana-settings/pull/2

9 files changed, 43 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..5275162
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,28 @@
+2020-11-07 16:12:56 +0100 Mike Gabriel
+
+	* release 20.10.14 (HEAD -> master, tag: 20.10.14)
+
+2020-11-07 16:11:50 +0100 Mike Gabriel (4609dd9)
+
+	* debian/control: Be happy with Python 3.6 (instead of 3.8).
+
+2020-11-07 15:49:33 +0100 Mike Gabriel (83be359)
+
+	* debian/source/format: Upstream DEBs need to be format 1.0.
+
+2020-10-30 03:23:49 +0100 Robert Tari (662c230)
+
+	* Fix debian files
+
+2020-10-29 13:23:56 +0100 Robert Tari (1582244)
+
+	* Update translation file
+
+2020-10-29 13:16:47 +0100 Robert Tari (c3f9ce6)
+
+	* Update README.md
+
+2020-10-29 12:41:30 +0100 Robert Tari (b8b2360)
+
+	* Initial commit
+
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.in
index f416c39..f416c39 100644
--- a/data/usr/share/applications/ayatana-settings.desktop
+++ b/data/applications/ayatana-settings.desktop.in
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/debian/control b/debian/control
index c5a23c3..ad22b77 100755
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: ayatana-settings
 Section: admin
 Priority: optional
 Maintainer: Robert Tari <robert@tari.in>
-Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.8), python3-setuptools, python3-polib
+Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.6), python3-setuptools, python3-polib
 Standards-Version: 4.5.0
 Homepage: https://github.com/AyatanaIndicators/ayatana-settings
 Vcs-Git: https://github.com/AyatanaIndicators/ayatana-settings
 Vcs-Browser: https://github.com/AyatanaIndicators/ayatana-settings
-X-Python3-Version: >= 3.8
+X-Python3-Version: >= 3.6
 
 Package: ayatana-settings
 Architecture: all
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..9f8e9b6 100755
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+1.0
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 0955d06..ca1d8a3 100755
--- a/setup.py
+++ b/setup.py
@@ -7,10 +7,10 @@ import os, polib, configparser
 
 m_lstDataFiles = []
 
-oFile = open('data/usr/share/applications/{}.desktop'.format(APPNAME), 'r+')
+iFile = open('data/applications/{}.desktop.in'.format(APPNAME), 'r')
 oConfigParser = configparser.ConfigParser()
 oConfigParser.optionxform = str
-oConfigParser.read_file(oFile)
+oConfigParser.read_file(iFile)
 
 for strRoot, lstDirnames, lstFilenames in os.walk('po'):
 
@@ -34,7 +34,7 @@ for sSection in oConfigParser.sections():
 
     oConfigParser[sSection] = dict(sorted(oConfigParser[sSection].items(), key=lambda lParams: lParams[0]))
 
-oFile.seek(0)
+oFile = open('data/applications/{}.desktop'.format(APPNAME), 'w')
 oConfigParser.write(oFile, False)
 oFile.truncate
 
@@ -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):
 
@@ -62,8 +62,14 @@ for strRoot, lstDirnames, lstFilenames in os.walk('data'):
 
             continue
 
+        elif strFilename == 'ayatana-settings.desktop.in':
+
+            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,
@@ -89,5 +95,6 @@ setup(
     keywords = APPKEYWORDS,
     packages = [APPNAME.replace('-', '')],
     data_files = m_lstDataFiles,
+    install_requires = [ 'setuptools', ],
     platforms = 'UNIX'
     )