Install icons to standard locations for linux desktop

Also reorganize icons in subdirectories indicating size.

See the Icon Theme Specification:
https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#install_icons

android/mkp4a.debug

@@ -27,6 +27,6 @@ python3 -m pythonforandroid.toolchain apk \
   --version ${version} \
   --orientation sensor \
   --color=always \
-  --icon ${tmpdir}/data/images/misc/pysol01.png \
-  --presplash ${tmpdir}/data/images/misc/pysol06.png \
+  --icon ${tmpdir}/data/images/icons/48x48/pysol.png \
+  --presplash ${tmpdir}/data/images/icons/1024x1024/pysol.png \
   --copy-libs

android/mkp4a.release

@@ -52,8 +52,8 @@ python3 -m pythonforandroid.toolchain apk \
   --version ${version} \
   --orientation sensor \
   --color=always \
-  --icon ${tmpdir}/data/images/misc/pysol01.png \
-  --presplash ${tmpdir}/data/images/misc/pysol06.png \
+  --icon ${tmpdir}/data/images/icons/48x48/pysol.png \
+  --presplash ${tmpdir}/data/images/icons/1024x1024/pysol.png \
   --copy-libs
 
 # keystore options (instead environment vars):

android/mkp4a.unsigned

@@ -39,8 +39,8 @@ python3 -m pythonforandroid.toolchain apk \
   --version ${version} \
   --orientation sensor \
   --color=always \
-  --icon ${tmpdir}/data/images/misc/pysol01.png \
-  --presplash ${tmpdir}/data/images/misc/pysol06.png \
+  --icon ${tmpdir}/data/images/icons/48x48/pysol.png \
+  --presplash ${tmpdir}/data/images/icons/1024x1024/pysol.png \
   --copy-libs
 
 # python3 -m pythonforandroid.toolchain apk

data/pysol.desktop

@@ -7,4 +7,4 @@ Terminal=false
 Type=Application
 Categories=Game;CardGame;
 Keywords=solitaire;patience;cards;pysolfc;klondike;
-Icon=/usr/share/icons/pysol01.png
+Icon=pysol

pysollib/kivy/LApp.py

@@ -1168,7 +1168,7 @@ class LMenu(ActionView, LBase):
         class MyActionPrev(ActionPrevious, LBase):
             pass
 
-        kw['app_icon'] = 'data/images/misc/pysol01.png'
+        kw['app_icon'] = 'data/images/icons/48x48/pysol.png'
         kw['with_previous'] = prev
         kw['size_hint'] = (.01, 1)
         self.ap = MyActionPrev(**kw)

setup.py

@@ -45,9 +45,9 @@ for d in ddirs:
 
 if os.name == 'posix':
     data_files.append(('share/pixmaps', ['data/pysol.xbm', 'data/pysol.xpm']))
-    data_files.append(('share/icons',
-                       ['data/images/misc/pysol01.png',
-                        'data/images/misc/pysol02.png', ]))
+    for size in os.listdir('data/images/icons'):
+        data_files.append(('share/icons/hicolor/%s/apps' % size,
+                           ['data/images/icons/%s/pysol.png' % size]))
     for mofile in glob('locale/*/*/*.mo'):
         data_files.append(('share/' + os.path.dirname(mofile), [mofile]))
     data_files.append((data_dir, ['data/pysolfc.glade']))