[Git][debian-mate-team/pluma][master] 2 commits: debian/patches: Drop all patches. Shipped upstream now.

[Mike Gabriel <sunweaver@debian.org>]

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / pluma

Commits:

• 8f78bbfc
  by Mike Gabriel at 2018-07-08T03:19:24+02:00

  debian/patches: Drop all patches. Shipped upstream now.
  

• a8bb222c
  by Mike Gabriel at 2018-07-08T03:22:03+02:00

  upload to unstable (debian/1.20.2-1)
  

6 changed files:

• debian/changelog
• − debian/patches/0001_disable_python_plugins.patch
• − debian/patches/0002_Fix_secondary_mouse_button_under_line_numbers.patch
• − debian/patches/0003_Fix_Pluma_crashes_with_mouse_wheel_over_a_tab.patch
• − debian/patches/0004_Fix_behavior_of_mouse_buttons_in_print_preview.patch
• − debian/patches/series

Changes:

debian/changelog

---

	1	+pluma (1.20.2-1) unstable; urgency=medium
	2	+
	3	+ * New upstream release.
	4	+ * debian/patches:
	5	+ + Drop all patches. Shipped upstream now.
	6	+ * debian/control:
	7	+ + Drop pkg-mate-team Alioth mailing list from Uploaders: field.
	8	+ * debian/copyright:
	9	+ + Make Upstream-Name: field's value more human readable.
	10	+ + Update Upstream-Contact: field.
	11	+ + Update Source: field. Use secure URLs.
	12	+ * debian/upstream/metadata:
	13	+ + Add file. Be compliant with DEP-12 proposal.
	14	+ + Use Martin's address as Contact: address.
	15	+
	16	+ -- Mike Gabriel <sunweaver@debian.org> Sun, 08 Jul 2018 03:10:32 +0200
	17	+
1	18	pluma (1.20.1-3) unstable; urgency=medium
2	19
3	20	[ Mike Gabriel ]

debian/patches/0001_disable_python_plugins.patch deleted

---

1		-Author: Wolfgang Ulbrich <mate@raveit.de>
2		-Description: Disable Python plugins because libpeas only supports Python3 and the Python plugins in Pluma only support Python2.
3		-
4		-diff --git a/configure.ac b/configure.ac
5		-index 8ccb37d..177d305 100644
6		---- a/configure.ac
7		-+++ b/configure.ac
8		-@@ -181,8 +181,6 @@ else
9		- have_introspection=no
10		- fi
11		-
12		--AM_PATH_PYTHON([2.7])
13		--
14		- dnl ================================================================
15		- dnl GSettings related settings
16		- dnl ================================================================
17		-@@ -233,21 +231,9 @@ pixmaps/Makefile
18		- plugins/Makefile
19		- plugins/changecase/Makefile
20		- plugins/docinfo/Makefile
21		--plugins/externaltools/data/Makefile
22		--plugins/externaltools/Makefile
23		--plugins/externaltools/scripts/Makefile
24		--plugins/externaltools/tools/Makefile
25		- plugins/filebrowser/Makefile
26		- plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml
27		- plugins/modelines/Makefile
28		--plugins/pythonconsole/Makefile
29		--plugins/pythonconsole/pythonconsole/Makefile
30		--plugins/quickopen/Makefile
31		--plugins/quickopen/quickopen/Makefile
32		--plugins/snippets/data/lang/Makefile
33		--plugins/snippets/data/Makefile
34		--plugins/snippets/Makefile
35		--plugins/snippets/snippets/Makefile
36		- plugins/sort/Makefile
37		- plugins/spell/Makefile
38		- plugins/spell/org.mate.pluma.plugins.spell.gschema.xml
39		-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
40		-index 28ae891..c80139c 100644
41		---- a/plugins/Makefile.am
42		-+++ b/plugins/Makefile.am
43		-@@ -1,12 +1,8 @@
44		- DIST_SUBDIRS = \
45		- changecase \
46		- docinfo \
47		-- externaltools \
48		- filebrowser \
49		- modelines \
50		-- pythonconsole \
51		-- quickopen \
52		-- snippets \
53		- sort \
54		- spell \
55		- taglist \
56		-@@ -16,12 +12,8 @@ DIST_SUBDIRS = \
57		- SUBDIRS = \
58		- changecase \
59		- docinfo \
60		-- externaltools \
61		- filebrowser \
62		- modelines \
63		-- pythonconsole \
64		-- quickopen \
65		-- snippets \
66		- sort \
67		- taglist \
68		- time \

debian/patches/0002_Fix_secondary_mouse_button_under_line_numbers.patch deleted

---

1		-From a28da51ba62baded1ea23e6ae9f4c907d443b242 Mon Sep 17 00:00:00 2001
2		-From: Pablo Barciela <scow@riseup.net>
3		-Date: Mon, 23 Apr 2018 21:48:52 +0200
4		-Subject: [PATCH] Fix secondary mouse button under line numbers
5		-
6		----
7		- pluma/pluma-view.c | 22 +++++++++++-----------
8		- 1 file changed, 11 insertions(+), 11 deletions(-)
9		-
10		-diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c
11		-index 4ebc093..5cc9251 100644
12		---- a/pluma/pluma-view.c
13		-+++ b/pluma/pluma-view.c
14		-@@ -1997,17 +1997,6 @@ show_line_numbers_menu (GtkWidget *view,
15		- static gboolean
16		- pluma_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
17		- {
18		-- if ((event->button == 2) || (event->button == 3))
19		-- {
20		-- if (middle_or_right_down)
21		-- {
22		-- middle_or_right_down = FALSE;
23		-- return TRUE;
24		-- }
25		-- else
26		-- middle_or_right_down = TRUE;
27		-- }
28		--
29		- if ((event->type == GDK_BUTTON_PRESS) &&
30		- (event->window == gtk_text_view_get_window (GTK_TEXT_VIEW (widget),
31		- GTK_TEXT_WINDOW_LEFT)))
32		-@@ -2021,6 +2010,17 @@ pluma_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
33		- return TRUE;
34		- }
35		-
36		-+ if ((event->button == 2) || (event->button == 3))
37		-+ {
38		-+ if (middle_or_right_down)
39		-+ {
40		-+ middle_or_right_down = FALSE;
41		-+ return TRUE;
42		-+ }
43		-+ else
44		-+ middle_or_right_down = TRUE;
45		-+ }
46		-+
47		- if ((event->type == GDK_2BUTTON_PRESS) && (event->button == 1) &&
48		- (event->window == gtk_text_view_get_window (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_TEXT)))
49		- return TRUE;

debian/patches/0003_Fix_Pluma_crashes_with_mouse_wheel_over_a_tab.patch deleted

---

1		-From cced651e89d44f2119fd0fe29435141e4d57bbe8 Mon Sep 17 00:00:00 2001
2		-From: Pablo Barciela <scow@riseup.net>
3		-Date: Mon, 21 May 2018 15:22:32 +0200
4		-Subject: [PATCH] Fix: Pluma crashes with mouse wheel over a tab
5		-
6		-Fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898637
7		----
8		- pluma/pluma-notebook.c | 14 --------------
9		- pluma/pluma-tab-label.c | 20 --------------------
10		- 2 files changed, 34 deletions(-)
11		-
12		-diff --git a/pluma/pluma-notebook.c b/pluma/pluma-notebook.c
13		-index 5b8f388..39502ec 100644
14		---- a/pluma/pluma-notebook.c
15		-+++ b/pluma/pluma-notebook.c
16		-@@ -864,16 +864,6 @@ close_button_clicked_cb (PlumaTabLabel *tab_label, PlumaNotebook *notebook)
17		- g_signal_emit (notebook, signals[TAB_CLOSE_REQUEST], 0, tab);
18		- }
19		-
20		--static gboolean
21		--tab_label_scroll_cb (PlumaTabLabel *tab_label,
22		-- GdkEventScroll *event,
23		-- PlumaNotebook *notebook)
24		--{
25		-- g_signal_emit_by_name (notebook, "scroll-event", &event);
26		--
27		-- return FALSE;
28		--}
29		--
30		- static GtkWidget *
31		- create_tab_label (PlumaNotebook *nb,
32		- PlumaTab *tab)
33		-@@ -886,10 +876,6 @@ create_tab_label (PlumaNotebook *nb,
34		- "close-clicked",
35		- G_CALLBACK (close_button_clicked_cb),
36		- nb);
37		-- g_signal_connect (tab_label,
38		-- "scroll-event",
39		-- G_CALLBACK (tab_label_scroll_cb),
40		-- nb);
41		-
42		- g_object_set_data (G_OBJECT (tab), "tab-label", tab_label);
43		-
44		-diff --git a/pluma/pluma-tab-label.c b/pluma/pluma-tab-label.c
45		-index b1b3026..5130507 100644
46		---- a/pluma/pluma-tab-label.c
47		-+++ b/pluma/pluma-tab-label.c
48		-@@ -114,16 +114,6 @@ close_button_clicked_cb (GtkWidget *widget,
49		- g_signal_emit (tab_label, signals[CLOSE_CLICKED], 0, NULL);
50		- }
51		-
52		--static gboolean
53		--scroll_event_cb(GtkWidget *widget,
54		-- GdkEventScroll *event,
55		-- PlumaTabLabel *tab_label)
56		--{
57		-- g_signal_emit_by_name(tab_label, "scroll-event", &event);
58		--
59		-- return FALSE;
60		--}
61		--
62		- static void
63		- sync_tip (PlumaTab *tab, PlumaTabLabel *tab_label)
64		- {
65		-@@ -294,16 +284,6 @@ pluma_tab_label_init (PlumaTabLabel *tab_label)
66		- G_CALLBACK (close_button_clicked_cb),
67		- tab_label);
68		-
69		-- g_signal_connect (close_button,
70		-- "scroll-event",
71		-- G_CALLBACK (scroll_event_cb),
72		-- tab_label);
73		--
74		-- g_signal_connect (ebox,
75		-- "scroll-event",
76		-- G_CALLBACK (scroll_event_cb),
77		-- tab_label);
78		--
79		- spinner = gtk_spinner_new ();
80		- gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
81		- tab_label->priv->spinner = spinner;

debian/patches/0004_Fix_behavior_of_mouse_buttons_in_print_preview.patch deleted

---

1		-From 4d80780137c159de4c3cef82bcd2dacf82edb6a6 Mon Sep 17 00:00:00 2001
2		-From: Pablo Barciela <scow@riseup.net>
3		-Date: Tue, 22 May 2018 20:06:03 +0200
4		-Subject: [PATCH] pluma-print-preview: Fix weird behavior with mouse buttons
5		-
6		-Fixes https://github.com/mate-desktop/pluma/issues/321
7		----
8		- pluma/pluma-print-preview.c | 18 ++++++++++++++++++
9		- 1 file changed, 18 insertions(+)
10		-
11		-diff --git a/pluma/pluma-print-preview.c b/pluma/pluma-print-preview.c
12		-index 22a98ba..dead749 100644
13		---- a/pluma/pluma-print-preview.c
14		-+++ b/pluma/pluma-print-preview.c
15		-@@ -538,6 +538,14 @@ close_button_clicked (GtkWidget *button,
16		- gtk_widget_destroy (GTK_WIDGET (preview));
17		- }
18		-
19		-+static gboolean
20		-+ignore_mouse_buttons (GtkWidget *widget,
21		-+ GdkEventKey *event,
22		-+ PlumaPrintPreview *preview)
23		-+{
24		-+ return TRUE;
25		-+}
26		-+
27		- static void
28		- create_bar (PlumaPrintPreview *preview)
29		- {
30		-@@ -705,6 +713,11 @@ create_bar (PlumaPrintPreview *preview)
31		- G_CALLBACK (close_button_clicked), preview);
32		- gtk_widget_show (GTK_WIDGET (i));
33		- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), i, -1);
34		-+
35		-+ g_signal_connect (GTK_TOOLBAR (toolbar),
36		-+ "button-press-event",
37		-+ G_CALLBACK (ignore_mouse_buttons),
38		-+ preview);
39		- }
40		-
41		- static gint
42		-@@ -972,6 +985,11 @@ create_preview_layout (PlumaPrintPreview *preview)
43		- G_CALLBACK (preview_layout_query_tooltip),
44		- preview);
45		-
46		-+ g_signal_connect (priv->layout,
47		-+ "button-press-event",
48		-+ G_CALLBACK (ignore_mouse_buttons),
49		-+ preview);
50		-+
51		- priv->scrolled_window = gtk_scrolled_window_new (NULL, NULL);
52		- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window),
53		- GTK_POLICY_AUTOMATIC,

debian/patches/series deleted

---

1		-0001_disable_python_plugins.patch
2		-0002_Fix_secondary_mouse_button_under_line_numbers.patch
3		-0003_Fix_Pluma_crashes_with_mouse_wheel_over_a_tab.patch
4		-0004_Fix_behavior_of_mouse_buttons_in_print_preview.patch

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.