diff -Nru evince-3.10.3/debian/changelog evince-3.10.3/debian/changelog
--- evince-3.10.3/debian/changelog	2014-03-11 17:40:42.000000000 +0000
+++ evince-3.10.3/debian/changelog	2017-07-12 06:00:28.000000000 +0000
@@ -1,3 +1,30 @@
+evince (3.10.3-0ubuntu10.3) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: command injection via cbt files
+    - debian/patches/CVE-2017-1000083.patch: disable cbt support
+      entirely as not widely used.
+    - CVE-2017-1000083
+
+ -- Steve Beattie <sbeattie@ubuntu.com>  Tue, 11 Jul 2017 23:00:19 -0700
+
+evince (3.10.3-0ubuntu10.2) trusty; urgency=medium
+
+  * debian/patches/slash_to_search.patch: register "slash" as a valid
+    keybinding to start a search (lp: #1328678)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 09 Mar 2015 19:02:51 +0100
+
+evince (3.10.3-0ubuntu10.1) trusty; urgency=medium
+
+  * debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch:
+    - use the correct "previous/next page" tooltips (lp: #1318581)
+
+  [ Lars Uebernickel ]
+  * restore keybindings that stopped working with the gmenumodel work
+    (lp: #1313250, #1310782, #1312179)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 03 Jun 2014 16:25:15 +0200
+
 evince (3.10.3-0ubuntu10) trusty; urgency=medium
 
   [ Lars Uebernickel ]
diff -Nru evince-3.10.3/debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch evince-3.10.3/debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch
--- evince-3.10.3/debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch	2014-03-11 17:40:42.000000000 +0000
+++ evince-3.10.3/debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch	2014-06-03 14:31:29.000000000 +0000
@@ -30,8 +30,8 @@
 
 Index: evince-3.10.3/shell/Makefile.am
 ===================================================================
---- evince-3.10.3.orig/shell/Makefile.am	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/Makefile.am	2014-03-11 17:15:56.517258733 +0100
+--- evince-3.10.3.orig/shell/Makefile.am	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/Makefile.am	2014-04-28 15:33:25.022869346 +0200
 @@ -75,6 +75,8 @@
  	ev-sidebar-page.h		\
  	ev-sidebar-thumbnails.c		\
@@ -59,8 +59,8 @@
  	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev $<
 Index: evince-3.10.3/shell/ev-application.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-application.c	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-application.c	2014-03-11 17:16:13.333258985 +0100
+--- evince-3.10.3.orig/shell/ev-application.c	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-application.c	2014-04-28 15:33:30.000000000 +0200
 @@ -42,6 +42,9 @@
  #include "ev-application.h"
  #include "ev-file-helpers.h"
@@ -180,7 +180,7 @@
 +          "win.sizing-mode::fit-width", "w", NULL,
 +          "win.open-menu",              "F10", NULL,
 +          "win.caret-navigation",       "F7", NULL,
-+          "win.zoom-in",                "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
++          "win.zoom-in",                "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", "equal", NULL,
 +          "win.zoom-out",               "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
 +          "win.show-side-pane",         "F9", NULL,
 +          "win.fullscreen",             "F11", NULL,
@@ -447,8 +447,8 @@
 +}
 Index: evince-3.10.3/shell/ev-application.h
 ===================================================================
---- evince-3.10.3.orig/shell/ev-application.h	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-application.h	2014-03-11 17:15:56.521258733 +0100
+--- evince-3.10.3.orig/shell/ev-application.h	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-application.h	2014-04-28 15:33:25.022869346 +0200
 @@ -81,6 +81,14 @@
                                                        GdkScreen       *screen,
                                                        const char      *topic);
@@ -466,8 +466,8 @@
  #endif /* !EV_APPLICATION_H */
 Index: evince-3.10.3/shell/ev-bookmarks.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-bookmarks.c	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-bookmarks.c	2014-03-11 17:15:56.521258733 +0100
+--- evince-3.10.3.orig/shell/ev-bookmarks.c	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-bookmarks.c	2014-04-28 15:33:25.026869346 +0200
 @@ -224,6 +224,14 @@
          return g_list_copy (bookmarks->items);
  }
@@ -485,8 +485,8 @@
                    EvBookmark  *bookmark)
 Index: evince-3.10.3/shell/ev-bookmarks.h
 ===================================================================
---- evince-3.10.3.orig/shell/ev-bookmarks.h	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-bookmarks.h	2014-03-11 17:15:56.521258733 +0100
+--- evince-3.10.3.orig/shell/ev-bookmarks.h	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-bookmarks.h	2014-04-28 15:33:25.026869346 +0200
 @@ -43,6 +43,7 @@
  GType        ev_bookmarks_get_type      (void) G_GNUC_CONST;
  EvBookmarks *ev_bookmarks_new           (EvMetadata *metadata);
@@ -498,7 +498,7 @@
 Index: evince-3.10.3/shell/ev-recent-menu-model.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ evince-3.10.3/shell/ev-recent-menu-model.c	2014-03-11 17:15:56.521258733 +0100
++++ evince-3.10.3/shell/ev-recent-menu-model.c	2014-04-28 15:33:25.026869346 +0200
 @@ -0,0 +1,108 @@
 +/*
 + * Copyright 2014 Canonical Ltd
@@ -611,7 +611,7 @@
 Index: evince-3.10.3/shell/ev-recent-menu-model.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ evince-3.10.3/shell/ev-recent-menu-model.h	2014-03-11 17:15:56.521258733 +0100
++++ evince-3.10.3/shell/ev-recent-menu-model.h	2014-04-28 15:33:25.026869346 +0200
 @@ -0,0 +1,30 @@
 +/*
 + * Copyright 2014 Canonical Ltd
@@ -645,8 +645,8 @@
 +#endif
 Index: evince-3.10.3/shell/ev-sidebar-bookmarks.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c	2014-03-11 17:15:56.521258733 +0100
+--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-sidebar-bookmarks.c	2014-04-28 15:33:25.026869346 +0200
 @@ -40,11 +40,6 @@
          N_COLUMNS
  };
@@ -716,8 +716,8 @@
  GtkWidget *
 Index: evince-3.10.3/shell/ev-toolbar.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-toolbar.c	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-toolbar.c	2014-03-11 17:15:56.521258733 +0100
+--- evince-3.10.3.orig/shell/ev-toolbar.c	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-toolbar.c	2014-04-28 15:33:25.026869346 +0200
 @@ -24,9 +24,12 @@
  
  #include "ev-toolbar.h"
@@ -881,14 +881,14 @@
 -        action = gtk_action_group_get_action (action_group, "GoPreviousPage");
 -        button = ev_toolbar_create_button (ev_toolbar, action);
 +        button = ev_toolbar_create_button (ev_toolbar, "win.go-previous-page",
-+                                           "go-up-symbolic", _("Go to the next page"));
++                                           "go-up-symbolic", _("Go to the previous page"));
          gtk_container_add (GTK_CONTAINER (hbox), button);
          gtk_widget_show (button);
  
 -        action = gtk_action_group_get_action (action_group, "GoNextPage");
 -        button = ev_toolbar_create_button (ev_toolbar, action);
 +        button = ev_toolbar_create_button (ev_toolbar, "win.go-next-page",
-+                                           "go-down-symbolic", _("Go to the previous page"));
++                                           "go-down-symbolic", _("Go to the next page"));
          gtk_container_add (GTK_CONTAINER (hbox), button);
          gtk_widget_show (button);
  
@@ -984,8 +984,8 @@
  static void
 Index: evince-3.10.3/shell/ev-utils.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-utils.c	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-utils.c	2014-03-11 17:15:56.521258733 +0100
+--- evince-3.10.3.orig/shell/ev-utils.c	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-utils.c	2014-04-28 15:33:25.030869346 +0200
 @@ -22,6 +22,7 @@
  
  #include "ev-utils.h"
@@ -1087,8 +1087,8 @@
 +}
 Index: evince-3.10.3/shell/ev-utils.h
 ===================================================================
---- evince-3.10.3.orig/shell/ev-utils.h	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-utils.h	2014-03-11 17:15:56.521258733 +0100
+--- evince-3.10.3.orig/shell/ev-utils.h	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-utils.h	2014-04-28 15:33:25.030869346 +0200
 @@ -42,6 +42,13 @@
  void           		file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
  GdkPixbufFormat* 	get_gdk_pixbuf_format_by_extension (const gchar *uri);
@@ -1105,8 +1105,8 @@
  #endif /* __EV_VIEW_H__ */
 Index: evince-3.10.3/shell/ev-window.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-window.c	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-window.c	2014-03-11 17:15:56.525258733 +0100
+--- evince-3.10.3.orig/shell/ev-window.c	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-window.c	2014-04-28 15:33:37.626869432 +0200
 @@ -87,10 +87,10 @@
  #include "ev-print-operation.h"
  #include "ev-progress-message-area.h"
@@ -1906,7 +1906,7 @@
  		break;
  	case GTK_RESPONSE_NO:
  		gtk_widget_destroy (GTK_WIDGET (ev_window));
-@@ -3823,64 +3503,81 @@
+@@ -3823,64 +3503,86 @@
  }
  
  static void
@@ -1930,6 +1930,7 @@
 -	GtkAction *action;
 -	
 +	EvWindow *window = user_data;
++	GtkAction *page_action;
 +
  	update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);
  	update_chrome_visibility (window);
@@ -1937,6 +1938,10 @@
 -	action = gtk_action_group_get_action (window->priv->action_group,
 -				     	      PAGE_SELECTOR_ACTION);
 -	ev_page_action_grab_focus (EV_PAGE_ACTION (action));
++
++	page_action = gtk_action_group_get_action (window->priv->action_group,
++						   PAGE_SELECTOR_ACTION);
++	ev_page_action_grab_focus (EV_PAGE_ACTION (page_action));
  }
  
  static void
@@ -2012,7 +2017,7 @@
  }
  
  static void
-@@ -3897,9 +3594,27 @@
+@@ -3897,9 +3599,27 @@
  }
  
  static void
@@ -2043,7 +2048,7 @@
  }
  
  static void
-@@ -3916,12 +3631,6 @@
+@@ -3916,12 +3636,6 @@
  }
  
  static void
@@ -2056,7 +2061,7 @@
  ev_window_cmd_view_zoom_automatic (GtkAction *action,
  				   EvWindow  *ev_window)
  {
-@@ -3957,29 +3666,28 @@
+@@ -3957,29 +3671,28 @@
  }
  
  static void
@@ -2096,7 +2101,7 @@
  }
  
  static void
-@@ -4004,8 +3712,11 @@
+@@ -4004,8 +3717,11 @@
  }
  
  static void
@@ -2109,7 +2114,7 @@
  	gboolean find_bar_hidden;
  
  	if (EV_WINDOW_IS_PRESENTATION (ev_window))
-@@ -4029,8 +3740,11 @@
+@@ -4029,8 +3745,11 @@
  }
  
  static void
@@ -2122,7 +2127,7 @@
  	gboolean find_bar_hidden;
  
  	if (EV_WINDOW_IS_PRESENTATION (ev_window))
-@@ -4047,9 +3761,11 @@
+@@ -4047,9 +3766,11 @@
  }
  
  static void
@@ -2136,7 +2141,7 @@
  
  	ev_view_copy (EV_VIEW (ev_window->priv->view));
  }
-@@ -4067,15 +3783,12 @@
+@@ -4067,15 +3788,12 @@
  static void
  ev_window_update_fullscreen_action (EvWindow *window)
  {
@@ -2157,7 +2162,7 @@
  }
  
  static void
-@@ -4292,16 +4005,19 @@
+@@ -4292,16 +4010,19 @@
  }
  
  static void
@@ -2181,7 +2186,7 @@
  }
  
  static void
-@@ -4336,15 +4052,11 @@
+@@ -4336,15 +4057,11 @@
  static void
  ev_window_update_presentation_action (EvWindow *window)
  {
@@ -2201,7 +2206,7 @@
  }
  
  static void
-@@ -4459,14 +4171,17 @@
+@@ -4459,14 +4176,17 @@
  }
  
  static void
@@ -2223,7 +2228,7 @@
  }
  
  static gboolean
-@@ -4530,10 +4245,12 @@
+@@ -4530,10 +4250,12 @@
  	ev_window_update_actions_sensitivity (window);
  }
  
@@ -2238,7 +2243,7 @@
  	gint rotation;
  
  	if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
-@@ -4548,8 +4265,11 @@
+@@ -4548,8 +4270,11 @@
  }
  
  static void
@@ -2251,7 +2256,7 @@
  	gint rotation;
  
  	if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
-@@ -4564,16 +4284,23 @@
+@@ -4564,16 +4289,23 @@
  }
  
  static void
@@ -2279,7 +2284,7 @@
  	EvWindowPrivate *priv = ev_window->priv;
  	EvDocumentModel *model = priv->model;
  	GSettings       *settings = priv->default_settings;
-@@ -4582,7 +4309,7 @@
+@@ -4582,7 +4314,7 @@
  	g_settings_set_boolean (settings, "continuous",
  				ev_document_model_get_continuous (model));
  	g_settings_set_boolean (settings, "dual-page",
@@ -2288,7 +2293,7 @@
  	g_settings_set_boolean (settings, "dual-page-odd-left",
  				ev_document_model_get_dual_page_odd_pages_left (model));
  	g_settings_set_boolean (settings, "fullscreen",
-@@ -4607,59 +4334,78 @@
+@@ -4607,59 +4339,78 @@
  }
  
  static void
@@ -2385,7 +2390,7 @@
  	int n_pages, current_page;
  	
          g_return_if_fail (EV_IS_WINDOW (ev_window));
-@@ -4673,11 +4419,14 @@
+@@ -4673,11 +4424,14 @@
  }
  
  static void
@@ -2403,7 +2408,7 @@
  
  	current_page = ev_document_model_get_page (ev_window->priv->model);
  	
-@@ -4686,15 +4435,6 @@
+@@ -4686,15 +4440,6 @@
  	}
  }
  
@@ -2419,7 +2424,7 @@
  static gint
  compare_bookmarks (EvBookmark *a,
  		   EvBookmark *b)
-@@ -4705,59 +4445,33 @@
+@@ -4705,59 +4450,33 @@
  static void
  ev_window_setup_bookmarks (EvWindow *window)
  {
@@ -2494,7 +2499,7 @@
  	EvBookmark bm;
  	gchar     *page_label;
  
-@@ -4771,32 +4485,41 @@
+@@ -4771,32 +4490,41 @@
  }
  
  static void
@@ -2548,7 +2553,7 @@
  	ev_view_autoscroll_stop (EV_VIEW (window->priv->view));
  
  	if (gtk_widget_get_visible (window->priv->find_bar))
-@@ -4890,29 +4613,20 @@
+@@ -4890,29 +4618,20 @@
  }
  
  static void
@@ -2586,7 +2591,7 @@
  }
  
  static void
-@@ -4930,27 +4644,16 @@
+@@ -4930,27 +4649,16 @@
  }
  
  static void
@@ -2618,7 +2623,7 @@
  
  	if (window->priv->metadata && !ev_window_is_empty (window))
  		ev_metadata_set_boolean (window->priv->metadata, "inverted-colors",
-@@ -4960,43 +4663,20 @@
+@@ -4960,43 +4668,20 @@
  }
  
  static void
@@ -2669,7 +2674,7 @@
  }
  
  static void
-@@ -5004,119 +4684,36 @@
+@@ -5004,119 +4689,36 @@
  					       GParamSpec      *pspec,
  					       EvWindow        *ev_window)
  {
@@ -2804,7 +2809,7 @@
  	update_chrome_visibility (ev_window);
  }
  
-@@ -5137,14 +4734,11 @@
+@@ -5137,14 +4739,11 @@
  					 GParamSpec *pspec,
  					 EvWindow   *ev_window)
  {
@@ -2821,7 +2826,7 @@
  
  		if (ev_window->priv->metadata)
  			ev_metadata_set_boolean (ev_window->priv->metadata, "sidebar_visibility",
-@@ -5154,14 +4748,10 @@
+@@ -5154,14 +4753,10 @@
  	}
  }
  
@@ -2837,7 +2842,7 @@
  	if (ev_window->priv->link)
  		g_object_unref (ev_window->priv->link);
  	
-@@ -5178,42 +4768,23 @@
+@@ -5178,42 +4773,23 @@
  			switch (ev_link_action_get_action_type (ev_action)) {
  		                case EV_LINK_ACTION_TYPE_GOTO_DEST:
  		                case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
@@ -2887,7 +2892,7 @@
  	if (ev_window->priv->image)
  		g_object_unref (ev_window->priv->image);
  	
-@@ -5222,38 +4793,22 @@
+@@ -5222,38 +4798,22 @@
  	else	
  		ev_window->priv->image = NULL;
  
@@ -2928,7 +2933,7 @@
  			if (ev_window->priv->attach_list) {
  				g_list_foreach (ev_window->priv->attach_list,
  						(GFunc) g_object_unref, NULL);
-@@ -5263,16 +4818,43 @@
+@@ -5263,16 +4823,43 @@
  			ev_window->priv->attach_list =
  				g_list_prepend (ev_window->priv->attach_list,
  						g_object_ref (attachment));
@@ -2979,7 +2984,7 @@
  }
  
  static gboolean
-@@ -5280,34 +4862,44 @@
+@@ -5280,34 +4867,44 @@
  		    GList    *items,
  		    EvWindow *ev_window)
  {
@@ -3043,7 +3048,7 @@
  	return TRUE;
  }
  
-@@ -5316,8 +4908,6 @@
+@@ -5316,8 +4913,6 @@
  			      GList           *attach_list,
  			      EvWindow        *ev_window)
  {
@@ -3052,7 +3057,7 @@
  	g_assert (attach_list != NULL);
  
  	if (ev_window->priv->attach_list) {
-@@ -5325,13 +4915,19 @@
+@@ -5325,13 +4920,19 @@
  				(GFunc) g_object_unref, NULL);
  		g_list_free (ev_window->priv->attach_list);
  	}
@@ -3077,7 +3082,7 @@
  			3, gtk_get_current_event_time ());
  
  	return TRUE;
-@@ -5542,21 +5138,6 @@
+@@ -5542,21 +5143,6 @@
  }
  
  static void
@@ -3099,7 +3104,7 @@
  ev_window_show_find_bar (EvWindow *ev_window)
  {
  	if (gtk_widget_get_visible (ev_window->priv->find_bar)) {
-@@ -5583,7 +5164,7 @@
+@@ -5583,7 +5169,7 @@
  	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
  	update_chrome_visibility (ev_window);
  	gtk_widget_grab_focus (ev_window->priv->find_bar);
@@ -3108,7 +3113,7 @@
  }
  
  static void
-@@ -5601,7 +5182,7 @@
+@@ -5601,7 +5187,7 @@
  	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE);
  	update_chrome_visibility (ev_window);
  	gtk_widget_grab_focus (ev_window->priv->view);
@@ -3117,7 +3122,7 @@
  
  	ev_history_thaw (ev_window->priv->history);
  }
-@@ -5651,10 +5232,15 @@
+@@ -5651,10 +5237,15 @@
  ev_window_set_caret_navigation_enabled (EvWindow *window,
  					gboolean enabled)
  {
@@ -3133,7 +3138,7 @@
  }
  
  static void
-@@ -5668,7 +5254,7 @@
+@@ -5668,7 +5259,7 @@
  
  	/* Turn the confirmation dialog off if the user has requested not to show it again */
  	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (window->priv->ask_caret_navigation_check))) {
@@ -3142,7 +3147,7 @@
  		g_settings_apply (window->priv->settings);
  	}
  
-@@ -5678,9 +5264,11 @@
+@@ -5678,9 +5269,11 @@
  }
  
  static void
@@ -3156,7 +3161,7 @@
  	GtkWidget *message_area;
  	GtkWidget *box;
  	GtkWidget *hbox;
-@@ -5689,7 +5277,7 @@
+@@ -5689,7 +5282,7 @@
  	/* Don't ask for user confirmation to turn the caret navigation off when it is active,
  	 * or to turn it on when the confirmation dialog is not to be shown per settings */
  	enabled = ev_view_is_caret_navigation_enabled (EV_VIEW (window->priv->view));
@@ -3165,7 +3170,7 @@
  		ev_window_set_caret_navigation_enabled (window, !enabled);
  		return;
  	}
-@@ -5793,40 +5381,24 @@
+@@ -5793,40 +5386,24 @@
  		priv->action_group = NULL;
  	}
  
@@ -3212,7 +3217,7 @@
  	if (priv->default_settings) {
  		g_settings_apply (priv->default_settings);
  		g_object_unref (priv->default_settings);
-@@ -5838,8 +5410,6 @@
+@@ -5838,8 +5415,6 @@
  		priv->lockdown_settings = NULL;
  	}
  
@@ -3221,7 +3226,7 @@
  	if (priv->model) {
  		g_signal_handlers_disconnect_by_func (priv->model,
  						      ev_window_page_changed_cb,
-@@ -5955,7 +5525,6 @@
+@@ -5955,7 +5530,6 @@
  	G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
  }
  
@@ -3229,7 +3234,7 @@
  /*
   * GtkWindow catches keybindings for the menu items _before_ passing them to
   * the focused widget. This is unfortunate and means that pressing Ctrl+a,
-@@ -6012,206 +5581,6 @@
+@@ -6012,206 +5586,6 @@
  	g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
  }
  
@@ -3436,7 +3441,7 @@
  static const GtkToggleActionEntry zoom_selector_popup_actions[] = {
  	{ "ViewFitPage", EV_STOCK_ZOOM_PAGE, N_("Fit Pa_ge"), NULL,
  	  N_("Make the current document fill the window"),
-@@ -6276,13 +5645,6 @@
+@@ -6276,13 +5650,6 @@
  }
  
  static void
@@ -3450,7 +3455,7 @@
  zoom_action_activated_cb (EvZoomAction *action,
  			  EvWindow     *window)
  {
-@@ -6378,42 +5740,6 @@
+@@ -6378,42 +5745,6 @@
  }
  
  static void
@@ -3493,7 +3498,7 @@
  sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
  			  GParamSpec     *pspec,
  			  EvWindow       *ev_window)
-@@ -6647,21 +5973,21 @@
+@@ -6647,21 +5978,21 @@
  	const gchar *name = ev_link_action_get_name (action);
  
  	if (g_ascii_strcasecmp (name, "FirstPage") == 0) {
@@ -3523,7 +3528,7 @@
  	} else {
  		g_warning ("Unimplemented named action: %s, please post a "
  		           "bug report in Evince bugzilla "
-@@ -6702,14 +6028,21 @@
+@@ -6702,14 +6033,21 @@
  }
  
  static void
@@ -3547,7 +3552,7 @@
  	EvLinkAction *ev_action = NULL;
  	EvLinkDest   *dest;
  
-@@ -6725,8 +6058,11 @@
+@@ -6725,8 +6063,11 @@
  }
  
  static void
@@ -3560,7 +3565,7 @@
  	EvLinkAction *ev_action;
  
  	ev_action = ev_link_get_action (window->priv->link);
-@@ -6782,8 +6118,8 @@
+@@ -6782,8 +6123,8 @@
  		return;
  	}
  
@@ -3571,7 +3576,7 @@
  
  	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
  	filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (fc));
-@@ -6862,8 +6198,11 @@
+@@ -6862,8 +6203,11 @@
  }
  
  static void
@@ -3584,7 +3589,7 @@
  	GtkWidget *fc;
  
  	if (!window->priv->image)
-@@ -6887,9 +6226,9 @@
+@@ -6887,9 +6231,9 @@
  	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
  	
  	file_chooser_dialog_add_writable_pixbuf_formats	(GTK_FILE_CHOOSER (fc));
@@ -3597,7 +3602,7 @@
  
  	g_signal_connect (fc, "response",
  			  G_CALLBACK (image_save_dialog_response_cb),
-@@ -6899,8 +6238,11 @@
+@@ -6899,8 +6243,11 @@
  }
  
  static void
@@ -3610,7 +3615,7 @@
  	GtkClipboard *clipboard;
  	GdkPixbuf    *pixbuf;
  
-@@ -6919,9 +6261,11 @@
+@@ -6919,9 +6266,11 @@
  }
  
  static void
@@ -3624,7 +3629,7 @@
  	const gchar                  *author;
  	GdkRGBA                       rgba;
  	gdouble                       opacity;
-@@ -6980,8 +6324,11 @@
+@@ -6980,8 +6329,11 @@
  }
  
  static void
@@ -3637,7 +3642,7 @@
  	GList     *l;
  	GdkScreen *screen;
  	
-@@ -7023,8 +6370,8 @@
+@@ -7023,8 +6375,8 @@
  		return;
  	}
  
@@ -3648,7 +3653,7 @@
  
  	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
  	target_file = g_file_new_for_uri (uri);
-@@ -7089,8 +6436,11 @@
+@@ -7089,8 +6441,11 @@
  }
  
  static void
@@ -3661,7 +3666,7 @@
  	GtkWidget    *fc;
  	EvAttachment *attachment = NULL;
  
-@@ -7122,8 +6472,8 @@
+@@ -7122,8 +6477,8 @@
  		gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc),
  						   ev_attachment_get_name (attachment));
  
@@ -3672,7 +3677,7 @@
  
  	g_signal_connect (fc, "response",
  			  G_CALLBACK (attachment_save_dialog_response_cb),
-@@ -7154,16 +6504,16 @@
+@@ -7154,16 +6509,16 @@
  		if (EV_WINDOW_IS_PRESENTATION (window))
  			ev_view_presentation_previous_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
  		else
@@ -3693,7 +3698,7 @@
  	}
  }
  
-@@ -7278,11 +6628,84 @@
+@@ -7278,11 +6633,84 @@
  }
  
  static void
@@ -3778,7 +3783,7 @@
  	GError *error = NULL;
  	GtkWidget *sidebar_widget;
  	GtkWidget *overlay;
-@@ -7343,6 +6766,8 @@
+@@ -7343,6 +6771,8 @@
  			  G_CALLBACK (activate_link_cb),
  			  ev_window);
  
@@ -3787,7 +3792,7 @@
  	app_info = g_app_info_get_default_for_uri_scheme ("mailto");
  	ev_window->priv->has_mailto_handler = app_info != NULL;
  	g_clear_object (&app_info);
-@@ -7351,15 +6776,13 @@
+@@ -7351,15 +6781,13 @@
  	gtk_container_add (GTK_CONTAINER (ev_window), ev_window->priv->main_box);
  	gtk_widget_show (ev_window->priv->main_box);
  
@@ -3807,7 +3812,7 @@
  	register_custom_actions (ev_window, action_group);
  
  	ev_window->priv->ui_manager = gtk_ui_manager_new ();
-@@ -7370,24 +6793,6 @@
+@@ -7370,24 +6798,6 @@
  		gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
  	gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
  
@@ -3832,7 +3837,7 @@
  	action_group = gtk_action_group_new ("ZoomSelectorPopupActions");
  	ev_window->priv->zoom_selector_popup_action_group = action_group;
  	gtk_action_group_set_translation_domain (action_group, NULL);
-@@ -7397,10 +6802,10 @@
+@@ -7397,10 +6807,10 @@
  	gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
  					    action_group, 0);
  
@@ -3847,7 +3852,7 @@
  
  	ev_window_register_zoom_selector_popup_actions (ev_window);
  
-@@ -7415,12 +6820,6 @@
+@@ -7415,12 +6825,6 @@
  	g_object_unref (css_provider);
  
  	ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
@@ -3860,7 +3865,7 @@
  
  	ev_window->priv->toolbar = ev_toolbar_new (ev_window);
  	gtk_widget_set_no_show_all (ev_window->priv->toolbar, TRUE);
-@@ -7526,10 +6925,6 @@
+@@ -7526,10 +6930,6 @@
  
  	sidebar_widget = ev_sidebar_bookmarks_new ();
  	ev_window->priv->sidebar_bookmarks = sidebar_widget;
@@ -3871,7 +3876,7 @@
  	gtk_widget_show (sidebar_widget);
  	ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
  			     sidebar_widget);
-@@ -7565,7 +6960,7 @@
+@@ -7565,7 +6965,7 @@
  	g_object_set(ev_window->priv->view, "enable-gestures",
  		     _oif_ev_application_get_gestures_enabled (EV_APP), NULL);
  #endif
@@ -3880,7 +3885,7 @@
  					     GS_PAGE_CACHE_SIZE);
  	ev_view_set_page_cache_size (EV_VIEW (ev_window->priv->view),
  				     page_cache_mb * 1024 * 1024);
-@@ -7707,13 +7102,17 @@
+@@ -7707,13 +7107,17 @@
  			  G_CALLBACK (find_bar_visibility_changed_cb),
  			  ev_window);
  
@@ -3903,7 +3908,7 @@
  	ev_window->priv->attach_list = NULL;
  
  	/* Media player keys */
-@@ -7731,9 +7130,6 @@
+@@ -7731,9 +7135,6 @@
  	g_settings_delay (ev_window->priv->default_settings);
  	ev_window_setup_default (ev_window);
  
@@ -3913,7 +3918,7 @@
  	gtk_window_set_default_size (GTK_WINDOW (ev_window), 600, 600);
  
          ev_window_sizing_mode_changed_cb (ev_window->priv->model, NULL, ev_window);
-@@ -7745,6 +7141,8 @@
+@@ -7745,6 +7146,8 @@
  			   NULL, 0,
  			   GDK_ACTION_COPY);
  	gtk_drag_dest_add_uri_targets (GTK_WIDGET (ev_window));
@@ -3922,7 +3927,7 @@
  }
  
  /**
-@@ -7762,7 +7160,6 @@
+@@ -7762,7 +7165,6 @@
  	ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
  					      "type", GTK_WINDOW_TOPLEVEL,
                                                "application", g_application_get_default (),
@@ -3930,7 +3935,7 @@
  					      NULL));
  
  	return ev_window;
-@@ -7801,3 +7198,11 @@
+@@ -7801,3 +7203,11 @@
  
  	return ev_window->priv->zoom_selector_popup_action_group;
  }
@@ -3944,8 +3949,8 @@
 +}
 Index: evince-3.10.3/shell/ev-window.h
 ===================================================================
---- evince-3.10.3.orig/shell/ev-window.h	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/ev-window.h	2014-03-11 17:15:56.525258733 +0100
+--- evince-3.10.3.orig/shell/ev-window.h	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/ev-window.h	2014-04-28 15:33:25.034869346 +0200
 @@ -89,7 +89,7 @@
  GtkUIManager   *ev_window_get_ui_manager                 (EvWindow       *ev_window);
  GtkActionGroup *ev_window_get_main_action_group          (EvWindow       *ev_window);
@@ -3957,8 +3962,8 @@
  
 Index: evince-3.10.3/shell/evince-appmenu.ui
 ===================================================================
---- evince-3.10.3.orig/shell/evince-appmenu.ui	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/evince-appmenu.ui	2014-03-11 17:15:56.525258733 +0100
+--- evince-3.10.3.orig/shell/evince-appmenu.ui	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/evince-appmenu.ui	2014-04-28 15:33:25.034869346 +0200
 @@ -20,6 +20,16 @@
    <menu id="appmenu">
      <section>
@@ -3978,8 +3983,8 @@
          <attribute name="accel">F1</attribute>
 Index: evince-3.10.3/shell/evince-ui.xml
 ===================================================================
---- evince-3.10.3.orig/shell/evince-ui.xml	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/evince-ui.xml	2014-03-11 17:15:56.525258733 +0100
+--- evince-3.10.3.orig/shell/evince-ui.xml	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/evince-ui.xml	2014-04-28 15:33:25.034869346 +0200
 @@ -1,86 +1,4 @@
  <ui>
 -  <popup name="ActionMenu" accelerators="true">
@@ -4102,8 +4107,8 @@
 +
 Index: evince-3.10.3/shell/evince.gresource.xml
 ===================================================================
---- evince-3.10.3.orig/shell/evince.gresource.xml	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/shell/evince.gresource.xml	2014-03-11 17:15:56.525258733 +0100
+--- evince-3.10.3.orig/shell/evince.gresource.xml	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/shell/evince.gresource.xml	2014-04-28 15:33:25.034869346 +0200
 @@ -19,6 +19,8 @@
    <gresource prefix="/org/gnome/evince/shell">
      <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
@@ -4117,7 +4122,7 @@
 Index: evince-3.10.3/shell/menus.ui
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ evince-3.10.3/shell/menus.ui	2014-03-11 17:16:00.000000000 +0100
++++ evince-3.10.3/shell/menus.ui	2014-04-28 15:33:30.000000000 +0200
 @@ -0,0 +1,188 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
@@ -4310,7 +4315,7 @@
 Index: evince-3.10.3/shell/traditional-menus.ui
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ evince-3.10.3/shell/traditional-menus.ui	2014-03-11 17:15:56.525258733 +0100
++++ evince-3.10.3/shell/traditional-menus.ui	2014-04-28 15:33:25.034869346 +0200
 @@ -0,0 +1,230 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
@@ -4544,8 +4549,8 @@
 +</interface>
 Index: evince-3.10.3/po/POTFILES.in
 ===================================================================
---- evince-3.10.3.orig/po/POTFILES.in	2014-03-11 17:15:56.533258733 +0100
-+++ evince-3.10.3/po/POTFILES.in	2014-03-11 17:15:56.525258733 +0100
+--- evince-3.10.3.orig/po/POTFILES.in	2014-04-28 15:33:25.038869346 +0200
++++ evince-3.10.3/po/POTFILES.in	2014-04-28 15:33:25.034869346 +0200
 @@ -56,3 +56,6 @@
  shell/ev-window-title.c
  shell/main.c
@@ -4556,7 +4561,7 @@
 Index: evince-3.10.3/shell/popup-menus.ui
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ evince-3.10.3/shell/popup-menus.ui	2014-03-11 17:15:56.525258733 +0100
++++ evince-3.10.3/shell/popup-menus.ui	2014-04-28 15:33:25.034869346 +0200
 @@ -0,0 +1,114 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
diff -Nru evince-3.10.3/debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch evince-3.10.3/debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch
--- evince-3.10.3/debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch	2014-03-11 17:40:42.000000000 +0000
+++ evince-3.10.3/debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch	2014-06-03 14:31:29.000000000 +0000
@@ -14,23 +14,33 @@
  shell/menus.ui         | 22 ++++++++++++++++++++++
  2 files changed, 23 insertions(+), 1 deletion(-)
 
-diff --git a/shell/ev-application.c b/shell/ev-application.c
-index e2d87af..2c4b7b3 100644
---- a/shell/ev-application.c
-+++ b/shell/ev-application.c
-@@ -1176,7 +1176,7 @@ ev_application_startup (GApplication *gapplication)
+Index: evince-3.10.3/shell/ev-application.c
+===================================================================
+--- evince-3.10.3.orig/shell/ev-application.c	2014-04-29 16:09:07.319931409 +0200
++++ evince-3.10.3/shell/ev-application.c	2014-04-29 16:09:33.031931585 +0200
+@@ -1193,7 +1193,17 @@
          it = action_accels;
          while (it[0])
            {
 -            gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]);
-+            gtk_application_add_accelerator (GTK_APPLICATION (application), it[1], it[0], NULL);
++            gchar *action;
++            GVariant *target;
++
++            if (g_action_parse_detailed_name (it[0], &action, &target, NULL))
++              {
++                gtk_application_add_accelerator (GTK_APPLICATION (application), it[1], action, target);
++
++                g_free (action);
++                if (target)
++                  g_variant_unref (target);
++              }
              it += g_strv_length ((gchar **) it) + 1;
            }
  }
-diff --git a/shell/menus.ui b/shell/menus.ui
-index c3006f8..1d9a32e 100644
---- a/shell/menus.ui
-+++ b/shell/menus.ui
+Index: evince-3.10.3/shell/menus.ui
+===================================================================
+--- evince-3.10.3.orig/shell/menus.ui	2014-04-29 16:09:07.319931409 +0200
++++ evince-3.10.3/shell/menus.ui	2014-04-29 16:09:07.311931409 +0200
 @@ -23,6 +23,7 @@
        <item>
          <attribute name="label" translatable="yes">_Open</attribute>
@@ -181,6 +191,3 @@
        </item>
      </section>
      <section>
--- 
-1.9.rc1
-
diff -Nru evince-3.10.3/debian/patches/CVE-2017-1000083.patch evince-3.10.3/debian/patches/CVE-2017-1000083.patch
--- evince-3.10.3/debian/patches/CVE-2017-1000083.patch	1970-01-01 00:00:00.000000000 +0000
+++ evince-3.10.3/debian/patches/CVE-2017-1000083.patch	2017-07-12 05:59:47.000000000 +0000
@@ -0,0 +1,93 @@
+From 717df38fd8509bf883b70d680c9b1b3cf36732ee Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 6 Jul 2017 20:02:00 +0200
+Subject: [PATCH] comics: Remove support for tar and tar-like commands
+
+When handling tar files, or using a command with tar-compatible syntax,
+to open comic-book archives, both the archive name (the name of the
+comics file) and the filename (the name of a page within the archive)
+are quoted to not be interpreted by the shell.
+
+But the filename is completely with the attacker's control and can start
+with "--" which leads to tar interpreting it as a command line flag.
+
+This can be exploited by creating a CBT file (a tar archive with the
+.cbt suffix) with an embedded file named something like this:
+"--checkpoint-action=exec=bash -c 'touch ~/hacked;'.jpg"
+
+CBT files are infinitely rare (CBZ is usually used for DRM-free
+commercial releases, CBR for those from more dubious provenance), so
+removing support is the easiest way to avoid the bug triggering. All
+this code was rewritten in the development release for GNOME 3.26 to not
+shell out to any command, closing off this particular attack vector.
+
+This also removes the ability to use libarchive's bsdtar-compatible
+binary for CBZ (ZIP), CB7 (7zip), and CBR (RAR) formats. The first two
+are already supported by unzip and 7zip respectively. libarchive's RAR
+support is limited, so unrar is a requirement anyway.
+
+Discovered by Felix Wilhelm from the Google Security Team.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784630
+
+[backported to evince 3.10 -- sbeattie]
+
+CVE-2017-1000083
+---
+ backend/comics/comics-document.c |   40 ---------------------------------------
+ configure.ac                     |    2 -
+ 2 files changed, 2 insertions(+), 40 deletions(-)
+
+Index: b/backend/comics/comics-document.c
+===================================================================
+--- a/backend/comics/comics-document.c
++++ b/backend/comics/comics-document.c
+@@ -56,8 +56,7 @@ typedef enum
+ 	RARLABS,
+ 	GNAUNRAR,
+ 	UNZIP,
+-	P7ZIP,
+-	TAR
++	P7ZIP
+ } ComicBookDecompressType;
+ 
+ typedef struct _ComicsDocumentClass ComicsDocumentClass;
+@@ -117,9 +116,6 @@ static const ComicBookDecompressCommand
+ 
+         /* 7zip */
+ 	{NULL               , "%s l -- %s"     , "%s x -y %s -o%s", FALSE, OFFSET_7Z},
+-
+-        /* tar */
+-	{"%s -xOf"          , "%s -tf %s"      , NULL             , FALSE, NO_OFFSET}
+ };
+ 
+ static GSList*    get_supported_image_extensions (void);
+@@ -422,15 +405,6 @@ comics_check_decompress_command	(gchar
+ 			comics_document->command_usage = P7ZIP;
+ 			return TRUE;
+ 		}
+-	} else if (!strcmp (mime_type, "application/x-cbt") ||
+-		   !strcmp (mime_type, "application/x-tar")) {
+-		/* tar utility (Tape ARchive) */
+-		comics_document->selected_command =
+-				g_find_program_in_path ("tar");
+-		if (comics_document->selected_command) {
+-			comics_document->command_usage = TAR;
+-			return TRUE;
+-		}
+ 	} else {
+ 		g_set_error (error,
+ 			     EV_DOCUMENT_ERROR,
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -785,7 +785,7 @@ AC_SUBST(TIFF_MIME_TYPES)
+ 	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/tiff;"
+ fi
+ if test "x$enable_comics" = "xyes"; then
+-	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;"
++	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;"
+ fi
+ if test "x$enable_xps" = "xyes"; then
+    	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/oxps;application/vnd.ms-xpsdocument;"
diff -Nru evince-3.10.3/debian/patches/gtk310-secondary-keybindings.patch evince-3.10.3/debian/patches/gtk310-secondary-keybindings.patch
--- evince-3.10.3/debian/patches/gtk310-secondary-keybindings.patch	2014-03-11 17:40:42.000000000 +0000
+++ evince-3.10.3/debian/patches/gtk310-secondary-keybindings.patch	2014-06-03 14:31:29.000000000 +0000
@@ -1,4 +1,4 @@
-From 92845bc09910884a4762102897244bcb45d7c46f Mon Sep 17 00:00:00 2001
+From 24c0293b4d520193553d99f1423b9e0394eec0ef Mon Sep 17 00:00:00 2001
 From: Lars Uebernickel <lars.uebernickel@canonical.com>
 Date: Tue, 11 Mar 2014 17:00:02 +0100
 Subject: [PATCH] Add secondary (and tertiary) keybindings
@@ -9,15 +9,15 @@
 new function that can handle setting multiple accels for a single
 action.
 ---
- shell/ev-application.c | 9 +++++++++
- shell/ev-window.c      | 9 +++++++++
- 2 files changed, 18 insertions(+)
+ shell/ev-application.c | 10 ++++++++++
+ shell/ev-window.c      | 10 ++++++++++
+ 2 files changed, 20 insertions(+)
 
-Index: evince-3.10.3/shell/ev-application.c
-===================================================================
---- evince-3.10.3.orig/shell/ev-application.c	2014-03-11 17:17:53.065260481 +0100
-+++ evince-3.10.3/shell/ev-application.c	2014-03-11 17:17:53.057260481 +0100
-@@ -1110,6 +1110,7 @@
+diff --git a/shell/ev-application.c b/shell/ev-application.c
+index 4493b1e..65064b1 100644
+--- a/shell/ev-application.c
++++ b/shell/ev-application.c
+@@ -1093,6 +1093,7 @@ ev_application_startup (GApplication *gapplication)
            "win.save-copy",              "<Ctrl>S", NULL,
            "win.print",                  "<Ctrl>P", NULL,
            "win.copy",                   "<Ctrl>C", "<Ctrl>Insert", NULL,
@@ -25,7 +25,7 @@
            "win.select-all",             "<Ctrl>A", NULL,
            "win.save-settings",          "<Ctrl>T", NULL,
            "win.go-first-page",          "<Ctrl>Home", NULL,
-@@ -1124,13 +1125,21 @@
+@@ -1107,13 +1108,22 @@ ev_application_startup (GApplication *gapplication)
            "win.go-backward",            "<Shift>Page_Up", NULL,
            "win.go-forward",             "<Shift>Page_Down", NULL,
            "win.go-next-page",           "<Ctrl>Page_Down", "n", NULL,
@@ -36,10 +36,11 @@
            "win.sizing-mode::fit-width", "w", NULL,
            "win.open-menu",              "F10", NULL,
            "win.caret-navigation",       "F7", NULL,
-           "win.zoom-in",                "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
+           "win.zoom-in",                "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", "equal", NULL,
 +          "win.zoom-in2",               "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
 +          "win.zoom-in3",               "KP_Add", "<Ctrl>KP_Add", NULL,
 +          "win.zoom-in4",               "<Ctrl>KP_Add", NULL,
++          "win.zoom-in5",               "equal", NULL,
            "win.zoom-out",               "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
 +          "win.zoom-out2",              "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
 +          "win.zoom-out3",              "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
@@ -47,11 +48,11 @@
            "win.show-side-pane",         "F9", NULL,
            "win.fullscreen",             "F11", NULL,
            "win.presentation",           "F5", NULL,
-Index: evince-3.10.3/shell/ev-window.c
-===================================================================
---- evince-3.10.3.orig/shell/ev-window.c	2014-03-11 17:17:53.065260481 +0100
-+++ evince-3.10.3/shell/ev-window.c	2014-03-11 17:17:53.057260481 +0100
-@@ -6658,10 +6658,13 @@
+diff --git a/shell/ev-window.c b/shell/ev-window.c
+index fc2258e..9f685fa 100644
+--- a/shell/ev-window.c
++++ b/shell/ev-window.c
+@@ -6658,10 +6658,13 @@ ev_window_init (EvWindow *ev_window)
  		{ "print", ev_window_activate_print_action, NULL, NULL, NULL },
  		{ "show-properties", ev_window_activate_show_properties_action, NULL, NULL, NULL },
  		{ "copy", ev_window_activate_copy_action, NULL, NULL, NULL },
@@ -65,13 +66,14 @@
  		{ "go-first-page", ev_window_activate_go_first_page_action, NULL, NULL, NULL },
  		{ "go-last-page", ev_window_activate_go_last_page_action, NULL, NULL, NULL },
  		{ "go-forward", ev_window_activate_go_forward_action, NULL, NULL, NULL },
-@@ -6680,7 +6683,13 @@
+@@ -6680,7 +6683,14 @@ ev_window_init (EvWindow *ev_window)
  		{ "rotate-left", ev_window_activate_rotate_left_action, NULL, NULL, NULL },
  		{ "rotate-right", ev_window_activate_rotate_right_action, NULL, NULL, NULL },
  		{ "zoom-in", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
 +		{ "zoom-in2", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
 +		{ "zoom-in3", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
 +		{ "zoom-in4", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
++		{ "zoom-in5", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
  		{ "zoom-out", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
 +		{ "zoom-out2", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
 +		{ "zoom-out3", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
@@ -79,3 +81,6 @@
  		{ "reload", ev_window_activate_reload_action, NULL, NULL, NULL },
  		{ "auto-scroll", ev_window_activate_auto_scroll_action, NULL, NULL, NULL },
  		{ "add-bookmark", ev_window_activate_add_bookmark_action, NULL, NULL, NULL },
+-- 
+1.9.1
+
diff -Nru evince-3.10.3/debian/patches/series evince-3.10.3/debian/patches/series
--- evince-3.10.3/debian/patches/series	2014-03-11 17:40:42.000000000 +0000
+++ evince-3.10.3/debian/patches/series	2017-07-12 05:55:11.000000000 +0000
@@ -3,3 +3,5 @@
 0001-Port-to-GMenuModel-and-add-menu-bar.patch
 0002-Don-t-use-gtk_application_set_accels_for_action.patch
 gtk310-secondary-keybindings.patch
+slash_to_search.patch
+CVE-2017-1000083.patch
diff -Nru evince-3.10.3/debian/patches/slash_to_search.patch evince-3.10.3/debian/patches/slash_to_search.patch
--- evince-3.10.3/debian/patches/slash_to_search.patch	1970-01-01 00:00:00.000000000 +0000
+++ evince-3.10.3/debian/patches/slash_to_search.patch	2015-03-09 18:02:45.000000000 +0000
@@ -0,0 +1,24 @@
+Index: evince-3.10.3/shell/ev-application.c
+===================================================================
+--- evince-3.10.3.orig/shell/ev-application.c
++++ evince-3.10.3/shell/ev-application.c
+@@ -1119,6 +1119,7 @@ ev_application_startup (GApplication *ga
+           "win.close",                  "<Ctrl>W", NULL,
+           "win.escape",                 "Escape", NULL,
+           "win.find",                   "<Ctrl>F", "slash", NULL,
++          "win.find2",                  "slash", NULL,
+           "win.find-next",              "<Ctrl>G", NULL,
+           "win.find-previous",          "<Ctrl><Shift>G", NULL,
+           "win.select-page",            "<Ctrl>L", NULL,
+Index: evince-3.10.3/shell/ev-window.c
+===================================================================
+--- evince-3.10.3.orig/shell/ev-window.c
++++ evince-3.10.3/shell/ev-window.c
+@@ -6675,6 +6675,7 @@ ev_window_init (EvWindow *ev_window)
+ 		{ "go-forward", ev_window_activate_go_forward_action, NULL, NULL, NULL },
+ 		{ "go-backwards", ev_window_activate_go_backward_action, NULL, NULL, NULL },
+ 		{ "find", activate_toggle_action, NULL, "false", ev_window_change_find_action_state },
++		{ "find2", activate_toggle_action, NULL, "false", ev_window_change_find_action_state },
+ 		{ "find-next", ev_window_activate_find_next_action, NULL, NULL, NULL },
+ 		{ "find-previous", ev_window_activate_find_previous_action, NULL, NULL, NULL },
+ 		{ "select-page", ev_window_activate_select_page_action, NULL, NULL, NULL },