[med-svn] [aghermann] 02/04: get desktop files and icons right, close debian #764820
andrei zavada
hmmr-guest at moszumanska.debian.org
Tue Oct 14 00:37:24 UTC 2014
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch master
in repository aghermann.
commit 72672887a31fdcea82bb0ba7df059aa914adf88b
Author: Andrei Zavada <hmmr at ra>
Date: Tue Oct 14 03:23:26 2014 +0300
get desktop files and icons right, close debian #764820
---
debian/unwanted-files | 1 +
upstream/Makefile.am | 2 +-
upstream/configure.ac | 7 +-
upstream/data/.gitignore | 1 -
upstream/data/Makefile.am | 20 +----
upstream/desktop/.gitignore | 1 +
upstream/desktop/Makefile.am | 31 ++++++++
upstream/{data => desktop}/aghermann.desktop.in | 2 +-
upstream/{data => desktop}/edfhed-gtk.desktop.in | 3 +-
.../icons/scalable/aghermann.svg} | 0
upstream/desktop/icons/scalable/edfhed-gtk.svg | 93 ++++++++++++++++++++++
11 files changed, 136 insertions(+), 25 deletions(-)
diff --git a/debian/unwanted-files b/debian/unwanted-files
index 4fbb0b2..794b508 100644
--- a/debian/unwanted-files
+++ b/debian/unwanted-files
@@ -17,6 +17,7 @@ Makefile.in
src/Makefile.in
src/*/Makefile.in
data/Makefile.in
+desktop/Makefile.in
doc/Makefile.in
doc/org/Makefile.in
diff --git a/upstream/Makefile.am b/upstream/Makefile.am
index 8c8e93a..f686064 100644
--- a/upstream/Makefile.am
+++ b/upstream/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src data doc
+SUBDIRS = src data desktop doc
EXTRA_DIST = \
ChangeLog \
diff --git a/upstream/configure.ac b/upstream/configure.ac
index e1975b8..78ab2c5 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -193,7 +193,6 @@ AC_SUBST(user, [`whoami`@`hostname`])
AC_SUBST(build_date, [`date +"%F"`])
AC_SUBST(build_datetime, [`date`])
-
AC_OUTPUT([
Makefile
src/Makefile
@@ -207,8 +206,10 @@ AC_OUTPUT([
src/tools/Makefile
data/Makefile
- data/aghermann.desktop
- data/edfhed-gtk.desktop
+
+ desktop/Makefile
+ desktop/aghermann.desktop
+ desktop/edfhed-gtk.desktop
doc/Makefile
doc/org/Makefile
diff --git a/upstream/data/.gitignore b/upstream/data/.gitignore
index 47d823e..c5c3e70 100644
--- a/upstream/data/.gitignore
+++ b/upstream/data/.gitignore
@@ -1,2 +1 @@
-*.desktop
aghermann.gresource
diff --git a/upstream/data/Makefile.am b/upstream/data/Makefile.am
index 41c061c..1e8edca 100644
--- a/upstream/data/Makefile.am
+++ b/upstream/data/Makefile.am
@@ -1,11 +1,6 @@
-applicationsdir := $(datadir)/applications
-applications_DATA := \
- aghermann.desktop edfhed-gtk.desktop
-
uidir := $(datadir)/${PACKAGE}
ui_DATA := \
- aghermann.png \
aghermann.gresource \
idle-bg.svg \
experiment-dl.sh
@@ -17,8 +12,6 @@ rk_DATA := \
EXTRA_DIST := \
aghermann.png \
- aghermann.desktop.in edfhed-gtk.desktop.in \
- icon.svg \
aghermann.gresource.xml \
sm.glade \
mw.glade mw-dialogs.glade \
@@ -30,25 +23,16 @@ EXTRA_DIST := \
experiment-dl.sh
CLEANFILES := \
- aghermann.desktop edfhed-gtk.desktop \
aghermann.gresource
GRESOURCES := \
+ aghermann.png \
sm.glade \
mw.glade mw-dialogs.glade \
sf.glade sf-artifacts.glade sf-filters.glade sf-patterns.glade sf-phasediff.glade sf-rk1968.glade \
mf.glade edfhed.glade \
- aghermann.png equations1.png equation-uc.png \
+ equations1.png equation-uc.png \
edfhed.glade
aghermann.gresource: aghermann.gresource.xml $(GRESOURCES)
$(glib_compile_resources) aghermann.gresource.xml
-
-#update_desktop_database = update-desktop-database $(datadir)/applications
-
-install-data-hook:
- @if [ x$enable_update_desktop_database = xyes ]; then \
- $(mkinstalldirs) $(uidir); \
- else \
- echo "*** Desktop database not updated"; \
- fi
diff --git a/upstream/desktop/.gitignore b/upstream/desktop/.gitignore
new file mode 100644
index 0000000..d0f6562
--- /dev/null
+++ b/upstream/desktop/.gitignore
@@ -0,0 +1 @@
+*.desktop
diff --git a/upstream/desktop/Makefile.am b/upstream/desktop/Makefile.am
new file mode 100644
index 0000000..562b50a
--- /dev/null
+++ b/upstream/desktop/Makefile.am
@@ -0,0 +1,31 @@
+desktop_in_files = aghermann.desktop.in.in edfhed-gtk.desktop.in.in
+desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
+
+applicationsdir := $(datadir)/applications
+applications_DATA = $(desktop_files)
+
+iconthemedir = $(datadir)/icons/hicolor
+appiconscalabledir = $(iconthemedir)/scalable/apps
+dist_appiconscalable_DATA = \
+ icons/scalable/aghermann.svg \
+ icons/scalable/edfhed-gtk.svg
+
+UPDATE_ICON_CACHE = gtk-update-icon-cache --ignore-theme-index --force
+install-data-hook: install-update-icon-cache
+uninstall-hook: uninstall-update-icon-cache
+
+install-update-icon-cache:
+ $(AM_V_at)$(POST_INSTALL)
+ test -n "$(DESTDIR)" || $(UPDATE_ICON_CACHE) "$(iconthemedir)"
+
+uninstall-update-icon-cache:
+ $(AM_V_at)$(POST_UNINSTALL)
+ test -n "$(DESTDIR)" || $(UPDATE_ICON_CACHE) "$(iconthemedir)"
+
+EXTRA_DIST := \
+ aghermann.desktop.in edfhed-gtk.desktop.in \
+ icons/scalable/aghermann.svg \
+ icons/scalable/edfhed-gtk.svg
+
+CLEANFILES := \
+ aghermann.desktop edfhed-gtk.desktop
diff --git a/upstream/data/aghermann.desktop.in b/upstream/desktop/aghermann.desktop.in
similarity index 90%
rename from upstream/data/aghermann.desktop.in
rename to upstream/desktop/aghermann.desktop.in
index c124976..1d45f90 100644
--- a/upstream/data/aghermann.desktop.in
+++ b/upstream/desktop/aghermann.desktop.in
@@ -4,7 +4,7 @@ Version=1.0
Name=Aghermann
GenericName=Sleep research experiment manager
Comment=Manage EEG recordings, view and score EDF files, and simulate Process S
-Icon=@PKGDATADIR@/aghermann.png
+Icon=aghermann
TryExec=aghermann
Exec=aghermann
Terminal=false
diff --git a/upstream/data/edfhed-gtk.desktop.in b/upstream/desktop/edfhed-gtk.desktop.in
similarity index 87%
rename from upstream/data/edfhed-gtk.desktop.in
rename to upstream/desktop/edfhed-gtk.desktop.in
index 24b5fe8..ab1db55 100644
--- a/upstream/data/edfhed-gtk.desktop.in
+++ b/upstream/desktop/edfhed-gtk.desktop.in
@@ -4,8 +4,9 @@ Version=1.0
Name=Edfhed
GenericName=EDF file header editor
Comment=EDF file header editor
+Icon=edfhed-gtk
TryExec=edfhed-gtk
-Exec=edfhed-gtk
+Exec=edfhed-gtk %U
Terminal=false
Categories=Education;Science;MedicalSoftware;GTK;
MimeType=application/x-edf;
diff --git a/upstream/data/icon.svg b/upstream/desktop/icons/scalable/aghermann.svg
similarity index 100%
rename from upstream/data/icon.svg
rename to upstream/desktop/icons/scalable/aghermann.svg
diff --git a/upstream/desktop/icons/scalable/edfhed-gtk.svg b/upstream/desktop/icons/scalable/edfhed-gtk.svg
new file mode 100644
index 0000000..9f18134
--- /dev/null
+++ b/upstream/desktop/icons/scalable/edfhed-gtk.svg
@@ -0,0 +1,93 @@
+<?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"
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/hmmr/P/C/Aghermann/data/ui/aghermann.png"
+ sodipodi:docname="edfhed-gtk.svg"
+ inkscape:version="0.48.5 r10040"
+ version="1.1"
+ id="svg2"
+ height="128"
+ width="128">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4"
+ inkscape:cx="79.54691"
+ inkscape:cy="58.488121"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="1.4"
+ fit-margin-left="1.4"
+ fit-margin-right="1.4"
+ fit-margin-bottom="1.4"
+ inkscape:window-width="1211"
+ inkscape:window-height="887"
+ inkscape:window-x="414"
+ inkscape:window-y="71"
+ inkscape:window-maximized="0" />
+ <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 />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-240.24595,-167.74433)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3063"
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#ff2400;fill-opacity:1;fill-rule:nonzero;stroke:#460000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:3.70000005;stroke-opacity:1;str [...]
+ d="m 272.58601,203.36216 0.108,-7.97612 c 0,-0.82986 -0.024,-2.22838 -0.072,-4.19554 -0.024,-0.89133 -0.324,-1.5829 -0.9,-2.07471 -0.576,-0.49176 -1.248,-0.75302 -2.016,-0.78379 -0.384,3e-5 -0.576,-0.2766 -0.576,-0.82988 0,-0.43027 0.336,-0.64543 1.008,-0.64547 l 0.972,0.0922 8.784,0.23053 7.2,-0.18442 c 0.45598,3e-5 0.68398,0.3535 0.684,1.06041 -2e-5,0.18444 -0.072,0.79917 -0.216,1.84419 -0.14402,1.01433 -0.21602,1.81348 -0.216,2.39745 -2e-5,0.98359 -0.19202,1.47537 -0.576,1.4753 [...]
+ <path
+ inkscape:connector-curvature="0"
+ id="path3065"
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#ff2400;fill-opacity:1;fill-rule:nonzero;stroke:#460000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:3.70000005;stroke-opacity:1;str [...]
+ d="m 294.24057,202.7167 -0.036,-11.71062 c 0,-0.52249 -0.204,-1.04501 -0.612,-1.56756 -0.384,-0.55323 -0.78,-0.84523 -1.188,-0.87599 -0.408,-0.0307 -0.696,-0.0615 -0.864,-0.0922 -0.144,-0.0307 -0.3,-0.12295 -0.468,-0.27663 -0.144,-0.18439 -0.216,-0.41492 -0.216,-0.69157 0,-0.30733 0.096,-0.47638 0.288,-0.50715 0.216,-0.0615 0.732,-0.0922 1.548,-0.0922 l 3.132,0 7.02,-0.18442 c 3.47999,4e-5 6.65999,1.26022 9.54,3.78059 1.39198,1.19875 2.51998,2.78168 3.384,4.74879 0.86398,1.93643 1 [...]
+ <path
+ inkscape:connector-curvature="0"
+ id="path3067"
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#ff2400;fill-opacity:1;fill-rule:nonzero;stroke:#460000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:3.70000005;stroke-opacity:1;str [...]
+ d="m 319.40345,187.59433 c 0,-0.21512 0.096,-0.39954 0.288,-0.55326 0.192,-0.15364 0.408,-0.23048 0.648,-0.23052 l 0.972,0 c 0.576,4e-5 1.5,0.0461 2.772,0.13831 1.29599,0.0922 2.97599,0.13835 5.04,0.13832 l 8.172,-0.23053 c 0.40798,4e-5 0.61198,0.36888 0.612,1.10652 -2e-5,0.3996 -0.072,1.12191 -0.216,2.16692 -0.14402,1.04507 -0.24002,1.89032 -0.288,2.53576 -0.048,0.61476 -0.24002,0.92213 -0.576,0.9221 -0.31202,3e-5 -0.46802,-0.30734 -0.468,-0.9221 -2e-5,-2.02858 -0.55202,-3.08899 [...]
+ <path
+ inkscape:connector-curvature="0"
+ id="path3069"
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#008ce6;fill-opacity:1;fill-rule:nonzero;stroke:#460000;stroke-width:0.2;stroke-linecap:butt;stroke-miterlimit:3.70000005;stroke-opacity:1;stroke-dasharray:none;str [...]
+ d="m 261.33371,264.73739 -4.75995,0.42932 c -1.11735,0 -1.69838,-0.0858 -1.74307,-0.25759 -0.0447,-0.17173 -0.067,-0.37205 -0.067,-0.60101 0,-0.57239 0.26817,-0.94446 0.80449,-1.11617 1.29614,-0.45793 2.12299,-1.17341 2.48054,-2.14649 0.40226,-1.0303 0.60337,-2.51854 0.60337,-4.46468 l 0.26818,-29.27801 0,-4.20711 c 0,-7.78452 -0.13409,-12.5354 -0.40226,-14.25264 -0.26816,-1.71713 -1.07266,-2.57573 -2.4135,-2.57579 l -0.87153,0 -0.26816,-0.0858 c -0.75981,6e-5 -1.13971,-0.25752 -1 [...]
+ <path
+ inkscape:connector-curvature="0"
+ id="path3073"
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#008ce6;fill-opacity:1;fill-rule:nonzero;stroke:#460000;stroke-width:0.2;stroke-linecap:butt;stroke-miterlimit:3.70000005;stroke-opacity:1;stroke-dasharray:none;str [...]
+ d="m 344.20506,264.49054 -0.19882,-3.14055 c -4e-5,-0.96197 -0.19886,-1.44295 -0.59651,-1.44295 -0.13256,0 -0.46395,0.28293 -0.99416,0.84878 -0.48604,0.56588 -1.06044,1.21662 -1.72319,1.95225 -0.66278,0.67904 -1.63484,1.3015 -2.91618,1.86736 -1.23718,0.56586 -2.5848,0.8488 -4.04289,0.8488 -4.10915,0 -7.31254,-1.72591 -9.61013,-5.17768 -2.2976,-3.50837 -3.4464,-7.83723 -3.4464,-12.98663 0,-5.20595 1.4139,-9.87435 4.24174,-14.0052 2.87197,-4.13078 6.82649,-6.19617 11.86353,-6.19624 [...]
+ <path
+ d="m 299.08601,248.8266 0.108,-7.97613 c 0,-0.82986 -0.024,-2.22837 -0.072,-4.19553 -0.024,-0.89134 -0.324,-1.58291 -0.9,-2.07472 -0.576,-0.49176 -1.248,-0.75302 -2.016,-0.78378 -0.384,3e-5 -0.576,-0.2766 -0.576,-0.82989 0,-0.43027 0.336,-0.64543 1.008,-0.64546 l 0.972,0.0922 8.784,0.23052 7.2,-0.18442 c 0.45598,4e-5 0.68398,0.35351 0.684,1.06041 -2e-5,0.18445 -0.072,0.79918 -0.216,1.84419 -0.14402,1.01433 -0.21602,1.81348 -0.216,2.39745 -2e-5,0.98359 -0.19202,1.47538 -0.576,1.475 [...]
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#008ce6;fill-opacity:1;fill-rule:nonzero;stroke:#460000;stroke-width:0.2;stroke-linecap:butt;stroke-miterlimit:3.70000005;stroke-opacity:1;stroke-dasharray:none;str [...]
+ id="path3081"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list