Merge branch 'master' of github.com:portnov/color-palette

portnov · Jun 23, 2015 · 9bc0502 · 9bc0502
2 parents a060fa5 + 7651e98
commit 9bc0502
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/palette-editor/MANIFEST.in b/palette-editor/MANIFEST.in
@@ -1,4 +1,4 @@
-include LICENSE INSTALL CHANGES.txt
+include LICENSE INSTALL CHANGES.txt *.desktop
 recursive-include share/icons *.png
 recursive-include share/palettes *.xml *.gpl *.css
 recursive-include share/templates *.svg

diff --git a/palette-editor.desktop → palette-editor/palette-editor.desktop b/palette-editor.desktop → palette-editor/palette-editor.desktop
diff --git a/palette-editor/setup.py b/palette-editor/setup.py
@@ -34,6 +34,7 @@ def locate_locales():
                     ('share/palette-editor/icons', glob('share/icons/*.png')),
                     ('share/palette-editor/palettes', glob('share/palettes/*')),
                     ('share/palette-editor/templates', glob('share/templates/*.svg')),
+                    ('share/applications', ['palette-editor.desktop']),
                 ] + locate_locales()
 )
 
diff --git a/palette-editor/stdeb.cfg b/palette-editor/stdeb.cfg
@@ -1,3 +1,5 @@
 [DEFAULT]
 Depends: python-qt4
 Recommends: pyton-pillow, python-colourlovers, python-tinycss
+MIME-Desktop-File: palette-editor.desktop
+