[Xfce4-commits] [xfce/xfce4-session] 01/01: Don't install generic icon names (Bug #11912)
noreply at xfce.org
noreply at xfce.org
Mon Apr 29 21:28:50 CEST 2019
This is an automated email from the git hooks/post-receive script.
o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfce4-session.
commit 3b23006fda8cf9f24878b399e08d0df119daff64
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Mon Apr 29 21:27:50 2019 +0200
Don't install generic icon names (Bug #11912)
Install the icons in the correct folder (per context: apps vs. actions)
and drop generic icon names in favor of xfce-specific icon names (which
are anyway set as fallback in xfce4-session) in order not to conflict
with other packages in distributions.
---
configure.ac.in | 1 +
icons/48x48-actions/Makefile.am | 9 ++
.../xfsm-hibernate.png} | Bin
.../xfsm-logout.png} | Bin
.../xfsm-reboot.png} | Bin
.../xfsm-shutdown.png} | Bin
.../xfsm-suspend.png} | Bin
icons/48x48/Makefile.am | 12 +-
icons/48x48/xfsm-hibernate.png | 1 -
icons/48x48/xfsm-logout.png | 1 -
icons/48x48/xfsm-reboot.png | 1 -
icons/48x48/xfsm-shutdown.png | 1 -
icons/48x48/xfsm-suspend.png | 1 -
icons/Makefile.am | 1 +
icons/scalable/Makefile.am | 4 +-
icons/scalable/system-shutdown.svg | 166 ---------------------
icons/scalable/xfsm-shutdown.svg | 1 -
17 files changed, 13 insertions(+), 186 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 20554f1..d48e259 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -184,6 +184,7 @@ AC_CONFIG_FILES([
Makefile
doc/Makefile
icons/Makefile
+icons/48x48-actions/Makefile
icons/48x48/Makefile
icons/128x128/Makefile
icons/scalable/Makefile
diff --git a/icons/48x48-actions/Makefile.am b/icons/48x48-actions/Makefile.am
new file mode 100644
index 0000000..7bef2ae
--- /dev/null
+++ b/icons/48x48-actions/Makefile.am
@@ -0,0 +1,9 @@
+iconsdir = $(datadir)/icons/hicolor/48x48/actions
+icons_DATA = \
+ xfsm-hibernate.png \
+ xfsm-logout.png \
+ xfsm-reboot.png \
+ xfsm-shutdown.png \
+ xfsm-suspend.png
+
+EXTRA_DIST = $(icons_DATA)
diff --git a/icons/48x48/system-hibernate.png b/icons/48x48-actions/xfsm-hibernate.png
similarity index 100%
rename from icons/48x48/system-hibernate.png
rename to icons/48x48-actions/xfsm-hibernate.png
diff --git a/icons/48x48/system-log-out.png b/icons/48x48-actions/xfsm-logout.png
similarity index 100%
rename from icons/48x48/system-log-out.png
rename to icons/48x48-actions/xfsm-logout.png
diff --git a/icons/48x48/system-reboot.png b/icons/48x48-actions/xfsm-reboot.png
similarity index 100%
rename from icons/48x48/system-reboot.png
rename to icons/48x48-actions/xfsm-reboot.png
diff --git a/icons/48x48/system-shutdown.png b/icons/48x48-actions/xfsm-shutdown.png
similarity index 100%
rename from icons/48x48/system-shutdown.png
rename to icons/48x48-actions/xfsm-shutdown.png
diff --git a/icons/48x48/system-suspend.png b/icons/48x48-actions/xfsm-suspend.png
similarity index 100%
rename from icons/48x48/system-suspend.png
rename to icons/48x48-actions/xfsm-suspend.png
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 6a8426e..b66166f 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,15 +1,5 @@
iconsdir = $(datadir)/icons/hicolor/48x48/apps
icons_DATA = \
- xfce4-session.png \
- system-hibernate.png \
- system-log-out.png \
- system-reboot.png \
- system-shutdown.png \
- system-suspend.png \
- xfsm-hibernate.png \
- xfsm-logout.png \
- xfsm-reboot.png \
- xfsm-shutdown.png \
- xfsm-suspend.png
+ xfce4-session.png
EXTRA_DIST = $(icons_DATA)
diff --git a/icons/48x48/xfsm-hibernate.png b/icons/48x48/xfsm-hibernate.png
deleted file mode 120000
index 8a12783..0000000
--- a/icons/48x48/xfsm-hibernate.png
+++ /dev/null
@@ -1 +0,0 @@
-system-hibernate.png
\ No newline at end of file
diff --git a/icons/48x48/xfsm-logout.png b/icons/48x48/xfsm-logout.png
deleted file mode 120000
index b4ea7ad..0000000
--- a/icons/48x48/xfsm-logout.png
+++ /dev/null
@@ -1 +0,0 @@
-system-log-out.png
\ No newline at end of file
diff --git a/icons/48x48/xfsm-reboot.png b/icons/48x48/xfsm-reboot.png
deleted file mode 120000
index 84b781b..0000000
--- a/icons/48x48/xfsm-reboot.png
+++ /dev/null
@@ -1 +0,0 @@
-system-reboot.png
\ No newline at end of file
diff --git a/icons/48x48/xfsm-shutdown.png b/icons/48x48/xfsm-shutdown.png
deleted file mode 120000
index d346f8b..0000000
--- a/icons/48x48/xfsm-shutdown.png
+++ /dev/null
@@ -1 +0,0 @@
-system-shutdown.png
\ No newline at end of file
diff --git a/icons/48x48/xfsm-suspend.png b/icons/48x48/xfsm-suspend.png
deleted file mode 120000
index 5af38d4..0000000
--- a/icons/48x48/xfsm-suspend.png
+++ /dev/null
@@ -1 +0,0 @@
-system-suspend.png
\ No newline at end of file
diff --git a/icons/Makefile.am b/icons/Makefile.am
index f7f36a3..34dac17 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,6 +1,7 @@
# $Id$
SUBDIRS = \
+ 48x48-actions \
48x48 \
128x128 \
scalable
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index 61d65ab..72bdaa7 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -1,7 +1,5 @@
iconsdir = $(datadir)/icons/hicolor/scalable/apps
icons_DATA = \
- xfce4-session.svg \
- system-shutdown.svg \
- xfsm-shutdown.svg
+ xfce4-session.svg
EXTRA_DIST = $(icons_DATA)
diff --git a/icons/scalable/system-shutdown.svg b/icons/scalable/system-shutdown.svg
deleted file mode 100644
index 674a98b..0000000
--- a/icons/scalable/system-shutdown.svg
+++ /dev/null
@@ -1,166 +0,0 @@
-<?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://web.resource.org/cc/"
- 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:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- sodipodi:docname="xfce-system-exit.svg"
- sodipodi:docbase="/home/francois/Rodent/scalable/apps"
- height="128.00000pt"
- width="128.00000pt"
- inkscape:version="0.41"
- sodipodi:version="0.32"
- id="svg1">
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient839">
- <stop
- id="stop840"
- offset="0.0000000"
- style="stop-color:#eae8e3;stop-opacity:1.0000000;" />
- <stop
- id="stop841"
- offset="1.0000000"
- style="stop-color:#c5d2c8;stop-opacity:1.0000000;" />
- </linearGradient>
- <linearGradient
- id="linearGradient835">
- <stop
- id="stop836"
- offset="0.0000000"
- style="stop-color:#f0f0f2;stop-opacity:1.0000000;" />
- <stop
- id="stop837"
- offset="1.0000000"
- style="stop-color:#d4d9e1;stop-opacity:1.0000000;" />
- </linearGradient>
- <linearGradient
- id="linearGradient831">
- <stop
- id="stop832"
- offset="0.0000000"
- style="stop-color:#bebfbe;stop-opacity:1.0000000;" />
- <stop
- id="stop833"
- offset="1"
- style="stop-color:#fff;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.902743,0.000000,0.000000,0.974632,2.930579,4.225038)"
- y2="6.2912449"
- x2="80.027988"
- y1="142.15277"
- x1="80.027988"
- id="linearGradient834"
- xlink:href="#linearGradient831" />
- <radialGradient
- fy="0.099787682"
- fx="0.51906782"
- r="0.10975039"
- cy="0.099787682"
- cx="0.51906782"
- id="radialGradient838"
- xlink:href="#linearGradient831" />
- </defs>
- <sodipodi:namedview
- inkscape:current-layer="svg1"
- inkscape:window-y="34"
- inkscape:window-x="366"
- gridspacingy="1.0000000mm"
- gridspacingx="1.0000000mm"
- snaptogrid="false"
- showgrid="true"
- inkscape:window-height="653"
- inkscape:window-width="872"
- inkscape:cy="80.000000"
- inkscape:cx="80.000000"
- inkscape:zoom="2.9500000"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base" />
- <rect
- rx="8.1858664"
- ry="8.1858664"
- y="15.423190"
- x="13.425057"
- height="137.78500"
- width="133.85591"
- id="rect838"
- style="fill:#000000;fill-opacity:0.49668875;fill-rule:evenodd;stroke:none;stroke-width:7.5000000" />
- <rect
- rx="7.7611942"
- ry="7.7611942"
- y="11.164709"
- x="15.415819"
- height="135.64699"
- width="125.12034"
- id="rect830"
- style="fill:url(#linearGradient834);fill-rule:evenodd;stroke:#000000;stroke-width:7.0702119" />
- <path
- transform="matrix(0.788417,0.000000,0.000000,0.785328,18.05931,19.71047)"
- d="M 127.55906 80.275589 A 47.834644 47.834644 0 1 1 31.889767,80.275589 A 47.834644 47.834644 0 1 1 127.55906 80.275589 z"
- sodipodi:ry="47.834644"
- sodipodi:rx="47.834644"
- sodipodi:cy="80.275589"
- sodipodi:cx="79.724411"
- id="path845"
- style="fill:#ffffff;fill-opacity:0.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.880922;stroke-opacity:1.0000000"
- sodipodi:type="arc" />
- <path
- id="path846"
- d="M 81.219737,38.365987 L 81.166089,83.937014"
- style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:14.069986;stroke-linecap:round;stroke-opacity:1.0000000" />
- <path
- transform="matrix(0.788417,0.000000,0.000000,0.785328,14.84701,16.47892)"
- d="M 127.55906 80.275589 A 47.834644 47.834644 0 1 1 31.889767,80.275589 A 47.834644 47.834644 0 1 1 127.55906 80.275589 z"
- sodipodi:ry="47.834644"
- sodipodi:rx="47.834644"
- sodipodi:cy="80.275589"
- sodipodi:cx="79.724411"
- id="path842"
- style="fill:#ffffff;fill-opacity:0.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:20.861076;stroke-opacity:0.49999997"
- sodipodi:type="arc" />
- <path
- transform="matrix(0.788417,0.000000,0.000000,0.785328,14.84701,16.47892)"
- d="M 127.55906 80.275589 A 47.834644 47.834644 0 1 1 31.889767,80.275589 A 47.834644 47.834644 0 1 1 127.55906 80.275589 z"
- sodipodi:ry="47.834644"
- sodipodi:rx="47.834644"
- sodipodi:cy="80.275589"
- sodipodi:cx="79.724411"
- id="path839"
- style="fill:#ffffff;fill-opacity:0.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:17.880922"
- sodipodi:type="arc" />
- <path
- id="path843"
- d="M 78.007436,35.134432 L 77.953788,80.705459"
- style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:16.414984;stroke-linecap:round;stroke-opacity:0.49999997" />
- <path
- id="path840"
- d="M 78.007436,35.134432 L 77.953788,80.705459"
- style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:14.069986;stroke-linecap:round" />
- <metadata
- id="metadata23">
- <rdf:RDF
- id="RDF24">
- <cc:Work
- id="Work25"
- rdf:about="">
- <dc:format
- id="format26">image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"
- id="type28" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
-</svg>
diff --git a/icons/scalable/xfsm-shutdown.svg b/icons/scalable/xfsm-shutdown.svg
deleted file mode 120000
index 014e333..0000000
--- a/icons/scalable/xfsm-shutdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-system-shutdown.svg
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list