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

Ilya Portnov · Ilya Portnov · commit 9bc050263603 · 2015-06-23T22:14:19.000+05:00
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/palette-editor.desktop b/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
+

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-include LICENSE INSTALL CHANGES.txt`
	`1`	`+include LICENSE INSTALL CHANGES.txt *.desktop`
`2`	`2`	`recursive-include share/icons *.png`
`3`	`3`	`recursive-include share/palettes .xml .gpl *.css`
`4`	`4`	`recursive-include share/templates *.svg`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ def locate_locales():`
`34`	`34`	`('share/palette-editor/icons', glob('share/icons/*.png')),`
`35`	`35`	`('share/palette-editor/palettes', glob('share/palettes/*')),`
`36`	`36`	`('share/palette-editor/templates', glob('share/templates/*.svg')),`
	`37`	`+ ('share/applications', ['palette-editor.desktop']),`
`37`	`38`	`] + locate_locales()`
`38`	`39`	`)`
`39`	`40`