diff -Nru evince-2.30.1/debian/changelog evince-2.30.1/debian/changelog
--- evince-2.30.1/debian/changelog	2010-06-18 23:21:53.000000000 +0100
+++ evince-2.30.1/debian/changelog	2010-06-19 01:38:20.000000000 +0100
@@ -1,20 +1,8 @@
-evince (2.30.1-3ubuntu2ppa3) maverick; urgency=low
+evince (2.30.1-3ubuntu2ppa4) maverick; urgency=low
 
-  * Really disable 03_select-fir5_lcd_filter.patch.
+  * Add 02_revert_render_to_ARGB32.patch.
 
- -- Tobias Wolf <towolf@gmail.com>  Sat, 19 Jun 2010 00:21:32 +0200
-
-evince (2.30.1-3ubuntu2ppa2) maverick; urgency=low
-
-  * Disable 03_select-fir5_lcd_filter.patch.
-
- -- Tobias Wolf <towolf@gmail.com>  Fri, 18 Jun 2010 20:30:47 +0200
-
-evince (2.30.1-3ubuntu2ppa1) maverick; urgency=low
-
-  *  Add 02_revert_render_to_ARGB32.patch, 03_select-fir5_lcd_filter.patch.
-
- -- Tobias Wolf <towolf@gmail.com>  Wed, 09 Jun 2010 18:43:53 +0200
+ -- Tobias Wolf <towolf@gmail.com>  Sat, 19 Jun 2010 02:38:11 +0200
 
 evince (2.30.1-3ubuntu2) maverick; urgency=low
 
diff -Nru evince-2.30.1/debian/control evince-2.30.1/debian/control
--- evince-2.30.1/debian/control	2010-06-18 23:21:57.000000000 +0100
+++ evince-2.30.1/debian/control	2010-06-19 01:38:24.000000000 +0100
@@ -8,7 +8,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/evince/ubuntu
 Build-Depends: cdbs,
                debhelper (>= 5),
diff -Nru evince-2.30.1/debian/patches/debian-changes-2.30.1-3ubuntu2ppa3 evince-2.30.1/debian/patches/debian-changes-2.30.1-3ubuntu2ppa3
--- evince-2.30.1/debian/patches/debian-changes-2.30.1-3ubuntu2ppa3	2010-06-18 23:21:59.000000000 +0100
+++ evince-2.30.1/debian/patches/debian-changes-2.30.1-3ubuntu2ppa3	1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-Description: Upstream changes introduced in version 2.30.1-3ubuntu2ppa3
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- evince (2.30.1-3ubuntu2ppa3) maverick; urgency=low
- .
-   * Really disable 03_select-fir5_lcd_filter.patch.
- .
- The person named in the Author field signed this changelog entry.
-Author: Tobias Wolf <towolf@gmail.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- evince-2.30.1.orig/backend/pdf/ev-poppler.cc
-+++ evince-2.30.1/backend/pdf/ev-poppler.cc
-@@ -379,14 +379,20 @@ pdf_page_render (PopplerPage     *page,
- 
- #ifdef HAVE_POPPLER_PAGE_RENDER
- 	cairo_t *cr;
-+  cairo_font_options_t *options;
- 	
- 	surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
- 					      width, height);
- 	memset (cairo_image_surface_get_data (surface), 0xff,
- 		cairo_image_surface_get_height (surface) *
- 		cairo_image_surface_get_stride (surface));
-+  options = cairo_font_options_create ();
-+  cairo_surface_get_font_options (surface, options);
-+  cairo_font_options_set_lcd_filter (options, CAIRO_LCD_FILTER_FIR5);
- 	
- 	cr = cairo_create (surface);
-+  cairo_set_font_options (cr, options);
-+  cairo_font_options_destroy (options);
- 	switch (rc->rotation) {
- 	        case 90:
- 			cairo_translate (cr, width, 0);
diff -Nru evince-2.30.1/debian/patches/debian-changes-2.30.1-3ubuntu2ppa4 evince-2.30.1/debian/patches/debian-changes-2.30.1-3ubuntu2ppa4
--- evince-2.30.1/debian/patches/debian-changes-2.30.1-3ubuntu2ppa4	1970-01-01 01:00:00.000000000 +0100
+++ evince-2.30.1/debian/patches/debian-changes-2.30.1-3ubuntu2ppa4	2010-06-19 01:38:25.000000000 +0100
@@ -0,0 +1,115 @@
+Description: Upstream changes introduced in version 2.30.1-3ubuntu2ppa4
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ evince (2.30.1-3ubuntu2ppa4) maverick; urgency=low
+ .
+   * Add 02_revert_render_to_ARGB32.patch.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Tobias Wolf <towolf@gmail.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- evince-2.30.1.orig/configure.ac
++++ evince-2.30.1/configure.ac
+@@ -170,7 +170,7 @@ case "$with_platform" in
+         ;;
+ esac
+ 
+-PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
++PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
+ 
+ # *********
+ # SM client
+--- evince-2.30.1.orig/shell/main.c
++++ evince-2.30.1/shell/main.c
+@@ -143,6 +143,28 @@ launch_previewer (void)
+ 	return retval;
+ }
+ 
++static gchar *
++get_label_from_filename (const gchar *filename)
++{
++	GFile   *file;
++	gchar   *label;
++	gboolean exists;
++
++	label = g_strrstr (filename, "#");
++	if (!label)
++		return NULL;
++
++	/* Filename contains a #, check
++	 * whether it's part of the path
++	 * or a label
++	 */
++	file = g_file_new_for_commandline_arg (filename);
++	exists = g_file_query_exists (file, NULL);
++	g_object_unref (file);
++
++	return exists ? NULL : label;
++}
++
+ static void
+ load_files (const char **files)
+ {
+@@ -174,7 +196,7 @@ load_files (const char **files)
+ 		const gchar *app_uri;
+ 
+ 		filename = files[i];
+-		label = strchr (filename, '#');
++		label = get_label_from_filename (filename);
+ 		if (label) {
+ 			*label = 0;
+ 			label++;
+--- evince-2.30.1.orig/shell/ev-window.c
++++ evince-2.30.1/shell/ev-window.c
+@@ -30,6 +30,8 @@
+ #include "config.h"
+ #endif
+ 
++#include <launchpad-integration.h>
++
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -6107,7 +6109,7 @@ ev_window_create_last_settings_metadata
+ 	GFile *file;
+ 	gchar *path;
+ 
+-	path = g_build_filename (ev_application_get_dot_dir (EV_APP, FALSE), "last_settings", NULL);
++	path = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE), "last_settings", NULL);
+ 	file = g_file_new_for_path (path);
+ 	g_free (path);
+ 
+@@ -6232,6 +6234,8 @@ ev_window_init (EvWindow *ev_window)
+ 	ev_window->priv->menubar =
+ 		 gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+ 					    "/MainMenu");
++	launchpad_integration_add_ui (ev_window->priv->ui_manager,
++				      "/MainMenu/HelpMenu/LaunchpadItems");
+ 	gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
+ 			    ev_window->priv->menubar,
+ 			    FALSE, FALSE, 0);
+--- evince-2.30.1.orig/data/evince-ui.xml
++++ evince-2.30.1/data/evince-ui.xml
+@@ -60,6 +60,7 @@
+ 
+     <menu name="HelpMenu" action="Help">
+       <menuitem name="HelpContentsMenu" action="HelpContents"/>
++      <placeholder name="LaunchpadItems" />
+       <menuitem name="HelpAboutMenu" action="HelpAbout"/>
+     </menu>
+   </menubar>
diff -Nru evince-2.30.1/debian/patches/series evince-2.30.1/debian/patches/series
--- evince-2.30.1/debian/patches/series	2010-06-18 23:21:59.000000000 +0100
+++ evince-2.30.1/debian/patches/series	2010-06-19 01:38:25.000000000 +0100
@@ -1,5 +1,2 @@
-01_dotdir_crash.patch
-01_lpi.patch
-03_fix_opening_hash_filename.patch
 02_revert_render_to_ARGB32.patch
-debian-changes-2.30.1-3ubuntu2ppa3
+debian-changes-2.30.1-3ubuntu2ppa4