davemds pushed a commit to branch master.

http://git.enlightenment.org/apps/espionage.git/commit/?id=f40e43a8aea09c9c13d13e54930878e9648de3a2

commit f40e43a8aea09c9c13d13e54930878e9648de3a2
Author: Dave Andreoli <[email protected]>
Date:   Fri May 13 21:53:58 2016 +0200

    Better FDO support
---
 data/{ => desktop}/espionage.desktop   |   0
 data/icons/128x128/apps/espionage.png  | Bin 0 -> 3787 bytes
 data/icons/256x256/apps/espionage.png  | Bin 0 -> 7973 bytes
 data/icons/256x256/espionage.png       | Bin 105186 -> 0 bytes
 data/icons/48x48/apps/espionage.png    | Bin 0 -> 2495 bytes
 data/icons/scalable/apps/espionage.svg | 148 +++++++++++++++++++++++++++++++++
 setup.py                               |  18 ++--
 7 files changed, 159 insertions(+), 7 deletions(-)

diff --git a/data/espionage.desktop b/data/desktop/espionage.desktop
similarity index 100%
rename from data/espionage.desktop
rename to data/desktop/espionage.desktop
diff --git a/data/icons/128x128/apps/espionage.png 
b/data/icons/128x128/apps/espionage.png
new file mode 100644
index 0000000..43a6850
Binary files /dev/null and b/data/icons/128x128/apps/espionage.png differ
diff --git a/data/icons/256x256/apps/espionage.png 
b/data/icons/256x256/apps/espionage.png
new file mode 100644
index 0000000..402871a
Binary files /dev/null and b/data/icons/256x256/apps/espionage.png differ
diff --git a/data/icons/256x256/espionage.png b/data/icons/256x256/espionage.png
deleted file mode 100644
index b1fbefb..0000000
Binary files a/data/icons/256x256/espionage.png and /dev/null differ
diff --git a/data/icons/48x48/apps/espionage.png 
b/data/icons/48x48/apps/espionage.png
new file mode 100644
index 0000000..91373d5
Binary files /dev/null and b/data/icons/48x48/apps/espionage.png differ
diff --git a/data/icons/scalable/apps/espionage.svg 
b/data/icons/scalable/apps/espionage.svg
new file mode 100644
index 0000000..1398a9f
--- /dev/null
+++ b/data/icons/scalable/apps/espionage.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="256"
+   height="256"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="espionage.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="83.945721"
+     inkscape:cy="108.60584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1388"
+     inkscape:window-height="865"
+     inkscape:window-x="48"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0"
+     inkscape:snap-grids="false"
+     inkscape:snap-to-guides="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="4px"
+       spacingy="4px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Livello 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-796.36218)">
+    <rect
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       ry="17.134796"
+       rx="17.134796"
+       y="655.0072"
+       x="-652.28156"
+       height="178.2184"
+       width="178.2184"
+       id="rect3027"
+       
style="fill:none;stroke:#cfaa25;stroke-width:10.09869194;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
 />
+    <rect
+       
style="fill:#cfaa25;fill-opacity:1;stroke:#000000;stroke-width:9.77051258;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3017"
+       width="172.42679"
+       height="172.42679"
+       x="-649.3858"
+       y="657.91913"
+       rx="16.577963"
+       ry="16.577963"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+    <g
+       id="g3913"
+       transform="translate(288.06635,32.417372)">
+      <path
+         sodipodi:nodetypes="cccsscc"
+         transform="translate(0,796.36218)"
+         inkscape:connector-curvature="0"
+         id="path3837"
+         d="m -210.36427,143.87307 99.75257,0 0,-47.47717 -5.99544,-45.70941 c 
-2.31318,-17.635759 -84.86837,-17.422792 -87.32143,0 l -6.4357,45.70941 z"
+         
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+      <path
+         sodipodi:nodetypes="sssss"
+         transform="translate(0,796.36218)"
+         inkscape:connector-curvature="0"
+         id="path3849"
+         d="m -183.75,45.19643 46.60714,0 c 4.00494,0 3.92714,8.48214 
0,8.48214 l -46.60714,0 c -4.90188,0 -4.51054,-8.48214 0,-8.48214 z"
+         style="fill:#cfaa25;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="sssss"
+         inkscape:connector-curvature="0"
+         id="path3849-1"
+         d="m -194.49867,855.18197 69.01785,0 c 4.00494,0 8.21286,37.57611 
4.28572,37.57611 l -78.30357,0 c -4.90188,0 0.48946,-37.57611 5,-37.57611 z"
+         style="fill:#cfaa25;fill-opacity:1;stroke:none" />
+      <path
+         transform="matrix(2.7340426,0,0,2.7340426,400.43683,578.14785)"
+         d="m -189.52987,124.11196 c 0,1.63881 -1.32852,2.96732 
-2.96732,2.96732 -1.63881,0 -2.96733,-1.32851 -2.96733,-2.96732 0,-1.63881 
1.32852,-2.96732 2.96733,-2.96732 1.6388,0 2.96732,1.32851 2.96732,2.96732 z"
+         sodipodi:ry="2.9673231"
+         sodipodi:rx="2.9673231"
+         sodipodi:cy="124.11196"
+         sodipodi:cx="-192.49719"
+         id="path3871-3"
+         style="fill:#cfaa25;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="csscc"
+         transform="translate(0,796.36218)"
+         inkscape:connector-curvature="0"
+         id="path3891"
+         d="m -201.69643,143.87307 -0.17857,11.59122 c -0.0836,5.42343 
13.92857,5.39856 13.92857,0 l 0,-11.59122 z"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="csscc"
+         inkscape:connector-curvature="0"
+         id="path3891-8"
+         d="m -132.67838,940.23525 -0.17857,11.59122 c -0.0836,5.42343 
13.92857,5.39856 13.92857,0 l 0,-11.59122 z"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#cfaa25;fill-opacity:1;stroke:none"
+         id="path3911"
+         sodipodi:cx="-192.49719"
+         sodipodi:cy="124.11196"
+         sodipodi:rx="2.9673231"
+         sodipodi:ry="2.9673231"
+         d="m -189.52987,124.11196 c 0,1.63881 -1.32852,2.96732 
-2.96732,2.96732 -1.63881,0 -2.96733,-1.32851 -2.96733,-2.96732 0,-1.63881 
1.32852,-2.96732 2.96733,-2.96732 1.6388,0 2.96732,1.32851 2.96732,2.96732 z"
+         transform="matrix(2.7340426,0,0,2.7340426,331.24138,578.14785)" />
+    </g>
+  </g>
+</svg>
diff --git a/setup.py b/setup.py
index d78db42..05481e2 100755
--- a/setup.py
+++ b/setup.py
@@ -1,27 +1,31 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
+from efl.utils.setup import build_extra, build_fdo, uninstall
 
 
 setup(
     name = 'espionage',
     version = '0.9',
     description = 'D-Bus inspector',
-    long_description = 'Espionage is a complete D-Bus inspector that use the 
EFL',
+    long_description = 'Espionage is a complete D-Bus inspector',
     license = "GNU GPL",
     author = 'Dave Andreoli',
     author_email = '[email protected]',
     packages = ['espionage'],
-    requires = ['efl', 'dbus', 'json', 'xml.etree'],
+    requires = ['efl (>=1.13)', 'dbus', 'json', 'xml.etree'],
     provides = ['espionage'],
     scripts = ['bin/espionage'],
     package_data = {
         'espionage': ['themes/*/*'],
     },
-    data_files = [
-        ('share/applications', ['data/espionage.desktop']),
-        ('share/icons', ['data/icons/256x256/espionage.png']),
-        ('share/icons/hicolor/256x256/apps', 
['data/icons/256x256/espionage.png']),
-    ]
+    cmdclass = {
+        'build': build_extra,
+        'build_fdo': build_fdo,
+        'uninstall': uninstall,
+    },
+    command_options = {
+        'install': {'record': ('setup.py', 'installed_files.txt')}
+    },
 )
 

-- 


Reply via email to