This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository grass.
commit be045d83f29f447428a85335ccf83822ab74f3a5 Author: Bas Couwenberg <[email protected]> Date: Wed Dec 28 18:53:52 2016 +0100 Add patch to fix hicolor icon name. --- debian/changelog | 1 + debian/patches/hicolor-icons.patch | 61 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 63 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0b94543..dc8f8c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ grass (7.2.0-1) UNRELEASED; urgency=medium * Drop svn-r69952-dglib-update-to-libavl-2.0.3.patch, included upstream. * Update license & copyright for avl. * Add patch to fix spelling errors. + * Add patch to fix hicolor icon name. -- Bas Couwenberg <[email protected]> Wed, 28 Dec 2016 18:14:57 +0100 diff --git a/debian/patches/hicolor-icons.patch b/debian/patches/hicolor-icons.patch new file mode 100644 index 0000000..7e6259e --- /dev/null +++ b/debian/patches/hicolor-icons.patch @@ -0,0 +1,61 @@ +Description: Fix hicolor icon name. + grass.desktop uses Icon=grass not Icon=grass71. +Author: Bas Couwenberg <[email protected]> +Forwarded: https://trac.osgeo.org/grass/ticket/3233 + +--- a/gui/icons/Makefile ++++ b/gui/icons/Makefile +@@ -21,37 +21,37 @@ default: $(ETCICONS) $(HTMLICONS) + $(MKDIR) $(ARCH_DISTDIR)/share/applications + $(INSTALL_DATA) grass.desktop $(ARCH_DISTDIR)/share/applications + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps +- $(INSTALL_DATA) grass-8x8.png $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps/grass71.png ++ $(INSTALL_DATA) grass-8x8.png $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps +- $(INSTALL_DATA) grass-16x16.png $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps/grass71.png ++ $(INSTALL_DATA) grass-16x16.png $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps +- $(INSTALL_DATA) grass-22x22.png $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps/grass71.png ++ $(INSTALL_DATA) grass-22x22.png $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps +- $(INSTALL_DATA) grass-24x24.png $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps/grass71.png ++ $(INSTALL_DATA) grass-24x24.png $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps +- $(INSTALL_DATA) grass-32x32.png $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps/grass71.png ++ $(INSTALL_DATA) grass-32x32.png $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps +- $(INSTALL_DATA) grass-36x36.png $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps/grass71.png ++ $(INSTALL_DATA) grass-36x36.png $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps +- $(INSTALL_DATA) grass-40x40.png $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps/grass71.png ++ $(INSTALL_DATA) grass-40x40.png $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps +- $(INSTALL_DATA) grass-42x42.png $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps/grass71.png ++ $(INSTALL_DATA) grass-42x42.png $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps +- $(INSTALL_DATA) grass-48x48.png $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps/grass71.png ++ $(INSTALL_DATA) grass-48x48.png $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps +- $(INSTALL_DATA) grass-64x64.png $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps/grass71.png ++ $(INSTALL_DATA) grass-64x64.png $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps +- $(INSTALL_DATA) grass-72x72.png $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps/grass71.png ++ $(INSTALL_DATA) grass-72x72.png $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps +- $(INSTALL_DATA) grass-80x80.png $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps/grass71.png ++ $(INSTALL_DATA) grass-80x80.png $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps +- $(INSTALL_DATA) grass-96x96.png $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps/grass71.png ++ $(INSTALL_DATA) grass-96x96.png $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps +- $(INSTALL_DATA) grass-128x128.png $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps/grass71.png ++ $(INSTALL_DATA) grass-128x128.png $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps +- $(INSTALL_DATA) grass-192x192.png $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps/grass71.png ++ $(INSTALL_DATA) grass-192x192.png $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps/grass.png + $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps +- $(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass71.svg ++ $(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass.svg + $(MKDIR) $(ARCH_DISTDIR)/share/appdata + $(INSTALL_DATA) grass.appdata.xml $(ARCH_DISTDIR)/share/appdata + ### disable special 64bit icons (using different icons can be confusing for the user) diff --git a/debian/patches/series b/debian/patches/series index 74dbebd..882527c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ no-fail-html.patch appstream.patch jquery.patch spelling-errors.patch +hicolor-icons.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
