Commits:
-
f63af8bc
by Mike Gabriel at 2022-11-13T21:08:10+01:00
prepare new upstream release(v1.26.1)
-
d49bfdf0
by Mike Gabriel at 2022-11-13T21:09:43+01:00
debian/patches: Add 1001_marco-Add-cmdline-option-no-keybindings-for-disablin.patch.
-
4cb917dd
by Mike Gabriel at 2022-11-13T21:13:07+01:00
debian/control: Add B-D: libxres-dev.
-
8e79fe5b
by Mike Gabriel at 2022-11-13T21:13:42+01:00
debian/control: Bump Standards-Version: to 4.6.1. No changes needed.
-
88dad652
by Mike Gabriel at 2022-11-13T21:24:04+01:00
debian/copyright: Update attributions for debian/.
-
0cd8099a
by Mike Gabriel at 2022-11-13T21:24:22+01:00
lintian: Update tag syntax.
-
b7cd821f
by Mike Gabriel at 2022-11-13T21:29:05+01:00
upload to unstable (debian/1.26.1-1)
6 changed files:
Changes:
debian/changelog
|
|
1
|
+marco (1.26.1-1) unstable; urgency=medium
|
|
|
2
|
+
|
|
|
3
|
+ * New upstream release.
|
|
|
4
|
+ * debian/patches:
|
|
|
5
|
+ + Add 1001_marco-Add-cmdline-option-no-keybindings-for-disablin.patch.
|
|
|
6
|
+ Add cmdline option --no-keybindings for disabling key bindings
|
|
|
7
|
+ directly on WM startup.
|
|
|
8
|
+ * debian/control:
|
|
|
9
|
+ + Add B-D: libxres-dev.
|
|
|
10
|
+ + Bump Standards-Version: to 4.6.1. No changes needed.
|
|
|
11
|
+ * debian/copyright:
|
|
|
12
|
+ + Update attributions for debian/.
|
|
|
13
|
+ * lintian: Update tag syntax.
|
|
|
14
|
+
|
|
|
15
|
+ -- Mike Gabriel <sunweaver@debian.org> Sun, 13 Nov 2022 21:28:36 +0100
|
|
|
16
|
+
|
|
1
|
17
|
marco (1.26.0-2) unstable; urgency=medium
|
|
2
|
18
|
|
|
3
|
19
|
[ Martin Wimpress ]
|
debian/control
| ... |
... |
@@ -27,12 +27,13 @@ Build-Depends: autoconf-archive, |
|
27
|
27
|
libxinerama-dev,
|
|
28
|
28
|
libxrandr-dev,
|
|
29
|
29
|
libxrender-dev,
|
|
|
30
|
+ libxres-dev,
|
|
30
|
31
|
libxt-dev,
|
|
31
|
32
|
mate-common (>= 1.18),
|
|
32
|
33
|
x11proto-present-dev,
|
|
33
|
34
|
yelp-tools,
|
|
34
|
35
|
zenity,
|
|
35
|
|
-Standards-Version: 4.6.0
|
|
|
36
|
+Standards-Version: 4.6.1
|
|
36
|
37
|
Rules-Requires-Root: no
|
|
37
|
38
|
Homepage: http://www.mate-desktop.org/
|
|
38
|
39
|
Vcs-Browser: https://salsa.debian.org/debian-mate-team/marco
|
debian/copyright
| ... |
... |
@@ -426,7 +426,7 @@ Comment: |
|
426
|
426
|
|
|
427
|
427
|
Files: debian/*
|
|
428
|
428
|
Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
|
|
429
|
|
- 2014, Mike Gabriel <sunweaver@debian.org>
|
|
|
429
|
+ 2014-2022, Mike Gabriel <sunweaver@debian.org>
|
|
430
|
430
|
License: GPL-2+ or LGPL-2+ or MIT-OpenGroup
|
|
431
|
431
|
|
|
432
|
432
|
License: GPL-2+
|
debian/libmarco-private2.lintian-overrides
|
1
|
1
|
# discussed with upstream and considered as wanted / unproblematic
|
|
2
|
|
-libmarco-private2: exit-in-shared-library usr/lib/x86_64-linux-gnu/libmarco-private.so.2.0.0 |
|
|
\ No newline at end of file |
|
|
2
|
+libmarco-private2: exit-in-shared-library [usr/lib/x86_64-linux-gnu/libmarco-private.so.2.0.0] |
debian/patches/1001_marco-Add-cmdline-option-no-keybindings-for-disablin.patch
|
|
1
|
+From e29e44be77e289623ce7ab4333e571ea2b7a31ed Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
3
|
+Date: Mon, 28 Mar 2022 08:07:49 +0200
|
|
|
4
|
+Subject: [PATCH] marco: Add cmdline option --no-keybindings for disabling all
|
|
|
5
|
+ key bindings directly on WM startup.
|
|
|
6
|
+
|
|
|
7
|
+Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
8
|
+---
|
|
|
9
|
+ doc/man/marco.1 | 3 +++
|
|
|
10
|
+ src/core/main.c | 10 ++++++++++
|
|
|
11
|
+ 2 files changed, 13 insertions(+)
|
|
|
12
|
+
|
|
|
13
|
+--- a/doc/man/marco.1
|
|
|
14
|
++++ b/doc/man/marco.1
|
|
|
15
|
+@@ -45,6 +45,9 @@
|
|
|
16
|
+ \fB\-\-no\-force\-fullscreen\fR
|
|
|
17
|
+ Do not create fullscreen windows without decorations.
|
|
|
18
|
+ .TP
|
|
|
19
|
++\fB\-\-no\-keybindings\fR
|
|
|
20
|
++Have all keybindings disabled on startup.
|
|
|
21
|
++.TP
|
|
|
22
|
+ \fB\-\-version\fR
|
|
|
23
|
+ Print current version information and exit.
|
|
|
24
|
+ .TP
|
|
|
25
|
+--- a/src/core/main.c
|
|
|
26
|
++++ b/src/core/main.c
|
|
|
27
|
+@@ -51,6 +51,7 @@
|
|
|
28
|
+ #include "util.h"
|
|
|
29
|
+ #include "display-private.h"
|
|
|
30
|
+ #include "errors.h"
|
|
|
31
|
++#include "keybindings.h"
|
|
|
32
|
+ #include "ui.h"
|
|
|
33
|
+ #include "session.h"
|
|
|
34
|
+ #include "prefs.h"
|
|
|
35
|
+@@ -211,6 +212,7 @@
|
|
|
36
|
+ gboolean composite;
|
|
|
37
|
+ gboolean no_composite;
|
|
|
38
|
+ gboolean no_force_fullscreen;
|
|
|
39
|
++ gboolean no_keybindings;
|
|
|
40
|
+ } MetaArguments;
|
|
|
41
|
+
|
|
|
42
|
+ #ifdef HAVE_COMPOSITE_EXTENSIONS
|
|
|
43
|
+@@ -298,6 +300,12 @@
|
|
|
44
|
+ N_("Don't make fullscreen windows that are maximized and have no decorations"),
|
|
|
45
|
+ NULL
|
|
|
46
|
+ },
|
|
|
47
|
++ {
|
|
|
48
|
++ "no-keybindings", 0, 0, G_OPTION_ARG_NONE,
|
|
|
49
|
++ &my_args.no_keybindings,
|
|
|
50
|
++ N_("Have all keybindings disabled on startup"),
|
|
|
51
|
++ NULL
|
|
|
52
|
++ },
|
|
|
53
|
+ {NULL}
|
|
|
54
|
+ };
|
|
|
55
|
+ GOptionContext *ctx;
|
|
|
56
|
+@@ -550,6 +558,9 @@
|
|
|
57
|
+ if (meta_args.no_force_fullscreen)
|
|
|
58
|
+ meta_prefs_set_force_fullscreen (FALSE);
|
|
|
59
|
+
|
|
|
60
|
++ if (meta_args.no_keybindings)
|
|
|
61
|
++ meta_set_keybindings_disabled (TRUE);
|
|
|
62
|
++
|
|
|
63
|
+ if (!meta_display_open ())
|
|
|
64
|
+ meta_exit (META_EXIT_ERROR);
|
|
|
65
|
+ |
debian/patches/series
|
1
|
1
|
|
|
2
|
2
|
0000_shadows.patch
|
|
|
3
|
+1001_marco-Add-cmdline-option-no-keybindings-for-disablin.patch |
|