Rename and refresh the patches

24 files changed, 325 insertions, 325 deletions

diff --git a/debian/changelog b/debian/changelog
index c1e3359..65a2058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ xsane (0.999-2) unstable; urgency=medium
     - Reformat Depends.
   * debian/rules:
     - Add override_dh_strip for xsane-dbg.
+  * debian/patches:
+    - Rename and refresh the patches.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Tue, 16 Dec 2014 23:03:17 +0100
 
diff --git a/debian/patches/lcms2_configure.patch b/debian/patches/0001-lcms2_configure.patch
index 66612c8..66612c8 100644
--- a/debian/patches/lcms2_configure.patch
+++ b/debian/patches/0001-lcms2_configure.patch
diff --git a/debian/patches/deb_docviewer.patch b/debian/patches/0100-deb_docviewer.patch
index 8e5bc0c..8e5bc0c 100644
--- a/debian/patches/deb_docviewer.patch
+++ b/debian/patches/0100-deb_docviewer.patch
diff --git a/debian/patches/deb_gimp_acquire_menu.patch b/debian/patches/0105-deb_gimp_acquire_menu.patch
index d5eb94d..d5eb94d 100644
--- a/debian/patches/deb_gimp_acquire_menu.patch
+++ b/debian/patches/0105-deb_gimp_acquire_menu.patch
diff --git a/debian/patches/deb_inhibit_clickthrough.patch b/debian/patches/0110-deb_inhibit_clickthrough.patch
index 5b1ab31..5b1ab31 100644
--- a/debian/patches/deb_inhibit_clickthrough.patch
+++ b/debian/patches/0110-deb_inhibit_clickthrough.patch
diff --git a/debian/patches/deb_non_working_help_menu.patch b/debian/patches/0115-deb_non_working_help_menu.patch
index f5b8e54..f5b8e54 100644
--- a/debian/patches/deb_non_working_help_menu.patch
+++ b/debian/patches/0115-deb_non_working_help_menu.patch
diff --git a/debian/patches/deb_printing_defaults.patch b/debian/patches/0120-deb_printing_defaults.patch
index 0e55191..0e55191 100644
--- a/debian/patches/deb_printing_defaults.patch
+++ b/debian/patches/0120-deb_printing_defaults.patch
diff --git a/debian/patches/desktop_file.patch b/debian/patches/0125-desktop_file.patch
index 43e57bd..43e57bd 100644
--- a/debian/patches/desktop_file.patch
+++ b/debian/patches/0125-desktop_file.patch
diff --git a/debian/patches/fix_options_handling_fix.patch b/debian/patches/0130-fix_options_handling_fix.patch
index 49084fe..988d7b8 100644
--- a/debian/patches/fix_options_handling_fix.patch
+++ b/debian/patches/0130-fix_options_handling_fix.patch
@@ -4,11 +4,11 @@ Description: Fixup options handling
  be stable, and actually isn't stable when the net backend is used.
 Author: Julien BLACHE <jblache@debian.org>
 
-Index: xsane-0.998/src/xsane-back-gtk.c
+Index: trunk/src/xsane-back-gtk.c
 ===================================================================
---- xsane-0.998.orig/src/xsane-back-gtk.c	2010-11-16 21:24:59.000000000 +0100
-+++ xsane-0.998/src/xsane-back-gtk.c	2011-02-04 19:50:46.389016001 +0100
-@@ -2225,11 +2225,13 @@
+--- trunk.orig/src/xsane-back-gtk.c
++++ trunk/src/xsane-back-gtk.c
+@@ -2229,11 +2229,13 @@ static void xsane_back_gtk_option_menu_c
  /* ----------------------------------------------------------------------------------------------------------------- */
  
  void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],
@@ -23,7 +23,7 @@ Index: xsane-0.998/src/xsane-back-gtk.c
   int i, num_items;
  
    DBG(DBG_proc, "xsane_back_gtk_option_menu_new(%s)\n", name);
-@@ -2247,16 +2249,23 @@
+@@ -2251,16 +2253,23 @@ void xsane_back_gtk_option_menu_new(GtkW
  
    menu_items = malloc((num_items + 1) * sizeof(menu_items[0]));
  
@@ -49,7 +49,7 @@ Index: xsane-0.998/src/xsane-back-gtk.c
      menu_items[i].elem = elem;
      menu_items[i].index = i;
    }
-@@ -2402,14 +2411,15 @@
+@@ -2406,14 +2415,15 @@ static void xsane_back_gtk_panel_destroy
    xsane.standard_hbox = NULL;
    xsane.advanced_hbox = NULL;
  
@@ -67,11 +67,11 @@ Index: xsane-0.998/src/xsane-back-gtk.c
        {
          for (j = 0; j < elem->menu_size; ++j)
          {
-Index: xsane-0.998/src/xsane-back-gtk.h
+Index: trunk/src/xsane-back-gtk.h
 ===================================================================
---- xsane-0.998.orig/src/xsane-back-gtk.h	2007-02-24 01:56:54.000000000 +0100
-+++ xsane-0.998/src/xsane-back-gtk.h	2011-02-04 19:50:46.389016001 +0100
-@@ -117,7 +117,7 @@
+--- trunk.orig/src/xsane-back-gtk.h
++++ trunk/src/xsane-back-gtk.h
+@@ -117,7 +117,7 @@ extern void xsane_back_gtk_value_new(Gtk
  	   gfloat quant, int automatic,
  	   DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
  extern void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],
@@ -80,11 +80,11 @@ Index: xsane-0.998/src/xsane-back-gtk.h
  extern void xsane_back_gtk_text_entry_new(GtkWidget *parent, const char *name, const char *val,
                  DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
  extern void xsane_back_gtk_push_button_callback(GtkWidget *widget, gpointer data);
-Index: xsane-0.998/src/xsane-front-gtk.c
+Index: trunk/src/xsane-front-gtk.c
 ===================================================================
---- xsane-0.998.orig/src/xsane-front-gtk.c	2010-11-16 21:25:33.000000000 +0100
-+++ xsane-0.998/src/xsane-front-gtk.c	2011-02-04 19:50:46.393016001 +0100
-@@ -64,10 +64,10 @@
+--- trunk.orig/src/xsane-front-gtk.c
++++ trunk/src/xsane-front-gtk.c
+@@ -64,10 +64,10 @@ GtkWidget *xsane_toggle_button_new_with_
                                           int *state, void *xsane_toggle_button_callback);
  GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc,
                                          void *xsane_button_callback, gpointer data);
@@ -97,7 +97,7 @@ Index: xsane-0.998/src/xsane-front-gtk.c
                                         GtkWidget **data, int option,
                                         void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
  void xsane_range_new(GtkBox *parent, char *labeltext, const char *desc,
-@@ -1011,12 +1011,14 @@
+@@ -1011,12 +1011,14 @@ static void xsane_option_menu_callback(G
  
  /* ---------------------------------------------------------------------------------------------------------------------- */
  
@@ -113,7 +113,7 @@ Index: xsane-0.998/src/xsane-front-gtk.c
   int i, num_items;
  
    DBG(DBG_proc, "xsane_option_menu_new\n");
-@@ -1035,9 +1037,16 @@
+@@ -1035,9 +1037,16 @@ void xsane_option_menu_new(GtkWidget *pa
      gtk_widget_set_name(menu, widget_name);
    }
  
@@ -131,7 +131,7 @@ Index: xsane-0.998/src/xsane-front-gtk.c
      gtk_container_add(GTK_CONTAINER(menu), item);
  
      if (option_menu_callback)
-@@ -1051,7 +1060,7 @@
+@@ -1051,7 +1060,7 @@ void xsane_option_menu_new(GtkWidget *pa
  
      gtk_widget_show(item);
  
@@ -140,7 +140,7 @@ Index: xsane-0.998/src/xsane-front-gtk.c
      menu_items[i].elem  = elem;
      menu_items[i].index = i;
    }
-@@ -1079,7 +1088,7 @@
+@@ -1079,7 +1088,7 @@ void xsane_option_menu_new(GtkWidget *pa
  /* ---------------------------------------------------------------------------------------------------------------------- */
  
  void xsane_option_menu_new_with_pixmap(GdkWindow *window, GtkBox *parent, const char *xpm_d[], const char *desc,
@@ -149,7 +149,7 @@ Index: xsane-0.998/src/xsane-front-gtk.c
                                         GtkWidget **data, int option,
                                         void *option_menu_callback, SANE_Int settable, const gchar *widget_name)
  {
-@@ -1098,7 +1107,7 @@
+@@ -1098,7 +1107,7 @@ void xsane_option_menu_new_with_pixmap(G
    gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 2);
    gtk_widget_show(pixmapwidget);
  
@@ -158,11 +158,11 @@ Index: xsane-0.998/src/xsane-front-gtk.c
    gtk_widget_show(hbox);
  }
  
-Index: xsane-0.998/src/xsane-front-gtk.h
+Index: trunk/src/xsane-front-gtk.h
 ===================================================================
---- xsane-0.998.orig/src/xsane-front-gtk.h	2007-05-17 14:45:19.000000000 +0200
-+++ xsane-0.998/src/xsane-front-gtk.h	2011-02-04 19:50:46.453016001 +0100
-@@ -54,10 +54,10 @@
+--- trunk.orig/src/xsane-front-gtk.h
++++ trunk/src/xsane-front-gtk.h
+@@ -54,10 +54,10 @@ extern GtkWidget *xsane_toggle_button_ne
  extern GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc, 
                                                 void *xsane_button_callback, gpointer data);
  extern void xsane_pixmap_new(GtkWidget *parent, char *title, int width, int height, XsanePixmap *hist);
@@ -175,11 +175,11 @@ Index: xsane-0.998/src/xsane-front-gtk.h
                                                GtkWidget **data, int option,
                                                void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
  extern void xsane_range_new(GtkBox *parent, char *labeltext, const char *desc,
-Index: xsane-0.998/src/xsane.c
+Index: trunk/src/xsane.c
 ===================================================================
---- xsane-0.998.orig/src/xsane.c	2011-02-04 19:50:40.957016002 +0100
-+++ xsane-0.998/src/xsane.c	2011-02-04 19:50:46.457016001 +0100
-@@ -876,7 +876,7 @@
+--- trunk.orig/src/xsane.c
++++ trunk/src/xsane.c
+@@ -876,7 +876,7 @@ static int xsane_resolution_widget_new(G
              str_list[j] = 0;
              sprintf(str, "%d", (int) val);
  
@@ -188,7 +188,7 @@ Index: xsane-0.998/src/xsane.c
                                                xsane_resolution_list_callback, SANE_OPTION_IS_SETTABLE(opt->cap), widget_name);
  
              free(str_list);
-@@ -931,7 +931,7 @@
+@@ -931,7 +931,7 @@ static int xsane_resolution_widget_new(G
  
  
            xsane_option_menu_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(parent), image_xpm, desc,
@@ -197,7 +197,7 @@ Index: xsane-0.998/src/xsane.c
                                              xsane_resolution_list_callback, SANE_OPTION_IS_SETTABLE(opt->cap), widget_name);
            free(str_list);
          }
-@@ -1496,7 +1496,7 @@
+@@ -1496,7 +1496,7 @@ GtkWidget *xsane_update_xsane_callback()
            set = malloc(opt->size);
            status = xsane_control_option(xsane.dev, xsane.well_known.scansource, SANE_ACTION_GET_VALUE, set, 0);
  
@@ -206,7 +206,7 @@ Index: xsane-0.998/src/xsane.c
                                  _BGT(opt->desc), 0, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
           }
           break;
-@@ -1536,7 +1536,7 @@
+@@ -1536,7 +1536,7 @@ GtkWidget *xsane_update_xsane_callback()
            set = malloc(opt->size);
            status = xsane_control_option(xsane.dev, xsane.well_known.scanmode, SANE_ACTION_GET_VALUE, set, 0);
  
@@ -215,7 +215,7 @@ Index: xsane-0.998/src/xsane.c
                                  _BGT(opt->desc), xsane_scanmode_menu_callback, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
          }
           break;
-@@ -4646,7 +4646,7 @@
+@@ -4646,7 +4646,7 @@ void xsane_panel_build()
                }
                str_list[j] = 0;
                sprintf(str, "%d", val);
@@ -224,7 +224,7 @@ Index: xsane-0.998/src/xsane.c
                                    SANE_OPTION_IS_SETTABLE(opt->cap));
                free(str_list);
                gtk_widget_show(parent->parent);
-@@ -4744,7 +4744,7 @@
+@@ -4744,7 +4744,7 @@ void xsane_panel_build()
                }
                str_list[j] = 0;
                sprintf(str, "%g", SANE_UNFIX(val));
@@ -233,7 +233,7 @@ Index: xsane-0.998/src/xsane.c
                free (str_list);
                gtk_widget_show(parent->parent);
              }
-@@ -4789,7 +4789,7 @@
+@@ -4789,7 +4789,7 @@ void xsane_panel_build()
                   (strcmp (opt->name, SANE_NAME_SCAN_SOURCE) != 0) ) /* do not show scansource */
              {
                /* use a "list-selection" widget */
diff --git a/debian/patches/fix_pdf_floats.patch b/debian/patches/0135-fix_pdf_floats.patch
index 869deee..869deee 100644
--- a/debian/patches/fix_pdf_floats.patch
+++ b/debian/patches/0135-fix_pdf_floats.patch
diff --git a/debian/patches/fix_pdf_xref.patch b/debian/patches/0140-fix_pdf_xref.patch
index 0b81e9d..0b81e9d 100644
--- a/debian/patches/fix_pdf_xref.patch
+++ b/debian/patches/0140-fix_pdf_xref.patch
diff --git a/debian/patches/fix_png15.patch b/debian/patches/0145-fix_png15.patch
index bffc9ee..bffc9ee 100644
--- a/debian/patches/fix_png15.patch
+++ b/debian/patches/0145-fix_png15.patch
diff --git a/debian/patches/fix_preview_mouse_events.patch b/debian/patches/0150-fix_preview_mouse_events.patch
index c047ed8..c047ed8 100644
--- a/debian/patches/fix_preview_mouse_events.patch
+++ b/debian/patches/0150-fix_preview_mouse_events.patch
diff --git a/debian/patches/fix_spin_button_pagesize.patch b/debian/patches/0155-fix_spin_button_pagesize.patch
index ba0b5de..9fc1fdb 100644
--- a/debian/patches/fix_spin_button_pagesize.patch
+++ b/debian/patches/0155-fix_spin_button_pagesize.patch
@@ -4,11 +4,11 @@ Description: Fix spin buttons usage for newer versions of GTK+ 2.0
 Author: Julien BLACHE <jblache@debian.org>
 Forwarded: no
 
-Index: xsane-0.998/src/xsane-back-gtk.c
+Index: trunk/src/xsane-back-gtk.c
 ===================================================================
---- xsane-0.998.orig/src/xsane-back-gtk.c	2011-02-04 19:50:46.000000000 +0100
-+++ xsane-0.998/src/xsane-back-gtk.c	2011-02-04 19:54:55.581016002 +0100
-@@ -2028,6 +2028,7 @@
+--- trunk.orig/src/xsane-back-gtk.c
++++ trunk/src/xsane-back-gtk.c
+@@ -2032,6 +2032,7 @@ void xsane_back_gtk_range_new(GtkWidget
        digits = 5;
      }
  #endif
@@ -16,7 +16,7 @@ Index: xsane-0.998/src/xsane-back-gtk.c
      spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(elem->data), 0, digits);
  
      if (preferences.show_range_mode & 3) /* slider also visible */
-@@ -2129,6 +2130,7 @@
+@@ -2133,6 +2134,7 @@ void xsane_back_gtk_value_new(GtkWidget
      digits = 5;
    }
  #endif
@@ -24,11 +24,11 @@ Index: xsane-0.998/src/xsane-back-gtk.c
    spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(elem->data), 0, digits);
  
    if (preferences.show_range_mode & 3) /* sliders are visible */
-Index: xsane-0.998/src/xsane-front-gtk.c
+Index: trunk/src/xsane-front-gtk.c
 ===================================================================
---- xsane-0.998.orig/src/xsane-front-gtk.c	2011-02-04 19:50:46.000000000 +0100
-+++ xsane-0.998/src/xsane-front-gtk.c	2011-02-04 19:54:55.581016002 +0100
-@@ -1163,6 +1163,7 @@
+--- trunk.orig/src/xsane-front-gtk.c
++++ trunk/src/xsane-front-gtk.c
+@@ -1163,6 +1163,7 @@ void xsane_range_new(GtkBox *parent, cha
    /* spinbutton */
    if (preferences.show_range_mode & 4)
    {
@@ -36,7 +36,7 @@ Index: xsane-0.998/src/xsane-front-gtk.c
      spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(*data), 0, digits);
      if (preferences.show_range_mode & 3) /* slider also visible */
      {
-@@ -1255,6 +1256,7 @@
+@@ -1255,6 +1256,7 @@ void xsane_range_new_with_pixmap(GdkWind
    /* spinbutton */
    if (preferences.show_range_mode & 4)
    {
diff --git a/debian/patches/fix_tighten_default_umask.patch b/debian/patches/0160-fix_tighten_default_umask.patch
index 96e6342..96e6342 100644
--- a/debian/patches/fix_tighten_default_umask.patch
+++ b/debian/patches/0160-fix_tighten_default_umask.patch
diff --git a/debian/patches/xsane-0.999-lcms2.patch b/debian/patches/0165-xsane-0.999-lcms2.patch
index f18709c..028cfc9 100644
--- a/debian/patches/xsane-0.999-lcms2.patch
+++ b/debian/patches/0165-xsane-0.999-lcms2.patch
@@ -19,10 +19,10 @@ Date:   Mon Sep 23 14:53:45 2013 +0200
  src/xsane.h         |  8 ++++++-
  6 files changed, 130 insertions(+), 17 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index df7b114..3659c97 100644
---- a/configure.in
-+++ b/configure.in
+Index: trunk/configure.in
+===================================================================
+--- trunk.orig/configure.in
++++ trunk/configure.in
 @@ -130,7 +130,17 @@ if test "${USE_TIFF}" = "yes"; then
  fi
  
@@ -60,10 +60,10 @@ index df7b114..3659c97 100644
  fi
  
  echo "*                                                              *"
-diff --git a/include/config.h.in b/include/config.h.in
-index ecc9637..f9a3e40 100755
---- a/include/config.h.in
-+++ b/include/config.h.in
+Index: trunk/include/config.h.in
+===================================================================
+--- trunk.orig/include/config.h.in
++++ trunk/include/config.h.in
 @@ -290,9 +290,15 @@
  /* Define if you have libtiff.  */
  #undef HAVE_LIBTIFF
@@ -81,11 +81,11 @@ index ecc9637..f9a3e40 100755
  #ifndef HAVE_STRNCASECMP
    /* OS/2 needs this */
  # define strncasecmp(a, b, c) strnicmp(a, b, c)
-diff --git a/src/xsane-preview.c b/src/xsane-preview.c
-index 6327ca7..6eaf687 100644
---- a/src/xsane-preview.c
-+++ b/src/xsane-preview.c
-@@ -6346,8 +6346,8 @@ int preview_do_color_correction(Preview *p)
+Index: trunk/src/xsane-preview.c
+===================================================================
+--- trunk.orig/src/xsane-preview.c
++++ trunk/src/xsane-preview.c
+@@ -6346,8 +6346,8 @@ int preview_do_color_correction(Preview
   cmsHPROFILE hOutProfile = NULL;
   cmsHPROFILE hProofProfile = NULL;
   cmsHTRANSFORM hTransform = NULL;
@@ -96,7 +96,7 @@ index 6327ca7..6eaf687 100644
   int proof = 0;
   char *cms_proof_icm_profile = NULL;
   int linesize = 0;
-@@ -6355,7 +6355,9 @@ int preview_do_color_correction(Preview *p)
+@@ -6355,7 +6355,9 @@ int preview_do_color_correction(Preview
  
    DBG(DBG_proc, "preview_do_color_correction\n");
  
@@ -106,11 +106,11 @@ index 6327ca7..6eaf687 100644
  
    if (preferences.cms_bpc)
    {
-diff --git a/src/xsane-save.c b/src/xsane-save.c
-index 75e0a63..2d0e44b 100644
---- a/src/xsane-save.c
-+++ b/src/xsane-save.c
-@@ -832,9 +832,9 @@ cmsHTRANSFORM xsane_create_cms_transform(Image_info *image_info, int cms_functio
+Index: trunk/src/xsane-save.c
+===================================================================
+--- trunk.orig/src/xsane-save.c
++++ trunk/src/xsane-save.c
+@@ -832,9 +832,9 @@ cmsHTRANSFORM xsane_create_cms_transform
   cmsHPROFILE hInProfile = NULL;
   cmsHPROFILE hOutProfile = NULL;
   cmsHTRANSFORM hTransform = NULL;
@@ -123,7 +123,7 @@ index 75e0a63..2d0e44b 100644
  
    if (cms_function == XSANE_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE)
    {
-@@ -843,7 +843,9 @@ cmsHTRANSFORM xsane_create_cms_transform(Image_info *image_info, int cms_functio
+@@ -843,7 +843,9 @@ cmsHTRANSFORM xsane_create_cms_transform
  
    DBG(DBG_info, "Prepare CMS transform\n");
  
@@ -133,7 +133,7 @@ index 75e0a63..2d0e44b 100644
  
    if (cms_bpc)
    {
-@@ -890,10 +892,18 @@ cmsHTRANSFORM xsane_create_cms_transform(Image_info *image_info, int cms_functio
+@@ -890,10 +892,18 @@ cmsHTRANSFORM xsane_create_cms_transform
      if (image_info->channels == 1) /* == 1 (grayscale) */
      {
  #if 1 /* xxx oli */
@@ -152,7 +152,7 @@ index 75e0a63..2d0e44b 100644
  #endif
      }
      else
-@@ -2896,7 +2906,11 @@ static int xsane_write_CSA(FILE *outfile, char *input_profile, int intent)
+@@ -2904,7 +2914,11 @@ static int xsane_write_CSA(FILE *outfile
      return -1;
    }
  
@@ -164,7 +164,7 @@ index 75e0a63..2d0e44b 100644
    if (n == 0)
    {
      return -2;
-@@ -2908,7 +2922,11 @@ static int xsane_write_CSA(FILE *outfile, char *input_profile, int intent)
+@@ -2916,7 +2930,11 @@ static int xsane_write_CSA(FILE *outfile
      return -3;
    }
  
@@ -176,7 +176,7 @@ index 75e0a63..2d0e44b 100644
    buffer[n] = 0;
  
    fprintf(outfile, "%s", buffer);
-@@ -2927,7 +2945,7 @@ static int xsane_write_CRD(FILE *outfile, char *output_profile, int intent, int
+@@ -2935,7 +2953,7 @@ static int xsane_write_CRD(FILE *outfile
   cmsHPROFILE hProfile;
   size_t n;
   char* buffer;
@@ -185,7 +185,7 @@ index 75e0a63..2d0e44b 100644
  
    hProfile = cmsOpenProfileFromFile(output_profile, "r");
    if (!hProfile)
-@@ -2940,7 +2958,11 @@ static int xsane_write_CRD(FILE *outfile, char *output_profile, int intent, int
+@@ -2948,7 +2966,11 @@ static int xsane_write_CRD(FILE *outfile
      flags |= cmsFLAGS_BLACKPOINTCOMPENSATION;
    }
  
@@ -197,7 +197,7 @@ index 75e0a63..2d0e44b 100644
    if (n == 0)
    {
      return -2;
-@@ -2952,7 +2974,11 @@ static int xsane_write_CRD(FILE *outfile, char *output_profile, int intent, int
+@@ -2960,7 +2982,11 @@ static int xsane_write_CRD(FILE *outfile
      return -3;
    }
  
@@ -209,7 +209,7 @@ index 75e0a63..2d0e44b 100644
    buffer[n] = 0;
  
    fprintf(outfile, "%s", buffer);
-@@ -4349,7 +4375,7 @@ static void xsane_jpeg_embed_scanner_icm_profile(j_compress_ptr cinfo_ptr, const
+@@ -4352,7 +4378,7 @@ static void xsane_jpeg_embed_scanner_icm
  {
   FILE *icm_profile;
   size_t size, embed_len;
@@ -218,7 +218,7 @@ index 75e0a63..2d0e44b 100644
  
    DBG(DBG_proc, "xsane_jpeg_embed_scanner_icm_profile(%s)\n", icm_filename);
  
-@@ -4363,7 +4389,7 @@ static void xsane_jpeg_embed_scanner_icm_profile(j_compress_ptr cinfo_ptr, const
+@@ -4366,7 +4392,7 @@ static void xsane_jpeg_embed_scanner_icm
    size = ftell(icm_profile);
    fseek(icm_profile, 0, SEEK_SET);
  
@@ -227,11 +227,11 @@ index 75e0a63..2d0e44b 100644
    if (embed_buffer)
    {
      embed_len = fread(embed_buffer, 1, size, icm_profile);
-diff --git a/src/xsane-viewer.c b/src/xsane-viewer.c
-index 69a444d..844c077 100644
---- a/src/xsane-viewer.c
-+++ b/src/xsane-viewer.c
-@@ -1795,6 +1795,9 @@ static void xsane_viewer_set_cms_gamut_alarm_color_callback(GtkWidget *widget, g
+Index: trunk/src/xsane-viewer.c
+===================================================================
+--- trunk.orig/src/xsane-viewer.c
++++ trunk/src/xsane-viewer.c
+@@ -1795,6 +1795,9 @@ static void xsane_viewer_set_cms_gamut_a
  {
   Viewer *v = (Viewer *) data;
   int val;
@@ -241,7 +241,7 @@ index 69a444d..844c077 100644
  
    g_signal_handlers_block_by_func(GTK_OBJECT(v->cms_gamut_alarm_color_widget[0]), (GtkSignalFunc) xsane_viewer_set_cms_gamut_alarm_color_callback, v);
    g_signal_handlers_block_by_func(GTK_OBJECT(v->cms_gamut_alarm_color_widget[1]), (GtkSignalFunc) xsane_viewer_set_cms_gamut_alarm_color_callback, v);
-@@ -1811,6 +1814,49 @@ static void xsane_viewer_set_cms_gamut_alarm_color_callback(GtkWidget *widget, g
+@@ -1811,6 +1814,49 @@ static void xsane_viewer_set_cms_gamut_a
    v->cms_gamut_alarm_color = val;
    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(v->cms_gamut_alarm_color_widget[v->cms_gamut_alarm_color]), TRUE);
  
@@ -291,7 +291,7 @@ index 69a444d..844c077 100644
    switch(v->cms_gamut_alarm_color)
    {
      default:
-@@ -1838,6 +1884,7 @@ static void xsane_viewer_set_cms_gamut_alarm_color_callback(GtkWidget *widget, g
+@@ -1838,6 +1884,7 @@ static void xsane_viewer_set_cms_gamut_a
        cmsSetAlarmCodes(0, 0, 255);
       break;
    }
@@ -299,7 +299,7 @@ index 69a444d..844c077 100644
  
    g_signal_handlers_unblock_by_func(GTK_OBJECT(v->cms_gamut_alarm_color_widget[0]), (GtkSignalFunc) xsane_viewer_set_cms_gamut_alarm_color_callback, v);
    g_signal_handlers_unblock_by_func(GTK_OBJECT(v->cms_gamut_alarm_color_widget[1]), (GtkSignalFunc) xsane_viewer_set_cms_gamut_alarm_color_callback, v);
-@@ -2172,9 +2219,9 @@ static int xsane_viewer_read_image(Viewer *v)
+@@ -2172,9 +2219,9 @@ static int xsane_viewer_read_image(Viewe
   cmsHTRANSFORM hTransform = NULL;
   int proof = 0;
   char *cms_proof_icm_profile = NULL;
@@ -312,7 +312,7 @@ index 69a444d..844c077 100644
  #endif
  
    /* open imagefile */
-@@ -2203,7 +2250,9 @@ static int xsane_viewer_read_image(Viewer *v)
+@@ -2203,7 +2250,9 @@ static int xsane_viewer_read_image(Viewe
  
    if ((v->enable_color_management) && (v->cms_enable))
    {
@@ -322,7 +322,7 @@ index 69a444d..844c077 100644
  
      if (v->cms_bpc)
      {
-@@ -2801,6 +2850,9 @@ Viewer *xsane_viewer_new(char *filename, char *selection_filetype, int allow_red
+@@ -2801,6 +2850,9 @@ Viewer *xsane_viewer_new(char *filename,
   GtkWidget *scrolled_window;
   GtkWidget *zoom_option_menu, *zoom_menu, *zoom_menu_item;
   int i, selection;
@@ -332,7 +332,7 @@ index 69a444d..844c077 100644
  
    DBG(DBG_proc, "viewer_new(%s)\n", filename);
  
-@@ -2830,8 +2882,15 @@ Viewer *xsane_viewer_new(char *filename, char *selection_filetype, int allow_red
+@@ -2830,8 +2882,15 @@ Viewer *xsane_viewer_new(char *filename,
    v->cms_proofing_intent = INTENT_ABSOLUTE_COLORIMETRIC;
    v->cms_gamut_check = 0;
    v->cms_gamut_alarm_color = 3; /* red */
@@ -348,10 +348,10 @@ index 69a444d..844c077 100644
    if (selection_filetype)
    {
      v->selection_filetype = strdup(selection_filetype);
-diff --git a/src/xsane.h b/src/xsane.h
-index 4067d61..adcc0ed 100644
---- a/src/xsane.h
-+++ b/src/xsane.h
+Index: trunk/src/xsane.h
+===================================================================
+--- trunk.orig/src/xsane.h
++++ trunk/src/xsane.h
 @@ -70,7 +70,13 @@
  #include <gtk/gtk.h>
  
@@ -367,5 +367,3 @@ index 4067d61..adcc0ed 100644
  #else
  # define cmsHTRANSFORM void *
  #endif
--- 
-1.8.3.1
diff --git a/debian/patches/typo.patch b/debian/patches/0170-typo.patch
index 8864cd7..8864cd7 100644
--- a/debian/patches/typo.patch
+++ b/debian/patches/0170-typo.patch
diff --git a/debian/patches/man_misleading.patch b/debian/patches/0600-man_misleading.patch
index ee79464..ee79464 100644
--- a/debian/patches/man_misleading.patch
+++ b/debian/patches/0600-man_misleading.patch
diff --git a/debian/patches/typo_manpage.patch b/debian/patches/0605-typo_manpage.patch
index 371d675..371d675 100644
--- a/debian/patches/typo_manpage.patch
+++ b/debian/patches/0605-typo_manpage.patch
diff --git a/debian/patches/fix_broken_links.patch b/debian/patches/0610-fix_broken_links.patch
index a556d0e..a556d0e 100644
--- a/debian/patches/fix_broken_links.patch
+++ b/debian/patches/0610-fix_broken_links.patch
diff --git a/debian/patches/i18n_po_update_es_add_gl.patch b/debian/patches/0900-i18n_po_update_es_add_gl.patch
index 550c900..df493f4 100644
--- a/debian/patches/i18n_po_update_es_add_gl.patch
+++ b/debian/patches/0900-i18n_po_update_es_add_gl.patch
@@ -3,11 +3,11 @@ Description: PO updates, update es and add gl
 Author: Miguel Bouzada <mbouzada@gmail.com>
 Forwarded: yes
 
-Index: xsane-0.998/configure
+Index: trunk/configure
 ===================================================================
---- xsane-0.998.orig/configure	2007-12-17 11:18:11.000000000 +0100
-+++ xsane-0.998/configure	2011-02-04 19:51:23.625016001 +0100
-@@ -1329,7 +1329,7 @@
+--- trunk.orig/configure
++++ trunk/configure
+@@ -2234,7 +2234,7 @@ PACKAGE=xsane
  BINPROGS="xsane"
  
  # languages
@@ -16,10 +16,10 @@ Index: xsane-0.998/configure
  
  SANE_V_MAJOR=1
  VERSION=${V_MAJOR}.${V_MINOR}
-Index: xsane-0.998/po/es.po
+Index: trunk/po/es.po
 ===================================================================
---- xsane-0.998.orig/po/es.po	2011-02-04 19:51:14.853016001 +0100
-+++ xsane-0.998/po/es.po	2011-02-04 19:51:23.625016001 +0100
+--- trunk.orig/po/es.po
++++ trunk/po/es.po
 @@ -1,21 +1,24 @@
 -# translation of es.po to Castellano
 -# XSane Spanish .po file
@@ -51,7 +51,7 @@ Index: xsane-0.998/po/es.po
  
  #. Please translate this to the correct directory name (eg. german=>de)
  #. XSANE_LANGUAGE_DIR
-@@ -33,12 +36,12 @@
+@@ -33,12 +36,12 @@ msgstr "clon-de-"
  
  #. WINDOW_ABOUT_XSANE
  msgid "About"
@@ -66,7 +66,7 @@ Index: xsane-0.998/po/es.po
  
  #. WINDOW_AUTHORIZE
  msgid "authorization"
-@@ -50,7 +53,7 @@
+@@ -50,7 +53,7 @@ msgstr "GPL - la licencia"
  
  #. WINDOW_EULA
  msgid "End User License Agreement"
@@ -75,7 +75,7 @@ Index: xsane-0.998/po/es.po
  
  #. WINDOW_INFO
  msgid "info"
-@@ -66,67 +69,59 @@
+@@ -66,67 +69,59 @@ msgstr "guardar lista de proceso por lot
  
  #. WINDOW_BATCH_SCAN
  msgid "batch scan"
@@ -156,7 +156,7 @@ Index: xsane-0.998/po/es.po
  
  #. WINDOW_MEDIUM_RENAME
  msgid "rename medium"
-@@ -146,7 +141,7 @@
+@@ -146,7 +141,7 @@ msgstr "Histograma"
  
  #. WINDOW_GAMMA
  msgid "Gamma curve"
@@ -165,7 +165,7 @@ Index: xsane-0.998/po/es.po
  
  #. WINDOW_STANDARD_OPTIONS
  msgid "Standard options"
-@@ -183,71 +178,66 @@
+@@ -183,71 +178,66 @@ msgstr "seleccionar archivo de salida"
  
  #. WINDOW_SAVE_SETTINGS
  msgid "save device settings"
@@ -252,7 +252,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_FILE
  msgid "File"
-@@ -285,11 +275,11 @@
+@@ -285,11 +275,11 @@ msgstr "Geometría"
  #. MENU_COLOR_MANAGEMENT
  #. NOTEBOOK_COLOR_MANAGEMENT_OPTIONS
  msgid "Color management"
@@ -266,7 +266,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_ITEM_INFO
  msgid "Info"
-@@ -355,7 +345,7 @@
+@@ -355,7 +345,7 @@ msgstr "Espejo -"
  
  #. FRAME_RAW_IMAGE
  msgid "Raw image"
@@ -275,7 +275,7 @@ Index: xsane-0.998/po/es.po
  
  #. FRAME_ENHANCED_IMAGE
  msgid "Enhanced image"
-@@ -367,7 +357,7 @@
+@@ -367,7 +357,7 @@ msgstr "Escanear"
  
  #. BUTTON_OK
  msgid "Ok"
@@ -284,7 +284,7 @@ Index: xsane-0.998/po/es.po
  
  #. BUTTON_ACCEPT
  msgid "Accept"
-@@ -391,7 +381,7 @@
+@@ -391,7 +381,7 @@ msgstr "Reducir"
  
  #. BUTTON_CONT_AT_OWN_RISK
  msgid "Continue at your own risk"
@@ -293,7 +293,7 @@ Index: xsane-0.998/po/es.po
  
  #. BUTTON_BROWSE
  msgid "Browse"
-@@ -407,35 +397,35 @@
+@@ -407,35 +397,35 @@ msgstr "Lista de escaneo por lotes"
  
  #. BUTTON_BATCH_AREA_SCAN
  msgid "Scan selected area"
@@ -337,7 +337,7 @@ Index: xsane-0.998/po/es.po
  
  #. BUTTON_FILE_INSERT
  msgid "Insert file"
-@@ -443,40 +433,39 @@
+@@ -443,40 +433,39 @@ msgstr "Insertar archivo"
  
  #. BUTTON_CREATE_PROJECT
  msgid "Create project"
@@ -387,7 +387,7 @@ Index: xsane-0.998/po/es.po
  
  #. BUTTON_DISCARD_ALL_IMAGES
  msgid "Discard all images"
-@@ -488,24 +477,23 @@
+@@ -488,24 +477,23 @@ msgstr "No cerrar"
  
  #. BUTTON_SCALE_BIND
  msgid "Bind scale"
@@ -416,7 +416,7 @@ Index: xsane-0.998/po/es.po
  
  #. RADIO_BUTTON_SKIP_EXISTING_NRS
  msgid "Skip existing filenames"
-@@ -513,16 +501,15 @@
+@@ -513,16 +501,15 @@ msgstr "Omitir nombres de archivos exist
  
  #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
  msgid "Save postscript zlib compressed (PS level 3)"
@@ -436,7 +436,7 @@ Index: xsane-0.998/po/es.po
  
  #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
  msgid "Reduce 16 bit image to 8 bit"
-@@ -530,12 +517,11 @@
+@@ -530,12 +517,11 @@ msgstr "Reducir imagen de 16 bits a imag
  
  #. RADIO_BUTTON_WINDOW_FIXED
  msgid "Main window size fixed"
@@ -451,7 +451,7 @@ Index: xsane-0.998/po/es.po
  
  #. RADIO_BUTTON_PRIVATE_COLORMAP
  msgid "Use private colormap"
-@@ -543,29 +529,28 @@
+@@ -543,29 +529,28 @@ msgstr "Usar mapa de colores privado"
  
  #. RADIO_BUTTON_AUTOENHANCE_GAMMA
  msgid "Autoenhance gamma"
@@ -487,7 +487,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_AVAILABLE_DEVICES
  msgid "Available devices:"
-@@ -577,13 +562,12 @@
+@@ -577,13 +562,12 @@ msgstr "Tipo"
  
  #. TEXT_CMS_FUNCTION
  #. DESC_CMS_FUNCTION
@@ -503,7 +503,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_VENDOR
  msgid "Vendor:"
-@@ -603,7 +587,7 @@
+@@ -603,7 +587,7 @@ msgstr "Dispositivo:"
  
  #. TEXT_LOADED_BACKEND
  msgid "Loaded backend:"
@@ -512,7 +512,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SANE_VERSION
  msgid "Sane version:"
-@@ -619,7 +603,7 @@
+@@ -619,7 +603,7 @@ msgstr "Corrección gamma por:"
  
  #. TEXT_SCANNER
  msgid "scanner"
@@ -521,7 +521,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SOFTWARE_XSANE
  msgid "software (XSane)"
-@@ -631,15 +615,15 @@
+@@ -631,15 +615,15 @@ msgstr "ninguno"
  
  #. TEXT_GAMMA_INPUT_DEPTH
  msgid "Gamma input depth:"
@@ -540,7 +540,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_OUTPUT_FORMATS
  msgid "XSane output formats:"
-@@ -654,18 +638,16 @@
+@@ -654,18 +638,16 @@ msgid "16 bit output formats:"
  msgstr "Formatos de salida de 16 bits:"
  
  #. TEXT_REDUCE_16BIT_TO_8BIT
@@ -562,7 +562,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_AUTHORIZATION_SECURE
  msgid "Password transmission is secure"
-@@ -673,7 +655,7 @@
+@@ -673,7 +655,7 @@ msgstr "La transmisión de contraseña e
  
  #. TEXT_AUTHORIZATION_INSECURE
  msgid "Backend requests plain-text password"
@@ -571,7 +571,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_USERNAME
  msgid "Username :"
-@@ -685,7 +667,7 @@
+@@ -685,7 +667,7 @@ msgstr "Contraseña:"
  
  #. TEXT_INVALID_PARAMS
  msgid "Invalid parameters."
@@ -580,7 +580,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_VERSION
  msgid "version:"
-@@ -696,17 +678,16 @@
+@@ -696,17 +678,16 @@ msgid "package"
  msgstr "paquete"
  
  #. TEXT_WITH_CMS_FUNCTION
@@ -601,7 +601,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_GTK_VERSION
  msgid "compiled with GTK-"
-@@ -735,17 +716,16 @@
+@@ -735,17 +716,16 @@ msgid ""
  "\"NO WARRANTY\" agreement.\n"
  msgstr ""
  "XSane se distribuye bajo los términos de la Licencia Pública General GNU\n"
@@ -626,7 +626,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_GPL
  msgid ""
-@@ -758,21 +738,20 @@
+@@ -758,21 +738,20 @@ msgid ""
  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
  msgstr ""
  "XSane se distribuye bajo los términos de la Licencia Pública General GNU\n"
@@ -655,7 +655,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_FILE
  msgid "File:"
-@@ -787,15 +766,14 @@
+@@ -787,15 +766,14 @@ msgstr "Traducción:"
  #. by YOUR NAME\n
  #. E-mail: your.name@yourdomain.com\n
  #. TEXT_TRANSLATION_INFO
@@ -674,7 +674,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_INFO_BOX
  msgid "0x0: 0KB"
-@@ -806,9 +784,8 @@
+@@ -806,9 +784,8 @@ msgid "Scanned pages: "
  msgstr "Páginas escaneadas:"
  
  #. TEXT_EMAIL_TEXT
@@ -685,7 +685,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_ATTACHMENTS
  msgid "Attachments:"
-@@ -819,40 +796,33 @@
+@@ -819,40 +796,33 @@ msgid "Project status:"
  msgstr "Estado del proyecto:"
  
  #. TEXT_EMAIL_FILETYPE
@@ -734,7 +734,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_BATCH_AREA_DEFAULT_NAME
  msgid "(no name)"
-@@ -860,7 +830,7 @@
+@@ -860,7 +830,7 @@ msgstr "(sin nombre)"
  
  #. TEXT_BATCH_LIST_AREANAME
  msgid "Area name:"
@@ -743,7 +743,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_BATCH_LIST_SCANMODE
  msgid "Scanmode:"
-@@ -904,89 +874,76 @@
+@@ -904,89 +874,76 @@ msgid "Copy number option:"
  msgstr "Copiar opción número:"
  
  #. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
@@ -851,7 +851,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SETUP_TMP_PATH
  msgid "Temporary directory"
-@@ -1010,12 +967,11 @@
+@@ -1010,12 +967,11 @@ msgstr "Compresión de imagen PNG"
  
  #. TEXT_SETUP_FILENAME_COUNTER_LEN
  msgid "Filename counter length"
@@ -866,7 +866,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SETUP_TIFF_COMPRESSION_16
  msgid "TIFF 16 bit image compression"
-@@ -1031,11 +987,11 @@
+@@ -1031,11 +987,11 @@ msgstr "Compresión de imagen TIFF de l�
  
  #. TEXT_SETUP_SHOW_RANGE_MODE
  msgid "Show range as:"
@@ -880,7 +880,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SETUP_PREVIEW_GAMMA
  msgid "Preview gamma:"
-@@ -1079,7 +1035,7 @@
+@@ -1079,7 +1035,7 @@ msgstr "Desplazamiento de umbral:"
  
  #. TEXT_SETUP_GRAYSCALE_SCANMODE
  msgid "Name of grayscale scanmode:"
@@ -889,7 +889,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SETUP_HELPFILE_VIEWER
  msgid "Helpfile viewer (HTML):"
-@@ -1091,7 +1047,7 @@
+@@ -1091,7 +1047,7 @@ msgstr "Opción del receptor:"
  
  #. TEXT_SETUP_FAX_POSTSCRIPT_OPT
  msgid "Postscriptfile option:"
@@ -898,7 +898,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SETUP_FAX_NORMAL_MODE_OPT
  msgid "Normal mode option:"
-@@ -1103,7 +1059,7 @@
+@@ -1103,7 +1059,7 @@ msgstr "Opción en modo fino:"
  
  #. TEXT_SETUP_FAX_PROGRAM_DEFAULTS
  msgid "Set program defaults for:"
@@ -907,7 +907,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SETUP_FAX_VIEWER
  msgid "Viewer (Postscript):"
-@@ -1127,7 +1083,7 @@
+@@ -1127,7 +1083,7 @@ msgstr "Desplazamiento hacia abajo"
  
  #. TEXT_SETUP_FAX_PS_FLATEDECODED
  msgid "Create zlib compressed postscript image (PS level 3) for fax"
@@ -916,7 +916,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SETUP_SMTP_SERVER
  msgid "SMTP server:"
-@@ -1146,17 +1102,14 @@
+@@ -1146,17 +1102,14 @@ msgid "Reply to:"
  msgstr "Responder a:"
  
  #. TEXT_SETUP_EMAIL_AUTHENTICATION
@@ -936,7 +936,7 @@ Index: xsane-0.998/po/es.po
  msgid "Password:"
  msgstr "Contraseña:"
  
-@@ -1166,11 +1119,11 @@
+@@ -1166,11 +1119,11 @@ msgstr "Servidor POP3:"
  
  #. TEXT_SETUP_POP3_PORT
  msgid "POP3 port:"
@@ -950,7 +950,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SETUP_OCR_INPUTFILE_OPT
  msgid "Inputfile option:"
-@@ -1182,11 +1135,11 @@
+@@ -1182,11 +1135,11 @@ msgstr "Opción del archivo de salida:"
  
  #. TEXT_SETUP_OCR_USE_GUI_PIPE_OPT
  msgid "Use GUI progress pipe:"
@@ -964,7 +964,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_SETUP_OCR_PROGRESS_KEYWORD
  msgid "Progress keyword:"
-@@ -1206,37 +1159,33 @@
+@@ -1206,37 +1159,33 @@ msgstr "todo"
  
  #. TEXT_SETUP_SCANNER_DEFAULT_COLOR_ICM_PROFILE
  #. DESC_SCANNER_DEFAULT_COLOR_ICM_PROFILE
@@ -1008,7 +1008,7 @@ Index: xsane-0.998/po/es.po
  
  msgid "new media"
  msgstr "medio nuevo"
-@@ -1247,9 +1196,8 @@
+@@ -1247,9 +1196,8 @@ msgid "Save"
  msgstr "Guarda imagen"
  
  #. NOTEBOOK_FILETYPE_OPTIONS
@@ -1019,7 +1019,7 @@ Index: xsane-0.998/po/es.po
  
  #. NOTEBOOK_COPY_OPTIONS
  #. MENU_ITEM_COPY
-@@ -1263,9 +1211,8 @@
+@@ -1263,9 +1211,8 @@ msgstr "Fax"
  
  #. NOTEBOOK_EMAIL_OPTIONS
  #. MENU_ITEM_EMAIL
@@ -1030,7 +1030,7 @@ Index: xsane-0.998/po/es.po
  
  #. NOTEBOOK_OCR_OPTIONS
  msgid "OCR"
-@@ -1281,11 +1228,11 @@
+@@ -1281,11 +1228,11 @@ msgstr "Mejora"
  
  #. MENU_ITEM_MULTIPAGE
  msgid "Multipage"
@@ -1044,7 +1044,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_ITEM_SHOW_PREVIEW
  msgid "Show preview"
-@@ -1297,7 +1244,7 @@
+@@ -1297,7 +1244,7 @@ msgstr "Mostrar histograma"
  
  #. MENU_ITEM_SHOW_GAMMA
  msgid "Show gamma curve"
@@ -1053,7 +1053,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_ITEM_SHOW_BATCH_SCAN
  msgid "Show batch scan"
-@@ -1305,7 +1252,7 @@
+@@ -1305,7 +1252,7 @@ msgstr "Mostrar escaneo por lotes"
  
  #. MENU_ITEM_SHOW_STANDARDOPTIONS
  msgid "Show standard options"
@@ -1062,7 +1062,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_ITEM_SHOW_ADVANCEDOPTIONS
  msgid "Show advanced options"
-@@ -1317,7 +1264,7 @@
+@@ -1317,7 +1264,7 @@ msgstr "Configuración"
  
  #. MENU_ITEM_LENGTH_UNIT
  msgid "Length unit"
@@ -1071,7 +1071,7 @@ Index: xsane-0.998/po/es.po
  
  #. SUBMENU_ITEM_LENGTH_MILLIMETERS
  msgid "millimeters"
-@@ -1333,7 +1280,7 @@
+@@ -1333,7 +1280,7 @@ msgstr "pulgadas"
  
  #. MENU_ITEM_UPDATE_POLICY
  msgid "Update policy"
@@ -1080,7 +1080,7 @@ Index: xsane-0.998/po/es.po
  
  #. SUBMENU_ITEM_POLICY_CONTINUOUS
  msgid "continuous"
-@@ -1357,9 +1304,8 @@
+@@ -1357,9 +1304,8 @@ msgstr "Rotar postscript"
  
  #. MENU_ITEM_ENABLE_COLOR_MANAGEMENT
  #. MENU_ITEM_CMS_ENABLE_COLOR_MANAGEMENT
@@ -1091,7 +1091,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_ITEM_EDIT_MEDIUM_DEF
  msgid "Edit medium definition"
-@@ -1367,11 +1313,11 @@
+@@ -1367,11 +1313,11 @@ msgstr "Editar definición de medio"
  
  #. MENU_ITEM_SAVE_DEVICE_SETTINGS
  msgid "Save device settings"
@@ -1105,7 +1105,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_ITEM_CHANGE_WORKING_DIR
  msgid "Change directory"
-@@ -1391,99 +1337,91 @@
+@@ -1391,99 +1337,91 @@ msgstr "Documentos de XSane"
  
  #. MENU_ITEM_BACKEND_DOC
  msgid "Backend doc"
@@ -1226,7 +1226,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_ITEM_COUNTER_LEN_INACTIVE
  msgid "inactive"
-@@ -1498,14 +1436,12 @@
+@@ -1498,14 +1436,12 @@ msgid "CCITT 1D Huffman compression"
  msgstr "Compresión CCITT 1D Huffman"
  
  #. MENU_ITEM_TIFF_COMP_CCITFAX3
@@ -1243,7 +1243,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_ITEM_TIFF_COMP_JPEG
  msgid "JPEG DCT compression"
-@@ -1513,32 +1449,31 @@
+@@ -1513,32 +1449,31 @@ msgstr "Compresión JPEG DCT"
  
  #. MENU_ITEM_TIFF_COMP_PACKBITS
  msgid "pack bits"
@@ -1283,7 +1283,7 @@ Index: xsane-0.998/po/es.po
  
  #. MENU_ITEM_LINEART_MODE_STANDARD
  msgid "Standard options window (lineart)"
-@@ -1566,58 +1501,55 @@
+@@ -1566,58 +1501,55 @@ msgstr "Añadir selección a la lista"
  
  #. MENU_ITEM_MEDIUM_ADD
  msgid "Add medium definition"
@@ -1355,7 +1355,7 @@ Index: xsane-0.998/po/es.po
  
  #. PROGRESS_SCANNING
  msgid "Scanning"
-@@ -1629,38 +1561,36 @@
+@@ -1629,38 +1561,36 @@ msgid "Receiving %s data"
  msgstr "Recibiendo datos %s"
  
  #. PROGRESS_PAGE
@@ -1402,7 +1402,7 @@ Index: xsane-0.998/po/es.po
  
  #. PROGRESS_SCALING_DATA
  msgid "Scaling image"
-@@ -1668,266 +1598,237 @@
+@@ -1668,266 +1598,237 @@ msgstr "Cambiando tamaño de imagen"
  
  #. PROGRESS_DESPECKLING_DATA
  msgid "Despeckling image"
@@ -1728,7 +1728,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_ENH_DEFAULT
  msgid ""
-@@ -1936,7 +1837,7 @@
+@@ -1936,7 +1837,7 @@ msgid ""
  "brightness = 0\n"
  "contrast = 0"
  msgstr ""
@@ -1737,7 +1737,7 @@ Index: xsane-0.998/po/es.po
  "gamma = 1.0\n"
  "brillo = 0\n"
  "contraste = 0"
-@@ -1951,28 +1852,27 @@
+@@ -1951,28 +1852,27 @@ msgstr "Guardar valores de mejora activo
  
  #. DESC_HIST_INTENSITY
  msgid "Show histogram of intensity/gray <Alt-i>"
@@ -1772,7 +1772,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_PRINTER_SETUP
  msgid "Select definition to change"
-@@ -1984,47 +1884,38 @@
+@@ -1984,47 +1884,38 @@ msgstr "Definir un nombre para la selecc
  
  #. DESC_PRINTER_COMMAND
  msgid "Enter command to be executed in copy mode (e.g. \"lpr\")"
@@ -1830,7 +1830,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_PRINTER_BOTTOMOFFSET
  #. DESC_FAX_BOTTOMOFFSET
-@@ -2033,37 +1924,39 @@
+@@ -2033,37 +1924,39 @@ msgstr "Deplazamiento hacia abajo desde
  
  #. DESC_PRINTER_GAMMA
  msgid "Additional gamma value for photocopy"
@@ -1877,7 +1877,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_TMP_PATH
  msgid "Path to temp directory"
-@@ -2071,270 +1964,197 @@
+@@ -2071,270 +1964,197 @@ msgstr "Ruta al directorio temporal"
  
  #. DESC_BUTTON_TMP_PATH_BROWSE
  msgid "Browse for temporary directory"
@@ -2205,7 +2205,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_FAX_FINE_MODE
  msgid "Send fax with high vertical resolution (196 lpi instead of 98 lpi)"
-@@ -2342,89 +2162,71 @@
+@@ -2342,89 +2162,71 @@ msgstr "Enviar fax con resolución verti
  
  #. DESC_FAX_PS_FLATEDECODED
  msgid "Create zlib compressed postscript image for fax (flatedecode)"
@@ -2313,7 +2313,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_PERMISSION_READ
  msgid "read"
-@@ -2435,9 +2237,8 @@
+@@ -2435,9 +2237,8 @@ msgid "write"
  msgstr "escribir"
  
  #. DESC_PERMISSION_SEARCH
@@ -2324,7 +2324,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_ADD_BATCH
  msgid "Add selection for batch scan"
-@@ -2456,7 +2257,6 @@
+@@ -2456,7 +2257,6 @@ msgid "Pick black point"
  msgstr "Tomar punto negro"
  
  #. DESC_ZOOM_FULL
@@ -2332,7 +2332,7 @@ Index: xsane-0.998/po/es.po
  msgid "Use full scan area"
  msgstr "Usar área de escaneo completa"
  
-@@ -2467,11 +2267,11 @@
+@@ -2467,11 +2267,11 @@ msgstr "Ampliar 20%"
  
  #. DESC_ZOOM_IN
  msgid "Click at position to zoom to"
@@ -2346,7 +2346,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_ZOOM_UNDO
  msgid "Undo last zoom"
-@@ -2479,40 +2279,35 @@
+@@ -2479,40 +2279,35 @@ msgstr "Deshacer última ampliación"
  
  #. DESC_FULL_PREVIEW_AREA
  msgid "Select visible area"
@@ -2396,7 +2396,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_PAPER_ORIENTATION
  msgid "Define image position for printing"
-@@ -2531,27 +2326,24 @@
+@@ -2531,27 +2326,24 @@ msgid "Clone image"
  msgstr "Clonar imagen"
  
  #. DESC_ROTATE90
@@ -2426,7 +2426,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_VIEWER_ZOOM
  msgid "Zoom image"
-@@ -2578,30 +2370,28 @@
+@@ -2578,30 +2370,28 @@ msgid "Y-Scale factor"
  msgstr "Factor de Escala Y"
  
  #. DESC_SCALE_WIDTH
@@ -2463,7 +2463,7 @@ Index: xsane-0.998/po/es.po
  
  #. DESC_BATCH_ADD
  msgid "Add selected preview area to batch list"
-@@ -2609,45 +2399,39 @@
+@@ -2609,45 +2399,39 @@ msgstr "Añadir vista previa seleccionad
  
  #. DESC_BATCH_DEL
  msgid "Delete selected area from batch list"
@@ -2518,7 +2518,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_CHANGE_WORKING_DIR
  msgid "Failed to change working directory to"
-@@ -2655,7 +2439,7 @@
+@@ -2655,7 +2439,7 @@ msgstr "Falló al cambiar el directorio
  
  #. ERR_FILENAME_TOO_LONG
  msgid "Filename too long"
@@ -2527,7 +2527,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_CREATE_TEMP_FILE
  msgid ""
-@@ -2664,6 +2448,10 @@
+@@ -2664,6 +2448,10 @@ msgid ""
  "select a temporary directory where you have\n"
  "write permissions."
  msgstr ""
@@ -2538,7 +2538,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_SET_OPTION
  msgid "Failed to set value of option"
-@@ -2683,52 +2471,51 @@
+@@ -2683,52 +2471,51 @@ msgstr "Falló al abrir dispositivo"
  
  #. ERR_NO_DEVICES
  msgid "no devices available"
@@ -2602,7 +2602,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_NO_MEM
  msgid "out of memory"
-@@ -2736,24 +2523,23 @@
+@@ -2736,24 +2523,23 @@ msgstr "sin memoria"
  
  #. ERR_TOO_MUCH_DATA
  msgid "Backend sends more image data than it defined in parameters"
@@ -2632,7 +2632,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_UNKNOWN_TYPE
  msgid "unknown type"
-@@ -2761,7 +2547,7 @@
+@@ -2761,7 +2547,7 @@ msgstr "tipo desconocido"
  
  #. ERR_UNKNOWN_CONSTRAINT_TYPE
  msgid "unknown constraint type"
@@ -2641,7 +2641,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_OPTION_NAME_NULL
  msgid "Option has empty name (NULL)."
-@@ -2769,32 +2555,31 @@
+@@ -2769,32 +2555,31 @@ msgstr "La opción tiene nombre vacío (
  
  #. ERR_BACKEND_BUG
  msgid "This is a backend bug. Please inform the author of the backend!"
@@ -2681,7 +2681,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_PASSWORD_FILE_INSECURE
  #, c-format
-@@ -2815,15 +2600,15 @@
+@@ -2815,15 +2600,15 @@ msgstr "Versión principal de XSane = "
  
  #. ERR_BACKEND_MAJOR_VERSION
  msgid "backend major version ="
@@ -2700,7 +2700,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_PREVIEW_BAD_DEPTH
  msgid "Preview cannot handle bit depth"
-@@ -2831,22 +2616,21 @@
+@@ -2831,22 +2616,21 @@ msgstr "La vista previa no puede manejar
  
  #. ERR_GIMP_SUPPORT_MISSING
  msgid "GIMP support missing"
@@ -2727,7 +2727,7 @@ Index: xsane-0.998/po/es.po
  msgid ""
  "You try to run XSane as ROOT, that really is DANGEROUS!\n"
  "\n"
-@@ -2854,11 +2638,11 @@
+@@ -2854,11 +2638,11 @@ msgid ""
  "have any problems while running XSane as root:\n"
  "YOU ARE ALONE!"
  msgstr ""
@@ -2743,7 +2743,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_HEADER_ERROR
  msgid "Error"
-@@ -2878,15 +2662,15 @@
+@@ -2878,15 +2662,15 @@ msgstr "Error de proceso hijo"
  
  #. ERR_FAILED_CREATE_FILE
  msgid "Failed to create file:"
@@ -2762,7 +2762,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_NETSCAPE_EXECUTE_FAIL
  msgid "Failed to execute netscape!"
-@@ -2894,11 +2678,11 @@
+@@ -2894,11 +2678,11 @@ msgstr "¡Falló al ejecutar Netscape!"
  
  #. ERR_SENDFAX_RECEIVER_MISSING
  msgid "Send fax: no receiver defined"
@@ -2776,7 +2776,7 @@ Index: xsane-0.998/po/es.po
  
  #. ERR_USED_FOR_DEVICE
  msgid "you want to use it for device"
-@@ -2906,7 +2690,7 @@
+@@ -2906,7 +2690,7 @@ msgstr "usted quiere usarlo para el disp
  
  #. ERR_MAY_CAUSE_PROBLEMS
  msgid "this may cause problems!"
@@ -2785,7 +2785,7 @@ Index: xsane-0.998/po/es.po
  
  #. WARN_UNSAVED_IMAGES
  #, c-format
-@@ -2934,34 +2718,28 @@
+@@ -2934,34 +2718,28 @@ msgid "Unsupported %d-bit output format:
  msgstr "Formato de salida de %d-bit no soportado: %s"
  
  #. ERR_CMS_CONVERSION
@@ -2825,7 +2825,7 @@ Index: xsane-0.998/po/es.po
  
  #. WARN_VIEWER_IMAGE_NOT_SAVED
  msgid "viewer image is not saved"
-@@ -2969,31 +2747,27 @@
+@@ -2969,31 +2747,27 @@ msgstr "La imagen del visor no se guard�
  
  #. FILE_FILTER_ALL_FILES
  msgid "All files"
@@ -2863,7 +2863,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_USAGE
  msgid "Usage:"
-@@ -3004,10 +2778,8 @@
+@@ -3004,10 +2778,8 @@ msgid "[OPTION]... [DEVICE]"
  msgstr "[OPCIÓN]... [DISPOSITIVO]"
  
  #. TEXT_HELP
@@ -2875,7 +2875,7 @@ Index: xsane-0.998/po/es.po
  "\n"
  "The format of [DEVICE] is backendname:devicefile (e.g. umax:/dev/scanner).\n"
  "[OPTION]... can be a combination of the following items:\n"
-@@ -3015,8 +2787,7 @@
+@@ -3015,8 +2787,7 @@ msgid ""
  " -v, --version                print version information\n"
  " -l, --license                print license information\n"
  "\n"
@@ -2885,7 +2885,7 @@ Index: xsane-0.998/po/es.po
  "\n"
  " -V, --viewer                 start with viewer-mode active (default)\n"
  " -s, --save                   start with save-mode active\n"
-@@ -3026,71 +2797,56 @@
+@@ -3026,71 +2797,56 @@ msgid ""
  " -e, --email                  start with e-mail-mode active\n"
  " -n, --no-mode-selection      disable menu for XSane mode selection\n"
  "\n"
@@ -2982,7 +2982,7 @@ Index: xsane-0.998/po/es.po
  
  #. Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/"
  #. XSANE_GIMP_MENU_DIALOG
-@@ -3103,30 +2859,27 @@
+@@ -3103,30 +2859,27 @@ msgstr "<Toolbox>/File/Acquire/XSane: "
  
  #. XSANE_GIMP_MENU_DIALOG_OLD
  msgid "<Toolbox>/Xtns/XSane/Device dialog..."
@@ -3019,7 +3019,7 @@ Index: xsane-0.998/po/es.po
  "6) Posiblemente haya más de una versión de SANE instalada"
  
  #. strings that are used in structures, so it is not allowed to use _()/gettext() here
-@@ -3244,44 +2997,36 @@
+@@ -3244,44 +2997,36 @@ msgid "Rossmann negative HR 100"
  msgstr "Negativo Rossmann HR 100"
  
  #. TEXT_PROJECT_STATUS_NOT_CREATED
@@ -3072,7 +3072,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_EMAIL_STATUS_POP3_CONNECTION_FAILED
  msgid "POP3 connection failed"
-@@ -3289,12 +3034,11 @@
+@@ -3289,12 +3034,11 @@ msgstr "Falló la conexión POP3"
  
  #. TEXT_EMAIL_STATUS_POP3_LOGIN_FAILED
  msgid "POP3 login failed"
@@ -3087,7 +3087,7 @@ Index: xsane-0.998/po/es.po
  
  #. TEXT_EMAIL_STATUS_SMTP_CONNECTION_FAILED
  msgid "SMTP connection failed"
-@@ -3302,29 +3046,25 @@
+@@ -3302,29 +3046,25 @@ msgstr "Falló la conexión SMTP"
  
  #. TEXT_EMAIL_STATUS_SMTP_ERR_FROM
  msgid "From entry not accepted"
@@ -3121,7 +3121,7 @@ Index: xsane-0.998/po/es.po
  msgid "Queueing fax"
  msgstr "Poniendo el fax en la cola de envío"
  
-@@ -3334,22 +3074,22 @@
+@@ -3334,22 +3074,22 @@ msgstr "el fax está en la cola de enví
  
  #. Sane backend messages
  msgid "flatbed scanner"
@@ -3148,7 +3148,7 @@ Index: xsane-0.998/po/es.po
  
  msgid "Success"
  msgstr "Éxito"
-@@ -3358,25 +3098,25 @@
+@@ -3358,25 +3098,25 @@ msgid "Operation not supported"
  msgstr "Operación no soportada"
  
  msgid "Operation was cancelled"
@@ -3179,7 +3179,7 @@ Index: xsane-0.998/po/es.po
  
  msgid "Error during device I/O"
  msgstr "Error durante E/S de dispositivo"
-@@ -3385,23 +3125,18 @@
+@@ -3385,23 +3125,18 @@ msgid "Out of memory"
  msgstr "Sin memoria"
  
  msgid "Access to resource has been denied"
@@ -3204,7 +3204,7 @@ Index: xsane-0.998/po/es.po
  #~ msgid "Printer gamma blue:"
  #~ msgstr "Gamma azul de impresora:"
  
-@@ -3436,7 +3171,6 @@
+@@ -3436,7 +3171,6 @@ msgstr "Acceso al recurso fue prohibido"
  #, fuzzy
  #~ msgid "Browse for scanner transmissive gray ICM-profile"
  #~ msgstr "Explorar nombre de archivo de imagen"
@@ -3212,7 +3212,7 @@ Index: xsane-0.998/po/es.po
  #~ msgid "GIMP can't handle depth %d bits/color"
  #~ msgstr "GIMP no puede manejar la profundidad de %d bits/color"
  
-@@ -3447,7 +3181,6 @@
+@@ -3447,7 +3181,6 @@ msgstr "Acceso al recurso fue prohibido"
  #, fuzzy
  #~ msgid "Embed scanner/source ICM profile for GIMP"
  #~ msgstr "Borrar impresora"
@@ -3220,7 +3220,7 @@ Index: xsane-0.998/po/es.po
  #~ msgid "Enter name of fax project"
  #~ msgstr "Ingresar nombre del proyecto de fax"
  
-@@ -3458,17 +3191,14 @@
+@@ -3458,17 +3191,14 @@ msgstr "Acceso al recurso fue prohibido"
  #, fuzzy
  #~ msgid "Enter name of multipage project"
  #~ msgstr "Ingresar nombre del proyecto de correo electrónico"
@@ -3238,7 +3238,7 @@ Index: xsane-0.998/po/es.po
  #~ msgid "Could not create filenames for preview files"
  #~ msgstr ""
  #~ "No se puede crear nombres de archivos para archivos de previsualización"
-@@ -3476,19 +3206,14 @@
+@@ -3476,19 +3206,14 @@ msgstr "Acceso al recurso fue prohibido"
  #, fuzzy
  #~ msgid "POP3 authentication"
  #~ msgstr "Autentificación POP3"
@@ -3258,7 +3258,7 @@ Index: xsane-0.998/po/es.po
  #~ msgid ""
  #~ "Select scansource for Automatic Document feeder. If this scansource is "
  #~ "selected XSane scans until \"out of paper\" or error."
-@@ -3532,7 +3257,6 @@
+@@ -3532,7 +3257,6 @@ msgstr "Acceso al recurso fue prohibido"
  #, fuzzy
  #~ msgid "Multipage saving aborted"
  #~ msgstr "Proyecto de correo electrónico creado"
@@ -3266,7 +3266,7 @@ Index: xsane-0.998/po/es.po
  #~ msgid "Viewer (png):"
  #~ msgstr "Visor (png):"
  
-@@ -3544,9 +3268,8 @@
+@@ -3544,9 +3268,8 @@ msgstr "Acceso al recurso fue prohibido"
  #, fuzzy
  #~ msgid "Failed to execute e-mail image viewer:"
  #~ msgstr "Falló al ejecutar visor de imagen de correo electrónico:"
@@ -3277,10 +3277,10 @@ Index: xsane-0.998/po/es.po
  #~ msgid "Mail"
  #~ msgstr "Correo electrónico"
 +
-Index: xsane-0.998/po/gl.po
+Index: trunk/po/gl.po
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xsane-0.998/po/gl.po	2011-02-04 19:51:23.657016001 +0100
+--- /dev/null
++++ trunk/po/gl.po
 @@ -0,0 +1,3127 @@
 +# Galego translation
 +# XSane Galician gl.po file
diff --git a/debian/patches/i18n_po_update_fr.patch b/debian/patches/0905-i18n_po_update_fr.patch
index dfa81bf..dfa81bf 100644
--- a/debian/patches/i18n_po_update_fr.patch
+++ b/debian/patches/0905-i18n_po_update_fr.patch
diff --git a/debian/patches/fix_message_typo.patch b/debian/patches/0910-fix_message_typo.patch
index 17b8fae..8de8ea1 100644
--- a/debian/patches/fix_message_typo.patch
+++ b/debian/patches/0910-fix_message_typo.patch
@@ -5,11 +5,11 @@ Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=569747
 Bug-Debian: http://bugs.debian.org/569747
 Forwarded: no
 
-Index: xsane-0.998/po/ca.po
+Index: trunk/po/ca.po
 ===================================================================
---- xsane-0.998.orig/po/ca.po	2007-11-21 20:18:25.000000000 +0100
-+++ xsane-0.998/po/ca.po	2011-02-04 19:51:14.781016002 +0100
-@@ -1969,11 +1969,11 @@
+--- trunk.orig/po/ca.po
++++ trunk/po/ca.po
+@@ -1969,11 +1969,11 @@ msgid "Additional gamma value for blue c
  msgstr "Valor gamma addicional de la component blava per a les fotocòpies"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -23,11 +23,11 @@ Index: xsane-0.998/po/ca.po
  msgstr "Crea un fitxer PostScript que conté el perfil ICM de la impressora"
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/cs.po
+Index: trunk/po/cs.po
 ===================================================================
---- xsane-0.998.orig/po/cs.po	2007-11-21 20:18:25.000000000 +0100
-+++ xsane-0.998/po/cs.po	2011-02-04 19:51:14.781016002 +0100
-@@ -2015,11 +2015,11 @@
+--- trunk.orig/po/cs.po
++++ trunk/po/cs.po
+@@ -2015,11 +2015,11 @@ msgid "Additional gamma value for blue c
  msgstr "Dodatečná gama hodnota pro modrou komponentu pro kopírování"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -41,11 +41,11 @@ Index: xsane-0.998/po/cs.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/da.po
+Index: trunk/po/da.po
 ===================================================================
---- xsane-0.998.orig/po/da.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/da.po	2011-02-04 19:51:14.801016002 +0100
-@@ -1960,11 +1960,11 @@
+--- trunk.orig/po/da.po
++++ trunk/po/da.po
+@@ -1960,11 +1960,11 @@ msgid "Additional gamma value for blue c
  msgstr "Supplerende gammaværdi for fotokopiering, blå farvedel"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -59,11 +59,11 @@ Index: xsane-0.998/po/da.po
  msgstr "Danner en postscriptfil der indeholder ICM-profilen for printeren"
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/de.po
+Index: trunk/po/de.po
 ===================================================================
---- xsane-0.998.orig/po/de.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/de.po	2011-02-04 19:51:14.825016002 +0100
-@@ -1962,11 +1962,11 @@
+--- trunk.orig/po/de.po
++++ trunk/po/de.po
+@@ -1962,11 +1962,11 @@ msgid "Additional gamma value for blue c
  msgstr "Zusätzlicher Gammawert für blaue Komponente beim Fotokopieren"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -77,11 +77,11 @@ Index: xsane-0.998/po/de.po
  msgstr "Erzeugt eine Postscriptdatei die das ICM-Profil des Druckers enthält"
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/es.po
+Index: trunk/po/es.po
 ===================================================================
---- xsane-0.998.orig/po/es.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/es.po	2011-02-04 19:51:14.853016001 +0100
-@@ -2048,11 +2048,11 @@
+--- trunk.orig/po/es.po
++++ trunk/po/es.po
+@@ -2048,11 +2048,11 @@ msgid "Additional gamma value for blue c
  msgstr "Valor de gamma adicional del valor azul para fotocopia"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -95,11 +95,11 @@ Index: xsane-0.998/po/es.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/fi.po
+Index: trunk/po/fi.po
 ===================================================================
---- xsane-0.998.orig/po/fi.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/fi.po	2011-02-04 19:51:14.877016001 +0100
-@@ -1943,11 +1943,11 @@
+--- trunk.orig/po/fi.po
++++ trunk/po/fi.po
+@@ -1943,11 +1943,11 @@ msgid "Additional gamma value for blue c
  msgstr ""
  
  #. DESC_PRINTER_EMBED_CSA
@@ -113,11 +113,11 @@ Index: xsane-0.998/po/fi.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/fr.po
+Index: trunk/po/fr.po
 ===================================================================
---- xsane-0.998.orig/po/fr.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/fr.po	2011-02-04 19:51:14.921016003 +0100
-@@ -2042,11 +2042,11 @@
+--- trunk.orig/po/fr.po
++++ trunk/po/fr.po
+@@ -2042,11 +2042,11 @@ msgid "Additional gamma value for blue c
  msgstr "Gamma additionnel pour la composante bleue pour la photocopie"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -131,11 +131,11 @@ Index: xsane-0.998/po/fr.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/hu.po
+Index: trunk/po/hu.po
 ===================================================================
---- xsane-0.998.orig/po/hu.po	2007-11-21 20:18:27.000000000 +0100
-+++ xsane-0.998/po/hu.po	2011-02-04 19:51:14.945016000 +0100
-@@ -2012,11 +2012,11 @@
+--- trunk.orig/po/hu.po
++++ trunk/po/hu.po
+@@ -2012,11 +2012,11 @@ msgid "Additional gamma value for blue c
  msgstr "Plusz kék gamma érték a fotómásoláshoz"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -149,11 +149,11 @@ Index: xsane-0.998/po/hu.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/it.po
+Index: trunk/po/it.po
 ===================================================================
---- xsane-0.998.orig/po/it.po	2007-11-21 20:18:27.000000000 +0100
-+++ xsane-0.998/po/it.po	2011-02-04 19:51:14.965016001 +0100
-@@ -1965,11 +1965,11 @@
+--- trunk.orig/po/it.po
++++ trunk/po/it.po
+@@ -1965,11 +1965,11 @@ msgid "Additional gamma value for blue c
  msgstr "Valore aggiuntivo della gamma per la componente blu per la fotocopia"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -167,11 +167,11 @@ Index: xsane-0.998/po/it.po
  msgstr "Crea un file postscript che contiene il profilo ICM della stampante"
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/ja.po
+Index: trunk/po/ja.po
 ===================================================================
---- xsane-0.998.orig/po/ja.po	2007-11-21 20:18:27.000000000 +0100
-+++ xsane-0.998/po/ja.po	2011-02-04 19:51:14.981016000 +0100
-@@ -2031,11 +2031,11 @@
+--- trunk.orig/po/ja.po
++++ trunk/po/ja.po
+@@ -2031,11 +2031,11 @@ msgid "Additional gamma value for blue c
  msgstr "焼き増しへの青成分追加ガンマ値"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -185,11 +185,11 @@ Index: xsane-0.998/po/ja.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/nl.po
+Index: trunk/po/nl.po
 ===================================================================
---- xsane-0.998.orig/po/nl.po	2007-11-21 20:18:27.000000000 +0100
-+++ xsane-0.998/po/nl.po	2011-02-04 19:51:14.997016002 +0100
-@@ -2025,11 +2025,11 @@
+--- trunk.orig/po/nl.po
++++ trunk/po/nl.po
+@@ -2025,11 +2025,11 @@ msgid "Additional gamma value for blue c
  msgstr "Extra gammacorrectie voor blauw voor fotokopie"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -203,11 +203,11 @@ Index: xsane-0.998/po/nl.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/pa.po
+Index: trunk/po/pa.po
 ===================================================================
---- xsane-0.998.orig/po/pa.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/pa.po	2011-02-04 19:51:15.013016002 +0100
-@@ -1951,11 +1951,11 @@
+--- trunk.orig/po/pa.po
++++ trunk/po/pa.po
+@@ -1951,11 +1951,11 @@ msgid "Additional gamma value for blue c
  msgstr "ਫੋਟੋ-ਕਾਪੀ ਲਈ ਨੀਲੇ ਭਾਗ ਵਾਸਤੇ ਹੋਰ ਗਾਮਾ ਮੁੱਲ"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -221,11 +221,11 @@ Index: xsane-0.998/po/pa.po
  msgstr "ਇੱਕ ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਬਣਾਓ, ਜੋ ਕਿ ਪਰਿੰਟਰ ਦਾ ICM ਪਰੋਫਾਇਲ ਰੱਖਦੀ ਹੋਵੇ।"
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/pl.po
+Index: trunk/po/pl.po
 ===================================================================
---- xsane-0.998.orig/po/pl.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/pl.po	2011-02-04 19:51:15.049016001 +0100
-@@ -2030,11 +2030,11 @@
+--- trunk.orig/po/pl.po
++++ trunk/po/pl.po
+@@ -2030,11 +2030,11 @@ msgid "Additional gamma value for blue c
  msgstr "Dodatkowy parametr gamma dla niebieskiej składowej kopii"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -239,11 +239,11 @@ Index: xsane-0.998/po/pl.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/pt.po
+Index: trunk/po/pt.po
 ===================================================================
---- xsane-0.998.orig/po/pt.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/pt.po	2011-02-04 19:51:15.065016001 +0100
-@@ -2040,11 +2040,11 @@
+--- trunk.orig/po/pt.po
++++ trunk/po/pt.po
+@@ -2040,11 +2040,11 @@ msgid "Additional gamma value for blue c
  msgstr "Valor gama adicional para o componente azul para fotocópia"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -257,11 +257,11 @@ Index: xsane-0.998/po/pt.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/pt_BR.po
+Index: trunk/po/pt_BR.po
 ===================================================================
---- xsane-0.998.orig/po/pt_BR.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/pt_BR.po	2011-02-04 19:51:15.081016002 +0100
-@@ -2040,11 +2040,11 @@
+--- trunk.orig/po/pt_BR.po
++++ trunk/po/pt_BR.po
+@@ -2040,11 +2040,11 @@ msgid "Additional gamma value for blue c
  msgstr "Valor gama adicional para o componente azul para fotocópia"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -275,11 +275,11 @@ Index: xsane-0.998/po/pt_BR.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/ro.po
+Index: trunk/po/ro.po
 ===================================================================
---- xsane-0.998.orig/po/ro.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/ro.po	2011-02-04 19:51:15.097016002 +0100
-@@ -2043,11 +2043,11 @@
+--- trunk.orig/po/ro.po
++++ trunk/po/ro.po
+@@ -2043,11 +2043,11 @@ msgid "Additional gamma value for blue c
  msgstr "Valoare gamma adiţională componentă albastru pt. fotocopie"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -293,11 +293,11 @@ Index: xsane-0.998/po/ro.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/ru.po
+Index: trunk/po/ru.po
 ===================================================================
---- xsane-0.998.orig/po/ru.po	2007-11-21 20:18:29.000000000 +0100
-+++ xsane-0.998/po/ru.po	2011-02-04 19:51:15.133016000 +0100
-@@ -2024,11 +2024,11 @@
+--- trunk.orig/po/ru.po
++++ trunk/po/ru.po
+@@ -2024,11 +2024,11 @@ msgid "Additional gamma value for blue c
  msgstr "Дополнительное значение синего компонента гаммы при копировании"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -311,11 +311,11 @@ Index: xsane-0.998/po/ru.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/sk.po
+Index: trunk/po/sk.po
 ===================================================================
---- xsane-0.998.orig/po/sk.po	2007-11-21 20:18:29.000000000 +0100
-+++ xsane-0.998/po/sk.po	2011-02-04 19:51:15.149016002 +0100
-@@ -1971,11 +1971,11 @@
+--- trunk.orig/po/sk.po
++++ trunk/po/sk.po
+@@ -1971,11 +1971,11 @@ msgid "Additional gamma value for blue c
  msgstr "Dodatočná gama hodnota pre modrý komponent fotokópie"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -329,11 +329,11 @@ Index: xsane-0.998/po/sk.po
  msgstr "Vytvoriť postscript súbor obsahujúci ICM profil tlačiarne"
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/sl.po
+Index: trunk/po/sl.po
 ===================================================================
---- xsane-0.998.orig/po/sl.po	2007-11-21 20:18:29.000000000 +0100
-+++ xsane-0.998/po/sl.po	2011-02-04 19:51:15.165016000 +0100
-@@ -2015,11 +2015,11 @@
+--- trunk.orig/po/sl.po
++++ trunk/po/sl.po
+@@ -2015,11 +2015,11 @@ msgid "Additional gamma value for blue c
  msgstr "Dodatna vrednost gama za modro komponento pri fotokopiranju"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -347,11 +347,11 @@ Index: xsane-0.998/po/sl.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/sr.po
+Index: trunk/po/sr.po
 ===================================================================
---- xsane-0.998.orig/po/sr.po	2007-11-21 20:18:29.000000000 +0100
-+++ xsane-0.998/po/sr.po	2011-02-04 19:51:15.189016000 +0100
-@@ -1958,12 +1958,12 @@
+--- trunk.orig/po/sr.po
++++ trunk/po/sr.po
+@@ -1958,12 +1958,12 @@ msgid "Additional gamma value for blue c
  msgstr "Додатна вредност гама за плаву компоненту при фотокопирању"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -368,11 +368,11 @@ Index: xsane-0.998/po/sr.po
  
  #. DESC_PRINTER_CMS_BPC
  msgid "Applies black point compensation"
-Index: xsane-0.998/po/sv.po
+Index: trunk/po/sv.po
 ===================================================================
---- xsane-0.998.orig/po/sv.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/sv.po	2011-02-04 19:51:15.209016000 +0100
-@@ -2043,11 +2043,11 @@
+--- trunk.orig/po/sv.po
++++ trunk/po/sv.po
+@@ -2043,11 +2043,11 @@ msgid "Additional gamma value for blue c
  msgstr "Extra gammavärde för den blåa komponeneten vid fotokopiering"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -386,11 +386,11 @@ Index: xsane-0.998/po/sv.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/tr.po
+Index: trunk/po/tr.po
 ===================================================================
---- xsane-0.998.orig/po/tr.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/tr.po	2011-02-04 19:51:15.409016001 +0100
-@@ -2023,11 +2023,11 @@
+--- trunk.orig/po/tr.po
++++ trunk/po/tr.po
+@@ -2023,11 +2023,11 @@ msgid "Additional gamma value for blue c
  msgstr "Fotokopi için mavi bileşenin ilave gamma değeri"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -404,11 +404,11 @@ Index: xsane-0.998/po/tr.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/vi.po
+Index: trunk/po/vi.po
 ===================================================================
---- xsane-0.998.orig/po/vi.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/vi.po	2011-02-04 19:51:15.425016002 +0100
-@@ -2061,11 +2061,11 @@
+--- trunk.orig/po/vi.po
++++ trunk/po/vi.po
+@@ -2061,11 +2061,11 @@ msgid "Additional gamma value for blue c
  msgstr "Giá trị gamma thêm cho thành phần màu xanh da trời cho photocopy"
  
  #. DESC_PRINTER_EMBED_CSA
@@ -422,11 +422,11 @@ Index: xsane-0.998/po/vi.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/xsane.pot
+Index: trunk/po/xsane.pot
 ===================================================================
---- xsane-0.998.orig/po/xsane.pot	2007-08-13 09:22:06.000000000 +0200
-+++ xsane-0.998/po/xsane.pot	2011-02-04 19:51:15.425016003 +0100
-@@ -1912,11 +1912,11 @@
+--- trunk.orig/po/xsane.pot
++++ trunk/po/xsane.pot
+@@ -1912,11 +1912,11 @@ msgid "Additional gamma value for blue c
  msgstr ""
  
  #. DESC_PRINTER_EMBED_CSA
@@ -440,11 +440,11 @@ Index: xsane-0.998/po/xsane.pot
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/zh.po
+Index: trunk/po/zh.po
 ===================================================================
---- xsane-0.998.orig/po/zh.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/zh.po	2011-02-04 19:51:15.457016001 +0100
-@@ -2011,11 +2011,11 @@
+--- trunk.orig/po/zh.po
++++ trunk/po/zh.po
+@@ -2011,11 +2011,11 @@ msgid "Additional gamma value for blue c
  msgstr ""
  
  #. DESC_PRINTER_EMBED_CSA
@@ -458,11 +458,11 @@ Index: xsane-0.998/po/zh.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/zh_CN.po
+Index: trunk/po/zh_CN.po
 ===================================================================
---- xsane-0.998.orig/po/zh_CN.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/zh_CN.po	2011-02-04 19:51:15.493016000 +0100
-@@ -1986,11 +1986,11 @@
+--- trunk.orig/po/zh_CN.po
++++ trunk/po/zh_CN.po
+@@ -1986,11 +1986,11 @@ msgid "Additional gamma value for blue c
  msgstr ""
  
  #. DESC_PRINTER_EMBED_CSA
@@ -476,10 +476,10 @@ Index: xsane-0.998/po/zh_CN.po
  msgstr ""
  
  #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/src/xsane-text.h
+Index: trunk/src/xsane-text.h
 ===================================================================
---- xsane-0.998.orig/src/xsane-text.h	2011-02-04 19:50:36.505016000 +0100
-+++ xsane-0.998/src/xsane-text.h	2011-02-04 19:51:15.493016001 +0100
+--- trunk.orig/src/xsane-text.h
++++ trunk/src/xsane-text.h
 @@ -579,8 +579,8 @@
  #define DESC_PRINTER_GAMMA_RED		_("Additional gamma value for red component for photocopy")
  #define DESC_PRINTER_GAMMA_GREEN	_("Additional gamma value for green component for photocopy")
diff --git a/debian/patches/series b/debian/patches/series
index c56d2e6..8877516 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,22 +1,22 @@
-man_misleading.patch
-desktop_file.patch
-typo.patch
-typo_manpage.patch
-deb_printing_defaults.patch
-deb_docviewer.patch
-deb_gimp_acquire_menu.patch
-deb_inhibit_clickthrough.patch
-fix_options_handling_fix.patch
-fix_pdf_xref.patch
-fix_pdf_floats.patch
-fix_broken_links.patch
-fix_message_typo.patch
-i18n_po_update_es_add_gl.patch
-i18n_po_update_fr.patch
-fix_preview_mouse_events.patch
-fix_spin_button_pagesize.patch
-fix_tighten_default_umask.patch
-fix_png15.patch
-deb_non_working_help_menu.patch
-xsane-0.999-lcms2.patch
-lcms2_configure.patch
+0600-man_misleading.patch
+0125-desktop_file.patch
+0170-typo.patch
+0605-typo_manpage.patch
+0120-deb_printing_defaults.patch
+0100-deb_docviewer.patch
+0105-deb_gimp_acquire_menu.patch
+0110-deb_inhibit_clickthrough.patch
+0130-fix_options_handling_fix.patch
+0140-fix_pdf_xref.patch
+0135-fix_pdf_floats.patch
+0610-fix_broken_links.patch
+0910-fix_message_typo.patch
+0900-i18n_po_update_es_add_gl.patch
+0905-i18n_po_update_fr.patch
+0150-fix_preview_mouse_events.patch
+0155-fix_spin_button_pagesize.patch
+0160-fix_tighten_default_umask.patch
+0145-fix_png15.patch
+0115-deb_non_working_help_menu.patch
+0165-xsane-0.999-lcms2.patch
+0001-lcms2_configure.patch