diff -u evince-2.30.1/debian/apparmor-profile.abstraction evince-2.30.1/debian/apparmor-profile.abstraction --- evince-2.30.1/debian/apparmor-profile.abstraction +++ evince-2.30.1/debian/apparmor-profile.abstraction @@ -88,6 +88,11 @@ /**.[bB][zZ]2 r, /**.[cC][bB][rRzZ7] r, + # removable media and filesystems + owner /media/** w, + owner /mnt/** w, + owner /srv/** w, + # Use abstractions/private-files instead of abstractions/private-files-strict # and add the sensitive files manually to work around LP: #451422. The goal # is to disallow access to the .mozilla folder in general, but to allow diff -u evince-2.30.1/debian/changelog evince-2.30.1/debian/changelog --- evince-2.30.1/debian/changelog +++ evince-2.30.1/debian/changelog @@ -1,11 +1,22 @@ -evince (2.30.1-0ubuntu2ppa1) lucid; urgency=low +evince (2.30.1-0ubuntu3ppa1) lucid; urgency=low - * Add 02_revert_render_to_ARGB32.patch, 03_select-fir5_lcd_filter.patch. + * Add 04_revert_render_to_ARGB32.patch, 05_select-fir5_lcd_filter.patch + -- Tobias Wolf Thu, 03 Jun 2010 13:17:39 +0200 - -- Tobias Wolf Thu, 06 May 2010 22:52:39 +0200 +evince (2.30.1-0ubuntu3) lucid-proposed; urgency=low -evince (2.30.1-0ubuntu2) lucid-proposed; urgency=low + [ Jamie Strandboge ] + * debian/apparmor-profile.abstraction: allow writes to removable media + (LP: #490230) + + [ Didier Roche ] + * debian/patches/03_fix_opening_hash_filename.patch: + Fix opening files with '#' in its name (LP: #578996) + + -- Didier Roche Thu, 13 May 2010 16:31:06 +0200 + +evince (2.30.1-0ubuntu2) UNRELEASED; urgency=low * add debian/patches/02_fix_dot_dir_creation.patch: fix dot dir creation when launching evince directly (LP: #571725) reverted: --- evince-2.30.1/debian/patches/02_revert_render_to_ARGB32.patch +++ evince-2.30.1.orig/debian/patches/02_revert_render_to_ARGB32.patch @@ -1,32 +0,0 @@ ---- evince-2.27.90/backend/pdf/ev-poppler.cc 2009-06-30 11:26:29.000000000 +0200 -+++ evince-2.27.90.new/backend/pdf/ev-poppler.cc 2009-08-14 15:53:34.777179306 +0200 -@@ -487,11 +487,14 @@ - - #ifdef HAVE_POPPLER_PAGE_RENDER - cairo_t *cr; -- -- surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, -+ -+ 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)); -+ - cr = cairo_create (surface); -- - switch (rc->rotation) { - case 90: - cairo_translate (cr, width, 0); -@@ -508,11 +511,6 @@ - cairo_scale (cr, rc->scale, rc->scale); - cairo_rotate (cr, rc->rotation * G_PI / 180.0); - poppler_page_render (page, cr); -- -- cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); -- cairo_set_source_rgb (cr, 1., 1., 1.); -- cairo_paint (cr); -- - cairo_destroy (cr); - #else /* HAVE_POPPLER_PAGE_RENDER */ - GdkPixbuf *pixbuf; reverted: --- evince-2.30.1/debian/patches/03_select-fir5_lcd_filter.patch +++ evince-2.30.1.orig/debian/patches/03_select-fir5_lcd_filter.patch @@ -1,24 +0,0 @@ -diff -ru ./backend.old/pdf/ev-poppler.cc ./backend/pdf/ev-poppler.cc ---- evince-2.25.5/backend/pdf/ev-poppler.cc 2009-01-10 14:16:12.000000000 +0100 -+++ evince-2.25.5.new/backend/pdf/ev-poppler.cc 2009-01-19 20:12:22.783740079 +0100 -@@ -462,14 +462,20 @@ - - #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); only in patch2: unchanged: --- evince-2.30.1.orig/debian/patches/05_select-fir5_lcd_filter.patch +++ evince-2.30.1/debian/patches/05_select-fir5_lcd_filter.patch @@ -0,0 +1,24 @@ +diff -ru ./backend.old/pdf/ev-poppler.cc ./backend/pdf/ev-poppler.cc +--- evince-2.25.5/backend/pdf/ev-poppler.cc 2009-01-10 14:16:12.000000000 +0100 ++++ evince-2.25.5.new/backend/pdf/ev-poppler.cc 2009-01-19 20:12:22.783740079 +0100 +@@ -462,14 +462,20 @@ + + #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); only in patch2: unchanged: --- evince-2.30.1.orig/debian/patches/03_fix_opening_hash_filename.patch +++ evince-2.30.1/debian/patches/03_fix_opening_hash_filename.patch @@ -0,0 +1,43 @@ +# DESCRIPTION: Fix opening files with '#' in its name, from +# http://git.gnome.org/browse/evince/commit/?id=182e12aed96d302f78f52c16b52b8f3c2784d415 +diff -Nur -x '*.orig' -x '*~' evince-2.30.1/shell/main.c evince-2.30.1.new/shell/main.c +--- evince-2.30.1/shell/main.c 2010-04-26 16:58:15.000000000 +0200 ++++ evince-2.30.1.new/shell/main.c 2010-05-13 16:26:15.020596257 +0200 +@@ -143,6 +143,28 @@ + 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 @@ + const gchar *app_uri; + + filename = files[i]; +- label = strchr (filename, '#'); ++ label = get_label_from_filename (filename); + if (label) { + *label = 0; + label++; only in patch2: unchanged: --- evince-2.30.1.orig/debian/patches/04_revert_render_to_ARGB32.patch +++ evince-2.30.1/debian/patches/04_revert_render_to_ARGB32.patch @@ -0,0 +1,32 @@ +--- evince-2.27.90/backend/pdf/ev-poppler.cc 2009-06-30 11:26:29.000000000 +0200 ++++ evince-2.27.90.new/backend/pdf/ev-poppler.cc 2009-08-14 15:53:34.777179306 +0200 +@@ -487,11 +487,14 @@ + + #ifdef HAVE_POPPLER_PAGE_RENDER + cairo_t *cr; +- +- surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, ++ ++ 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)); ++ + cr = cairo_create (surface); +- + switch (rc->rotation) { + case 90: + cairo_translate (cr, width, 0); +@@ -508,11 +511,6 @@ + cairo_scale (cr, rc->scale, rc->scale); + cairo_rotate (cr, rc->rotation * G_PI / 180.0); + poppler_page_render (page, cr); +- +- cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); +- cairo_set_source_rgb (cr, 1., 1., 1.); +- cairo_paint (cr); +- + cairo_destroy (cr); + #else /* HAVE_POPPLER_PAGE_RENDER */ + GdkPixbuf *pixbuf;