Imported Debian patch 0.997-1debian/0.997-1

10 files changed, 104 insertions, 140 deletions

diff --git a/debian/changelog b/debian/changelog
index 34260a1..70e0913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xsane (0.997-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * debian/patches/fix_preview_mouse_events.patch:
+    + Added; fix mouse events handling in the preview window (closes: #583661).
+  * debian/patches/fix_cap_always_settable.patch,
+    debian/patches/fix_spin_button_pagesize.patch:
+    + Removed; fixed upstream.
+
+ -- Julien BLACHE <jblache@debian.org>  Sat, 29 May 2010 12:49:57 +0200
+
 xsane (0.996-4) unstable; urgency=low
 
   * Package converted to source format 3.0 (quilt).
diff --git a/debian/patches/deb_gimp_acquire_menu.patch b/debian/patches/deb_gimp_acquire_menu.patch
index e0d0168..f372107 100644
--- a/debian/patches/deb_gimp_acquire_menu.patch
+++ b/debian/patches/deb_gimp_acquire_menu.patch
@@ -3,11 +3,11 @@ Description: Change XSane's GIMP menu layout
 Author: Julien BLACHE <jblache@debian.org>
 Forwarded: not-needed
 
-Index: xsane-0.996/src/xsane-text.h
+Index: xsane-0.997/src/xsane-text.h
 ===================================================================
---- xsane-0.996.orig/src/xsane-text.h	2010-03-13 20:42:30.663742229 +0100
-+++ xsane-0.996/src/xsane-text.h	2010-03-13 20:42:59.177742198 +0100
-@@ -869,8 +869,8 @@
+--- xsane-0.997.orig/src/xsane-text.h	2002-08-16 10:34:58.000000000 +0200
++++ xsane-0.997/src/xsane-text.h	2010-05-29 12:30:25.543408856 +0200
+@@ -870,8 +870,8 @@
  #define XSANE_GIMP_INSTALL_HELP		_("This function provides access to scanners and other image acquisition devices through the SANE (Scanner Access Now Easy) interface.")
  
  /* Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/" */
diff --git a/debian/patches/deb_inhibit_clickthrough.patch b/debian/patches/deb_inhibit_clickthrough.patch
index daf82ec..6c6a98a 100644
--- a/debian/patches/deb_inhibit_clickthrough.patch
+++ b/debian/patches/deb_inhibit_clickthrough.patch
@@ -3,11 +3,11 @@ Description: Inhibit XSane's click-through license
 Author: Julien BLACHE <jblache@debian.org>
 Forwarded: not-needed
 
-Index: xsane-0.996/src/xsane.c
+Index: xsane-0.997/src/xsane.c
 ===================================================================
---- xsane-0.996.orig/src/xsane.c	2010-03-13 20:42:29.786742130 +0100
-+++ xsane-0.996/src/xsane.c	2010-03-13 20:42:59.978765829 +0100
-@@ -1901,11 +1901,11 @@
+--- xsane-0.997.orig/src/xsane.c	2002-10-02 13:02:50.000000000 +0200
++++ xsane-0.997/src/xsane.c	2010-05-29 12:30:32.277409114 +0200
+@@ -1909,11 +1909,11 @@
  /* ---------------------------------------------------------------------------------------------------------------------- */
  
  static int xsane_pref_restore(void)
@@ -21,7 +21,7 @@ Index: xsane-0.996/src/xsane.c
   int i;
  
    DBG(DBG_proc, "xsane_pref_restore\n");
-@@ -1919,6 +1919,7 @@
+@@ -1927,6 +1927,7 @@
      preferences_restore(fd);
      close(fd);
  
@@ -29,7 +29,7 @@ Index: xsane-0.996/src/xsane.c
      /* the version test only is done for the local xsane.rc file because each user */
      /* shall accept (or not) the license for xsane */
      if (preferences.xsane_version_str)
-@@ -1928,6 +1929,7 @@
+@@ -1936,6 +1937,7 @@
          result = FALSE; /* this version already has been started */
        }
      }
@@ -37,7 +37,7 @@ Index: xsane-0.996/src/xsane.c
    }
    else /* no local sane file, look for system file */
    {
-@@ -5796,7 +5798,10 @@
+@@ -5815,7 +5817,10 @@
      xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */
    }
  
@@ -48,7 +48,7 @@ Index: xsane-0.996/src/xsane.c
    if (xsane_pref_restore()) /* restore preferences, returns TRUE if license is not accpted yet */
    {
      if (xsane_display_eula(1)) /* show license and ask for accept/not accept */
-@@ -5809,6 +5814,7 @@
+@@ -5828,6 +5833,7 @@
        xsane_pref_save();
      }
    }
diff --git a/debian/patches/fix_cap_always_settable.patch b/debian/patches/fix_cap_always_settable.patch
deleted file mode 100644
index 68945aa..0000000
--- a/debian/patches/fix_cap_always_settable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Remove check for SANE_CAP_ALWAYS_SETTABLE
- The flag was never part of the standard and has been removed upstream
- in SANE 1.0.20.
-Author: Julien BLACHE <jblache@debian.org>
-
-Index: xsane-0.996/src/xsane-back-gtk.c
-===================================================================
---- xsane-0.996.orig/src/xsane-back-gtk.c	2010-03-13 20:43:00.696742544 +0100
-+++ xsane-0.996/src/xsane-back-gtk.c	2010-03-13 20:43:03.360741649 +0100
-@@ -2622,10 +2622,7 @@
-       continue;
-     }
- 
--    if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
--    {
--      gtk_widget_set_sensitive(xsane.element[i].widget, sensitive);
--    }
-+    gtk_widget_set_sensitive(xsane.element[i].widget, sensitive);
-   }
- 
-   if (xsane.xsanemode_widget)
diff --git a/debian/patches/fix_options_handling_fix.patch b/debian/patches/fix_options_handling_fix.patch
index 11d814f..4b6565c 100644
--- a/debian/patches/fix_options_handling_fix.patch
+++ b/debian/patches/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.996/src/xsane-back-gtk.c
+Index: xsane-0.997/src/xsane-back-gtk.c
 ===================================================================
---- xsane-0.996.orig/src/xsane-back-gtk.c	2010-03-13 20:42:28.869742439 +0100
-+++ xsane-0.996/src/xsane-back-gtk.c	2010-03-13 20:43:00.696742544 +0100
-@@ -2226,11 +2226,13 @@
+--- xsane-0.997.orig/src/xsane-back-gtk.c	2002-10-02 13:05:52.000000000 +0200
++++ xsane-0.997/src/xsane-back-gtk.c	2010-05-29 12:30:37.652409969 +0200
+@@ -2229,11 +2229,13 @@
  /* ----------------------------------------------------------------------------------------------------------------- */
  
  void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],
@@ -23,7 +23,7 @@ Index: xsane-0.996/src/xsane-back-gtk.c
   int i, num_items;
  
    DBG(DBG_proc, "xsane_back_gtk_option_menu_new(%s)\n", name);
-@@ -2248,16 +2250,23 @@
+@@ -2251,16 +2253,23 @@
  
    menu_items = malloc((num_items + 1) * sizeof(menu_items[0]));
  
@@ -49,7 +49,7 @@ Index: xsane-0.996/src/xsane-back-gtk.c
      menu_items[i].elem = elem;
      menu_items[i].index = i;
    }
-@@ -2403,14 +2412,15 @@
+@@ -2406,14 +2415,15 @@
    xsane.standard_hbox = NULL;
    xsane.advanced_hbox = NULL;
  
@@ -67,10 +67,10 @@ Index: xsane-0.996/src/xsane-back-gtk.c
        {
          for (j = 0; j < elem->menu_size; ++j)
          {
-Index: xsane-0.996/src/xsane-back-gtk.h
+Index: xsane-0.997/src/xsane-back-gtk.h
 ===================================================================
---- xsane-0.996.orig/src/xsane-back-gtk.h	2010-03-13 20:42:28.877742647 +0100
-+++ xsane-0.996/src/xsane-back-gtk.h	2010-03-13 20:43:00.696742544 +0100
+--- xsane-0.997.orig/src/xsane-back-gtk.h	2007-02-24 01:56:54.000000000 +0100
++++ xsane-0.997/src/xsane-back-gtk.h	2010-05-29 12:30:37.652409969 +0200
 @@ -117,7 +117,7 @@
  	   gfloat quant, int automatic,
  	   DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
@@ -80,10 +80,10 @@ Index: xsane-0.996/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.996/src/xsane-front-gtk.c
+Index: xsane-0.997/src/xsane-front-gtk.c
 ===================================================================
---- xsane-0.996.orig/src/xsane-front-gtk.c	2010-03-13 20:42:28.886742036 +0100
-+++ xsane-0.996/src/xsane-front-gtk.c	2010-03-13 20:43:00.700741126 +0100
+--- xsane-0.997.orig/src/xsane-front-gtk.c	2002-10-02 13:04:33.000000000 +0200
++++ xsane-0.997/src/xsane-front-gtk.c	2010-05-29 12:30:37.681408559 +0200
 @@ -64,10 +64,10 @@
                                           int *state, void *xsane_toggle_button_callback);
  GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc,
@@ -97,7 +97,7 @@ Index: xsane-0.996/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,
-@@ -1007,12 +1007,14 @@
+@@ -1011,12 +1011,14 @@
  
  /* ---------------------------------------------------------------------------------------------------------------------- */
  
@@ -113,7 +113,7 @@ Index: xsane-0.996/src/xsane-front-gtk.c
   int i, num_items;
  
    DBG(DBG_proc, "xsane_option_menu_new\n");
-@@ -1031,9 +1033,16 @@
+@@ -1035,9 +1037,16 @@
      gtk_widget_set_name(menu, widget_name);
    }
  
@@ -131,7 +131,7 @@ Index: xsane-0.996/src/xsane-front-gtk.c
      gtk_container_add(GTK_CONTAINER(menu), item);
  
      if (option_menu_callback)
-@@ -1047,7 +1056,7 @@
+@@ -1051,7 +1060,7 @@
  
      gtk_widget_show(item);
  
@@ -140,7 +140,7 @@ Index: xsane-0.996/src/xsane-front-gtk.c
      menu_items[i].elem  = elem;
      menu_items[i].index = i;
    }
-@@ -1075,7 +1084,7 @@
+@@ -1079,7 +1088,7 @@
  /* ---------------------------------------------------------------------------------------------------------------------- */
  
  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.996/src/xsane-front-gtk.c
                                         GtkWidget **data, int option,
                                         void *option_menu_callback, SANE_Int settable, const gchar *widget_name)
  {
-@@ -1094,7 +1103,7 @@
+@@ -1098,7 +1107,7 @@
    gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 2);
    gtk_widget_show(pixmapwidget);
  
@@ -158,10 +158,10 @@ Index: xsane-0.996/src/xsane-front-gtk.c
    gtk_widget_show(hbox);
  }
  
-Index: xsane-0.996/src/xsane-front-gtk.h
+Index: xsane-0.997/src/xsane-front-gtk.h
 ===================================================================
---- xsane-0.996.orig/src/xsane-front-gtk.h	2010-03-13 20:42:28.895741949 +0100
-+++ xsane-0.996/src/xsane-front-gtk.h	2010-03-13 20:43:00.734228256 +0100
+--- xsane-0.997.orig/src/xsane-front-gtk.h	2007-05-17 14:45:19.000000000 +0200
++++ xsane-0.997/src/xsane-front-gtk.h	2010-05-29 12:30:37.705467626 +0200
 @@ -54,10 +54,10 @@
  extern GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc, 
                                                 void *xsane_button_callback, gpointer data);
@@ -175,10 +175,10 @@ Index: xsane-0.996/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.996/src/xsane.c
+Index: xsane-0.997/src/xsane.c
 ===================================================================
---- xsane-0.996.orig/src/xsane.c	2010-03-13 20:42:59.978765829 +0100
-+++ xsane-0.996/src/xsane.c	2010-03-13 20:43:00.759741117 +0100
+--- xsane-0.997.orig/src/xsane.c	2010-05-29 12:30:32.277409114 +0200
++++ xsane-0.997/src/xsane.c	2010-05-29 12:30:37.711409616 +0200
 @@ -876,7 +876,7 @@
              str_list[j] = 0;
              sprintf(str, "%d", (int) val);
@@ -197,7 +197,7 @@ Index: xsane-0.996/src/xsane.c
                                              xsane_resolution_list_callback, SANE_OPTION_IS_SETTABLE(opt->cap), widget_name);
            free(str_list);
          }
-@@ -1490,7 +1490,7 @@
+@@ -1496,7 +1496,7 @@
            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.996/src/xsane.c
                                  _BGT(opt->desc), 0, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
           }
           break;
-@@ -1529,7 +1529,7 @@
+@@ -1536,7 +1536,7 @@
            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.996/src/xsane.c
                                  _BGT(opt->desc), xsane_scanmode_menu_callback, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
          }
           break;
-@@ -4636,7 +4636,7 @@
+@@ -4646,7 +4646,7 @@
                }
                str_list[j] = 0;
                sprintf(str, "%d", val);
@@ -224,7 +224,7 @@ Index: xsane-0.996/src/xsane.c
                                    SANE_OPTION_IS_SETTABLE(opt->cap));
                free(str_list);
                gtk_widget_show(parent->parent);
-@@ -4734,7 +4734,7 @@
+@@ -4744,7 +4744,7 @@
                }
                str_list[j] = 0;
                sprintf(str, "%g", SANE_UNFIX(val));
@@ -233,7 +233,7 @@ Index: xsane-0.996/src/xsane.c
                free (str_list);
                gtk_widget_show(parent->parent);
              }
-@@ -4771,7 +4771,7 @@
+@@ -4789,7 +4789,7 @@
                   (strcmp (opt->name, SANE_NAME_SCAN_SOURCE) != 0) ) /* do not show scansource */
              {
                /* use a "list-selection" widget */
diff --git a/debian/patches/fix_preview_mouse_events.patch b/debian/patches/fix_preview_mouse_events.patch
new file mode 100644
index 0000000..f07e8c1
--- /dev/null
+++ b/debian/patches/fix_preview_mouse_events.patch
@@ -0,0 +1,41 @@
+Description: Fix mouse events handling in preview window
+ Event handling was using key values as masks on mouse events, leading
+ to valid mouse events being discarded in some setups.
+Bug-Debian: http://bugs.debian.org/583661
+Author: Reinhard Fössmeier <info@ais-sanmarino.org>
+
+Index: xsane-0.997/src/xsane-preview.c
+===================================================================
+--- xsane-0.997.orig/src/xsane-preview.c	2010-05-29 12:36:28.326409629 +0200
++++ xsane-0.997/src/xsane-preview.c	2010-05-29 12:35:47.134409038 +0200
+@@ -80,7 +80,6 @@
+ #include "xsane-preview.h"
+ #include "xsane-preferences.h"
+ #include "xsane-gamma.h"
+-#include <gdk/gdkkeysyms.h>
+ 
+ 
+ #ifndef PATH_MAX
+@@ -3022,9 +3021,9 @@
+     preview_display_color_components(p, event->motion.x, event->motion.y);
+ 
+     switch (((GdkEventMotion *)event)->state &
+-            GDK_Num_Lock & GDK_Caps_Lock & GDK_Shift_Lock & GDK_Scroll_Lock) /* mask all Locks */
++	    (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) /* only check for mouse buttons */
+     {
+-      case 256: /* left button */
++      case GDK_BUTTON1_MASK: /* left button */
+ 
+         DBG(DBG_info2, "left button\n");
+ 
+@@ -3291,8 +3290,8 @@
+         }
+        break;
+ 
+-      case 512: /* middle button */
+-      case 1024: /* right button */
++      case GDK_BUTTON2_MASK: /* middle button */
++      case GDK_BUTTON3_MASK: /* right button */
+         DBG(DBG_info2, "middle or right button\n");
+ 
+         if (p->selection_drag)
diff --git a/debian/patches/fix_spin_button_pagesize.patch b/debian/patches/fix_spin_button_pagesize.patch
deleted file mode 100644
index 70de2f7..0000000
--- a/debian/patches/fix_spin_button_pagesize.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Fix spin buttons usage for newer versions of GTK+ 2.0
- Set adjustment page size to 0 for spin buttons. Fix for newer GTK
- versions, silences runtime warnings.
-Author: Julien BLACHE <jblache@debian.org>
-Forwarded: no
-
-Index: xsane-0.996/src/xsane-back-gtk.c
-===================================================================
---- xsane-0.996.orig/src/xsane-back-gtk.c	2010-03-13 20:43:03.360741649 +0100
-+++ xsane-0.996/src/xsane-back-gtk.c	2010-03-13 20:43:04.895741924 +0100
-@@ -2029,6 +2029,7 @@
-       digits = 5;
-     }
- #endif
-+    gtk_adjustment_set_page_size(GTK_ADJUSTMENT(elem->data), 0);
-     spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(elem->data), 0, digits);
- 
-     if (preferences.show_range_mode & 3) /* slider also visible */
-@@ -2130,6 +2131,7 @@
-     digits = 5;
-   }
- #endif
-+  gtk_adjustment_set_page_size(GTK_ADJUSTMENT(elem->data), 0);
-   spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(elem->data), 0, digits);
- 
-   if (preferences.show_range_mode & 3) /* sliders are visible */
-Index: xsane-0.996/src/xsane-front-gtk.c
-===================================================================
---- xsane-0.996.orig/src/xsane-front-gtk.c	2010-03-13 20:43:00.700741126 +0100
-+++ xsane-0.996/src/xsane-front-gtk.c	2010-03-13 20:43:04.896741782 +0100
-@@ -1161,6 +1161,7 @@
-   /* spinbutton */
-   if (preferences.show_range_mode & 4)
-   {
-+    gtk_adjustment_set_page_size(GTK_ADJUSTMENT(*data), 0);
-     spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(*data), 0, digits);
-     if (preferences.show_range_mode & 3) /* slider also visible */
-     {
-@@ -1254,6 +1255,7 @@
-   /* spinbutton */
-   if (preferences.show_range_mode & 4)
-   {
-+    gtk_adjustment_set_page_size(GTK_ADJUSTMENT(*data), 0);
-     spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(*data), 0, digits);
-     gtk_widget_set_size_request(spinbutton, 60, -1);
-     xsane_back_gtk_set_tooltip(xsane.tooltips, spinbutton, desc);
-Index: xsane-0.996/src/xsane.c
-===================================================================
---- xsane-0.996.orig/src/xsane.c	2010-03-13 20:43:00.759741117 +0100
-+++ xsane-0.996/src/xsane.c	2010-03-13 20:43:04.926741398 +0100
-@@ -1217,7 +1217,7 @@
-   gtk_widget_show(pixmapwidget);
- 
-   /* adf pages maximum */
--  adjustment = gtk_adjustment_new(preferences.adf_pages_max, 1, 9999, 1, 10, 1);
-+  adjustment = gtk_adjustment_new(preferences.adf_pages_max, 1, 9999, 1, 10, 0);
-   xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0);
-   gtk_widget_set_size_request(xsane_spinbutton, 55, -1);
-   gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE);
-@@ -1314,7 +1314,7 @@
- 
- 
-     /* number of copies */
--    adjustment = gtk_adjustment_new(xsane.copy_number, 1, 99, 1, 10, 1);
-+    adjustment = gtk_adjustment_new(xsane.copy_number, 1, 99, 1, 10, 0);
-     xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0);
-     gtk_widget_set_size_request(xsane_spinbutton, 40, -1);
-     gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE);
diff --git a/debian/patches/i18n_po_update_es_add_gl.patch b/debian/patches/i18n_po_update_es_add_gl.patch
index c10e88c..4322962 100644
--- a/debian/patches/i18n_po_update_es_add_gl.patch
+++ b/debian/patches/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.996/configure
+Index: xsane-0.997/configure
 ===================================================================
---- xsane-0.996.orig/configure	2010-03-13 20:43:13.889742507 +0100
-+++ xsane-0.996/configure	2010-03-13 20:51:44.384741849 +0100
-@@ -1329,7 +1329,7 @@
+--- xsane-0.997.orig/configure	2009-07-21 20:39:23.000000000 +0200
++++ xsane-0.997/configure	2010-05-29 12:31:08.066408482 +0200
+@@ -1769,7 +1769,7 @@
  BINPROGS="xsane"
  
  # languages
@@ -16,10 +16,10 @@ Index: xsane-0.996/configure
  
  SANE_V_MAJOR=1
  VERSION=${V_MAJOR}.${V_MINOR}
-Index: xsane-0.996/po/es.po
+Index: xsane-0.997/po/es.po
 ===================================================================
---- xsane-0.996.orig/po/es.po	2010-03-13 20:45:14.277740718 +0100
-+++ xsane-0.996/po/es.po	2010-03-13 20:51:44.388741051 +0100
+--- xsane-0.997.orig/po/es.po	2010-05-29 12:31:03.538038748 +0200
++++ xsane-0.997/po/es.po	2010-05-29 12:31:08.070408333 +0200
 @@ -1,21 +1,24 @@
 -# translation of es.po to Castellano
 -# XSane Spanish .po file
@@ -3277,10 +3277,10 @@ Index: xsane-0.996/po/es.po
  #~ msgid "Mail"
  #~ msgstr "Correo electrónico"
 +
-Index: xsane-0.996/po/gl.po
+Index: xsane-0.997/po/gl.po
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xsane-0.996/po/gl.po	2010-03-13 20:51:44.413740642 +0100
++++ xsane-0.997/po/gl.po	2010-05-29 12:31:08.115427686 +0200
 @@ -0,0 +1,3127 @@
 +# Galego translation
 +# XSane Galician gl.po file
diff --git a/debian/patches/series b/debian/patches/series
index ce1cf49..618c204 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,9 +5,8 @@ deb_inhibit_clickthrough.patch
 fix_options_handling_fix.patch
 fix_pdf_xref.patch
 fix_pdf_floats.patch
-fix_cap_always_settable.patch
 fix_broken_links.patch
-fix_spin_button_pagesize.patch
 fix_message_typo.patch
 i18n_po_update_es_add_gl.patch
 i18n_po_update_fr.patch
+fix_preview_mouse_events.patch
diff --git a/debian/rules b/debian/rules
index b7896bb..528d607 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ clean:
 	[ ! -f Makefile ] || $(MAKE) distclean
 
 	rm -f config.sub config.guess
+	rm -f xsane.spec include/config.h
 	rm -f po/*.gmo
 
 	dh_clean