Merge branch 'master' of gitlab.com:vanntile/inkscape

4 files changed, 4 insertions, 4 deletions

diff --git a/org.inkscape.Inkscape.appdata.xml.in b/org.inkscape.Inkscape.appdata.xml.in
index b17939084..0cfb1d0fa 100644
--- a/org.inkscape.Inkscape.appdata.xml.in
+++ b/org.inkscape.Inkscape.appdata.xml.in
@@ -31,7 +31,7 @@
   <screenshots>
     <screenshot type="default">
       <image>https://media.inkscape.org/media/resources/file/Screenshot_Freedom_Machine_Inkscape_master_FB3NeUU.png</image>
-      <_caption>Main application window</_caption>
+      <caption>Main application window</caption>
     </screenshot>
   </screenshots>
   <releases>
diff --git a/packaging/appimage/generate.sh b/packaging/appimage/generate.sh
index 1d05d9e2f..ef25cb46e 100644
--- a/packaging/appimage/generate.sh
+++ b/packaging/appimage/generate.sh
@@ -24,7 +24,7 @@ make DESTDIR=appdir -j$(nproc) install ; find appdir/
 cp ../packaging/appimage/AppRun appdir/AppRun ; chmod +x appdir/AppRun
 ( cd appdir/usr/lib/ ; ln -s ../* . ) # FIXME: Why is this needed?
 ( cd appdir/ ; ln -s usr/* . ) # FIXME: Why is this needed?
-cp ./appdir/usr/share/icons/hicolor/256x256/apps/inkscape.png ./appdir/
+cp ./appdir/usr/share/icons/hicolor/256x256/apps/org.inkscape.Inkscape.png ./appdir/
 sed -i -e 's|^Icon=.*|Icon=org.inkscape.Inkscape|g' ./appdir/usr/share/applications/org.inkscape.Inkscape.desktop # FIXME
 cd appdir/
 
diff --git a/packaging/autopackage/default.apspec.in b/packaging/autopackage/default.apspec.in
index 1a6ffa90f..c3175c1a3 100644
--- a/packaging/autopackage/default.apspec.in
+++ b/packaging/autopackage/default.apspec.in
@@ -51,7 +51,7 @@ removeOwningPackage $PREFIX/bin/inkscape
 [Install]
 installExe bin/inkscape bin/inkview
 installMan 1 man/man1/*
-installIcon share/pixmaps/inkscape.png
+installIcon share/pixmaps/org.inkscape.Inkscape.png
 installMenuItem "Graphics" share/applications/org.inkscape.Inkscape.desktop
 
 copyFiles --nobackup share/locale $PREFIX/share
diff --git a/share/branding/inkscape.svg b/share/branding/inkscape.svg
index 617e66ef4..0eb36391c 100644
--- a/share/branding/inkscape.svg
+++ b/share/branding/inkscape.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="128" height="128" id="svg2" sodipodi:version="0.32" inkscape:version="0.48+devel r" sodipodi:docname="inkscape.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/valessio/Desenvolvimento/inkscape/inkscape/inkscape.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45">
+<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:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="128" height="128" id="svg2" sodipodi:version="0.32" inkscape:version="0.48+devel r" sodipodi:docname="inkscape.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-xdpi="45" inkscape:export-ydpi="45">
 <title id="title7387">Inkscape Logo</title>
 <sodipodi:namedview bordercohor="#666666" inkscape:window-height="577" inkscape:window-width="862" inkscape:pageshadow="2" inkscape:pageopacity="0.0" guidetolerance="10.0" gridtolerance="10.0" objecttolerance="10.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" inkscape:zoom="1" inkscape:cx="-232" inkscape:cy="64" inkscape:window-x="192" inkscape:window-y="122" inkscape:current-layer="svg2" showgrid="false" inkscape:window-maximized="0" />
 <defs id="defs4">