Control: tags -1 + patch Hello all,
I have prepared a proof-of-concept patch for #836253. See 0003.patch in the attachment. 0002-patch is some other improvement around desktop file. Basically I moved /usr/share/reportbug/debian-swirl.svg to /usr/share/icons/ hicolor/scalable/places/debian-swirl.svg to make it the fallback svg icon so that other themes could show their own debian-swirl icon for reportbug. The desktop file is adjested accordingly. Detail is explained inside git commit log. Any suggestion will be welcomed. Sincerely, Boyuan Yang
From 114b0f121ecfd7561bd7466f7c301a8c17668c6b Mon Sep 17 00:00:00 2001 From: Boyuan Yang <073p...@gmail.com> Date: Sun, 15 Jan 2017 00:46:38 +0800 Subject: improve reportbug.desktop file * Add "Keywords" entry to ease user searching * Name translation into Simplified Chinese --- debian/desktop | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/desktop b/debian/desktop index 2924c92..c2ac03f 100644 --- a/debian/desktop +++ b/debian/desktop @@ -2,12 +2,18 @@ Type=Application Name=Reportbug Name[ru]=Reportbug +Name[zh_CN]=报告漏洞 Comment=Report bugs to the Debian BTS Comment[ru]=Создание и отправка отчёта об ошибке в Debian BTS +Comment[zh_CN]=向 Debian 缺陷跟踪系统报告漏洞 GenericName=Debian bug reporting tool GenericName[ru]=Отчёт об ошибке Reportbug +GenericName[zh_CN]=Debian 缺陷报告工具 X-GNOME-FullName[ru]=Отчёт об ошибке Reportbug +X-GNOME-FullName[zh_CN]=Debian 缺陷报告工具 Icon=/usr/share/reportbug/debian-swirl.svg TryExec=reportbug Exec=reportbug --exit-prompt --ui gtk2 Categories=System; +Keywords=Debian;Bug;Bugs;BTS; +Keywords[zh_CN]=漏洞;报告;缺陷; -- 2.11.0
From afb9ba0b6ed88095be9ddacf8dc255bcbf7d941d Mon Sep 17 00:00:00 2001
From: Boyuan Yang <073p...@gmail.com>
Date: Sun, 15 Jan 2017 01:12:42 +0800
Subject: stop hardcoding .desktop icon
This commit is made based on the following implication:
- Reportbug *will* always use debian-swirl as its icon
- The standard icon for debian-swirl is from gnome-icon-theme
- Reportbug is suitable to provide "places/debian-swirl" icon
in fallback "hicolor" theme.
As a result, the following changes were made:
- Do not install bundled debian-swirl.svg into private dir,
as previously written in setup.py.
+ Instead, install SVG file into
$prefix/icons/hicolor/scalable/places/ using dh_install.
* On GNOME system when $prefix/icons/gnome/ dir exists, this svg
file will be overridden by the icon provided by GNOME.
* If *any* other icon theme (e.g., Numix, etc) provides the
debian-swirl icon, that will override the svg file provided by
reportbug.
* If no other icon theme exists and GNOME is not installed, the
fallback (hicolor theme) svg icon will be used.
I believe that is enough to fix Debian Bug #836253.
For more information, please refer to the Icon Theme Specification:
https://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html.
---
debian/desktop | 2 +-
debian/reportbug.install | 1 +
setup.py | 3 +--
3 files changed, 3 insertions(+), 3 deletions(-)
create mode 100644 debian/reportbug.install
diff --git a/debian/desktop b/debian/desktop
index c2ac03f..c40cf6e 100644
--- a/debian/desktop
+++ b/debian/desktop
@@ -11,7 +11,7 @@ GenericName[ru]=Отчёт об ошибке Reportbug
GenericName[zh_CN]=Debian 缺陷报告工具
X-GNOME-FullName[ru]=Отчёт об ошибке Reportbug
X-GNOME-FullName[zh_CN]=Debian 缺陷报告工具
-Icon=/usr/share/reportbug/debian-swirl.svg
+Icon=debian-swirl
TryExec=reportbug
Exec=reportbug --exit-prompt --ui gtk2
Categories=System;
diff --git a/debian/reportbug.install b/debian/reportbug.install
new file mode 100644
index 0000000..38713f2
--- /dev/null
+++ b/debian/reportbug.install
@@ -0,0 +1 @@
+share/debian-swirl.svg /usr/share/icons/hicolor/scalable/places/
diff --git a/setup.py b/setup.py
index 691861f..9674b71 100755
--- a/setup.py
+++ b/setup.py
@@ -19,8 +19,7 @@ setup(name='reportbug', version=reportbug.VERSION_NUMBER,
author_email='reportbug-ma...@lists.alioth.debian.org',
url='http://alioth.debian.org/projects/reportbug',
data_files=[('share/reportbug', ['share/handle_bugscript',
- 'share/reportbug.el',
- 'share/debian-swirl.svg']),
+ 'share/reportbug.el',]),
('share/bug/reportbug', ['share/presubj', 'share/script',
'share/control'])],
license='MIT',
--
2.11.0
signature.asc
Description: This is a digitally signed message part.
