summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2019-01-24 17:10:45 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2019-01-24 17:10:45 +0000
commitd99a0c506ccecf25ed7f3f69e3dffd44e80aab8e (patch)
treef9f419c49593a6d490c4d2e0cfa4123a836b7ca7 /packaging
parentDebug: Remove the last remnants of Util::ptr_shared. (diff)
parentChanged path in /packaging/appimage/generate.sh (diff)
downloadinkscape-d99a0c506ccecf25ed7f3f69e3dffd44e80aab8e.tar.gz
inkscape-d99a0c506ccecf25ed7f3f69e3dffd44e80aab8e.zip
Merge branch 'master' of gitlab.com:vanntile/inkscape
Diffstat (limited to 'packaging')
-rw-r--r--packaging/appimage/generate.sh2
-rw-r--r--packaging/autopackage/default.apspec.in2
2 files changed, 2 insertions, 2 deletions
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