Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-menu
Commits:
-
9bfbb30b
by Mike Gabriel at 2019-10-31T20:27:46Z
-
be84e52b
by Mike Gabriel at 2019-10-31T20:31:54Z
-
9c4cffb4
by Mike Gabriel at 2019-10-31T20:43:13Z
-
98a217e5
by Mike Gabriel at 2019-10-31T20:43:13Z
5 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/1001_check-availability-of-env-vars.patch
- + debian/patches/series
Changes:
| 1 |
+mate-menu (19.10.2-2) unstable; urgency=medium
|
|
| 2 |
+ |
|
| 3 |
+ * debian/control:
|
|
| 4 |
+ + Bump Standards-Version: to 4.4.1. No changes needed.
|
|
| 5 |
+ + Add Rules-Requires-Root: field and set it to no.
|
|
| 6 |
+ + Add D (mate-menu): python3-gi-cairo. (Closes: #942676).
|
|
| 7 |
+ * debian/patches:
|
|
| 8 |
+ + Add 1001_check-availability-of-env-vars.patch. Fix
|
|
| 9 |
+ occurring exception (crash) when a user clicks the
|
|
| 10 |
+ "Edit properties" item in context menu of applications
|
|
| 11 |
+ list. (LP:#1845816). Thanks to Nicholas Guriev for
|
|
| 12 |
+ providing the patch.
|
|
| 13 |
+ * debian/copyright:
|
|
| 14 |
+ + Update copyright attributions.
|
|
| 15 |
+ |
|
| 16 |
+ -- Mike Gabriel <sunweaver@debian.org> Thu, 31 Oct 2019 21:33:36 +0100
|
|
| 17 |
+ |
|
| 1 | 18 |
mate-menu (19.10.2-1) unstable; urgency=medium
|
| 2 | 19 |
|
| 3 | 20 |
[ Martin Wimpress ]
|
| ... | ... | @@ -27,6 +27,7 @@ Depends: ${python3:Depends}, |
| 27 | 27 |
mozo | menulibre,
|
| 28 | 28 |
python3 (>= 3.3),
|
| 29 | 29 |
python3-configobj,
|
| 30 |
+ python3-gi-cairo,
|
|
| 30 | 31 |
python3-setproctitle,
|
| 31 | 32 |
python3-xdg,
|
| 32 | 33 |
python3-xlib,
|
| ... | ... | @@ -8,7 +8,6 @@ Files: README.md |
| 8 | 8 |
data/icons/ddg.png
|
| 9 | 9 |
data/icons/dictionary.png
|
| 10 | 10 |
data/icons/google.png
|
| 11 |
- data/icons/mate-logo-dark.svg
|
|
| 12 | 11 |
data/icons/wikipedia.png
|
| 13 | 12 |
data/mate-menu-config.glade
|
| 14 | 13 |
data/mate-menu.1
|
| ... | ... | @@ -48,10 +47,6 @@ Copyright: 2007-2014, Clement Lefebvre <root@linuxmint.com> |
| 48 | 47 |
2016, Sorokin Alexei <sor.alexei@meowr.ru>
|
| 49 | 48 |
License: GPL-2+
|
| 50 | 49 |
|
| 51 |
-Files: data/icons/mate-logo.svg
|
|
| 52 |
-Copyright: 2015, Doug Torrance <dtorrance@monmouthcollege.edu>
|
|
| 53 |
-License: GPL-3+
|
|
| 54 |
- |
|
| 55 | 50 |
Files: po/*
|
| 56 | 51 |
Copyright:
|
| 57 | 52 |
abuyop <abuyop@gmail.com>
|
| ... | ... | @@ -164,20 +159,3 @@ License: Expat |
| 164 | 159 |
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
| 165 | 160 |
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
| 166 | 161 |
THE SOFTWARE.
|
| 167 |
- |
|
| 168 |
-License: GPL-3+
|
|
| 169 |
- This program is free software: you can redistribute it and/or modify
|
|
| 170 |
- it under the terms of the GNU General Public License as published by
|
|
| 171 |
- the Free Software Foundation, either version 3 of the License, or
|
|
| 172 |
- (at your option) any later version.
|
|
| 173 |
- .
|
|
| 174 |
- This package is distributed in the hope that it will be useful,
|
|
| 175 |
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
| 176 |
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
| 177 |
- GNU General Public License for more details.
|
|
| 178 |
- .
|
|
| 179 |
- You should have received a copy of the GNU General Public License
|
|
| 180 |
- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
| 181 |
- .
|
|
| 182 |
- On Debian systems, the complete text of the GNU General
|
|
| 183 |
- Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
|
| 1 |
+From ff3c5a1beafc3816880dc53c33fec545e9cfc359 Mon Sep 17 00:00:00 2001
|
|
| 2 |
+From: Nicholas Guriev <guriev-ns@ya.ru>
|
|
| 3 |
+Date: Thu, 31 Oct 2019 09:28:13 +0300
|
|
| 4 |
+Subject: [PATCH] Check availability of environment variables
|
|
| 5 |
+ |
|
| 6 |
+Fixes: https://launchpad.net/bugs/1845816
|
|
| 7 |
+---
|
|
| 8 |
+ mate_menu/plugins/applications.py | 8 +++++---
|
|
| 9 |
+ 1 file changed, 5 insertions(+), 3 deletions(-)
|
|
| 10 |
+ |
|
| 11 |
+diff --git a/mate_menu/plugins/applications.py b/mate_menu/plugins/applications.py
|
|
| 12 |
+index cbf0e9a..e349378 100644
|
|
| 13 |
+--- a/mate_menu/plugins/applications.py
|
|
| 14 |
++++ b/mate_menu/plugins/applications.py
|
|
| 15 |
+@@ -49,10 +49,12 @@ def __init__(self, name, summary, description):
|
|
| 16 |
+ def get_user_item_path():
|
|
| 17 |
+ item_dir = None
|
|
| 18 |
+
|
|
| 19 |
+- if os.environ.has_key('XDG_DATA_HOME'):
|
|
| 20 |
++ if 'XDG_DATA_HOME' in os.environ:
|
|
| 21 |
+ item_dir = os.path.join(os.environ['XDG_DATA_HOME'], 'applications')
|
|
| 22 |
+- else:
|
|
| 23 |
++ elif 'HOME' in os.environ:
|
|
| 24 |
+ item_dir = os.path.join(os.environ['HOME'], '.local', 'share', 'applications')
|
|
| 25 |
++ else:
|
|
| 26 |
++ item_dir = os.path.join('/', 'tmp', 'applications')
|
|
| 27 |
+
|
|
| 28 |
+ if not os.path.isdir(item_dir):
|
|
| 29 |
+ os.makedirs(item_dir)
|
|
| 30 |
+@@ -61,7 +63,7 @@ def get_user_item_path():
|
|
| 31 |
+
|
|
| 32 |
+ def get_system_item_paths():
|
|
| 33 |
+ item_dirs = []
|
|
| 34 |
+- if os.environ.has_key('XDG_DATA_DIRS'):
|
|
| 35 |
++ if 'XDG_DATA_DIRS' in os.environ:
|
|
| 36 |
+ item_dirs = os.environ['XDG_DATA_DIRS'].split(":")
|
|
| 37 |
+ item_dirs.append(os.path.join('/usr', 'share'))
|
|
| 38 |
+ return item_dirs
|
|
| 39 |
+ |
| 1 |
+1001_check-availability-of-env-vars.patch
|